diff --git a/.github/actions/build_cmake/action.yml b/.github/actions/build_cmake/action.yml index 664770c139..ad3811f473 100644 --- a/.github/actions/build_cmake/action.yml +++ b/.github/actions/build_cmake/action.yml @@ -36,12 +36,7 @@ runs: # install base packages for ARM64 if [ "${{ runner.arch }}" = "ARM64" ]; then - # installing libmamba-solver is necessary for openblas=*=*openmp* - conda install --solver=classic conda-forge::conda-libmamba-solver conda-forge::libmamba conda-forge::libmambapy conda-forge::libarchive - - # installing openblas that was compiled with USE_OPENMP=1. - # Context: https://github.com/facebookresearch/faiss/wiki/Troubleshooting#surprising-faiss-openmp-and-openblas-interaction - conda install -y -q -c conda-forge openblas=*=*openmp* gxx_linux-aarch64 sysroot_linux-aarch64 + conda install -y -q -c conda-forge openblas gxx_linux-aarch64 sysroot_linux-aarch64 fi # install base packages for X86_64 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c6fee5142..6fb2c7018f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -124,6 +124,9 @@ jobs: uses: ./.github/actions/build_cmake with: opt_level: sve + env: + # Context: https://github.com/facebookresearch/faiss/wiki/Troubleshooting#surprising-faiss-openmp-and-openblas-interaction + OPENBLAS_NUM_THREADS: '1' linux-x86_64-conda: name: Linux x86_64 (conda) needs: linux-x86_64-cmake