Merge pull request #419 from laurynasas/macos_repair_wheels

enable delocate to fix the macos wheels
quantumlib · Jul 6, 2022 · 226ba02 · 226ba02
2 parents 16f223b + 32eb19f
commit 226ba02
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/release_wheels.yml b/.github/workflows/release_wheels.yml
@@ -31,8 +31,10 @@ jobs:
       CIBW_BUILD: "${{ matrix.cibw.build || '*' }}"
       CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
       CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}"
-      CIBW_BEFORE_BUILD_MACOS: "brew install libomp"
-      CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+      CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm"
+      CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-listdeps {wheel} && delocate-wheel --verbose --require-archs {delocate_archs} -w {dest_dir} {wheel}"
+      # to install latest delocate package
+      CIBW_DEPENDENCY_VERSIONS: "latest"
       # due to package and module name conflict have to temporarily move it away to run tests
       CIBW_BEFORE_TEST: mv {package}/qsimcirq /tmp
       CIBW_TEST_EXTRAS: "dev"

diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml
@@ -36,8 +36,10 @@ jobs:
       CIBW_BUILD: "${{ matrix.cibw.build || '*' }}"
       CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
       CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}"
-      CIBW_BEFORE_BUILD_MACOS: "brew install libomp"
-      CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+      CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm"
+      CIBW_REPAIR_WHEEL_COMMAND_MACOS: "delocate-listdeps {wheel} && delocate-wheel --verbose --require-archs {delocate_archs} -w {dest_dir} {wheel}"
+      # to install latest delocate package
+      CIBW_DEPENDENCY_VERSIONS: "latest"
       # due to package and module name conflict have to temporarily move it away to run tests
       CIBW_BEFORE_TEST: "mv {package}/qsimcirq /tmp"
       CIBW_TEST_EXTRAS: "dev"