Explicitly link to OpenMP (#290)

* Explicitly link to OpenMP * Add explicit link to jemalloclocal * Add -fopenmp=libomp * Skip arm64 tests * Force preprocessor OpenMP * Fix typo in YAML * Remove preprocessor * Switch to conda clang * Revert "Switch to conda clang" This reverts commit 9de1e3d. * Remove -fopenmp * Add some debug output * Use ARCHFLAGS instead of CIBW_BUILD * Add -y to conda create * Remove debug output * Allow for empty ARCHFLAGS * Remove additional linkages
Quantco · Aug 16, 2023 · 44e9a97 · 44e9a97
1 parent fbf7755
commit 44e9a97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -24,6 +24,7 @@ jobs:
         env:
           CIBW_ARCHS_LINUX: auto
           CIBW_ARCHS_MACOS: x86_64 arm64
+          CIBW_TEST_SKIP: '*-macosx_arm64'
 
       - uses: actions/upload-artifact@v3
         with:

diff --git a/build_tools/prepare_macos_wheel.sh b/build_tools/prepare_macos_wheel.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 
-set -e
-set -x
+set -exuo pipefail
 
-if [[ "$CIBW_BUILD" == *-macosx_arm64 ]]; then
+if [[ "${ARCHFLAGS:-}" == *arm64 ]]; then
     CONDA_CHANNEL="conda-forge/osx-arm64"
 else
     CONDA_CHANNEL="conda-forge/osx-64"
 fi
 
-conda create -n build -c $CONDA_CHANNEL jemalloc-local xsimd llvm-openmp
+conda create -y -n build -c $CONDA_CHANNEL jemalloc-local xsimd llvm-openmp