Skip to content

Commit

Permalink
Force installing arm64 version for cross-build
Browse files Browse the repository at this point in the history
  • Loading branch information
Pablo Alonso committed Oct 24, 2023
1 parent 9dac404 commit 81d5fca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-wheels-cibuildwheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
config-file: ${{ matrix.config }}
env:
CIBW_ARCHS_MACOS: x86_64 arm64
CIBW_ARCHS_MACOS: arm64 x86_64

- uses: actions/upload-artifact@v3
with:
Expand Down
7 changes: 4 additions & 3 deletions pyproject-tensorflow.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ test-command = "python -c 'import essentia; import essentia.standard; import ess
select = "*macosx_arm64*"

before-build = [
"brew install pkg-config gcc readline sqlite gdbm freetype libpng",
"brew install eigen libyaml fftw [email protected] libsamplerate libtag chromaprint",
"brew install tensorflow",
"brew install ",
"PACKAGES=(eigen libyaml fftw [email protected] libsamplerate libtag chromaprint); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done"
"PACKAGES=(pkg-config gcc readline sqlite gdbm freetype libpng); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done"
"PACKAGES=(tensorflow); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done"
"brew link --force [email protected]",
"python waf configure --with-tensorflow --pkg-config-path=\"${PKG_CONFIG_PATH}\" --arch arm64 --no-msse",
"python waf",
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ test-command = "python -c 'import essentia; import essentia.standard; import ess
select = "*macosx_arm64*"

before-build = [
"brew install pkg-config gcc readline sqlite gdbm freetype libpng",
"brew install eigen libyaml fftw [email protected] libsamplerate libtag chromaprint",
"PACKAGES=(eigen libyaml fftw [email protected] libsamplerate libtag chromaprint); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done"
"PACKAGES=(pkg-config gcc readline sqlite gdbm freetype libpng); for PACKAGE in \"${PACKAGES[@]}\"; do brew fetch --force --bottle-tag=arm64_monterrey $PACKAGE; result=$(brew --cache --bottle-tag=arm64_monterrey $PACKAGE) brew install $result; done"
"brew link --force [email protected]",
"python waf configure --pkg-config-path=\"${PKG_CONFIG_PATH}\" --arch arm64 --no-msse",
"python waf",
Expand Down

0 comments on commit 81d5fca

Please sign in to comment.