From f8c53ffc39e7e4527b699090139ead17f76289b4 Mon Sep 17 00:00:00 2001 From: Michael Norris Date: Fri, 21 Feb 2025 10:01:39 -0800 Subject: [PATCH] Upgrade openblas to 0.3.29 for ARM architectures (#4203) Summary: Related to issue: https://github.com/facebookresearch/faiss/issues/4202 Reviewed By: mengdilin Differential Revision: D69933126 --- .github/actions/build_cmake/action.yml | 2 +- conda/faiss-gpu-cuvs/meta.yaml | 4 ++-- conda/faiss-gpu/meta.yaml | 4 ++-- conda/faiss/meta.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/build_cmake/action.yml b/.github/actions/build_cmake/action.yml index a5f9372aec..6251519feb 100644 --- a/.github/actions/build_cmake/action.yml +++ b/.github/actions/build_cmake/action.yml @@ -43,7 +43,7 @@ runs: # install base packages for ARM64 if [ "${{ runner.arch }}" = "ARM64" ]; then - conda install -y -q -c conda-forge openblas=0.3 gxx_linux-aarch64=14.2 sysroot_linux-aarch64=2.17 + conda install -y -q -c conda-forge openblas=0.3.29 gxx_linux-aarch64=14.2 sysroot_linux-aarch64=2.17 fi # install base packages for X86_64 diff --git a/conda/faiss-gpu-cuvs/meta.yaml b/conda/faiss-gpu-cuvs/meta.yaml index 679c847384..76d5350150 100644 --- a/conda/faiss-gpu-cuvs/meta.yaml +++ b/conda/faiss-gpu-cuvs/meta.yaml @@ -65,13 +65,13 @@ outputs: host: - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] - mkl =2023 # [x86_64] - - openblas =0.3 # [not x86_64] + - openblas =0.3.29 # [not x86_64] - libcuvs =24.12 - cuda-version {{ cuda_constraints }} run: - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] - mkl =2023 # [x86_64] - - openblas =0.3 # [not x86_64] + - openblas =0.3.29 # [not x86_64] - cuda-cudart {{ cuda_constraints }} - libcublas {{ libcublas_constraints }} - libcuvs =24.12 diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index 8c8c017ff1..5d5b52c09e 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -57,10 +57,10 @@ outputs: - gcc_linux-64 =11.2 # [cudatoolkit == '11.4.4'] host: - mkl =2023.0 # [x86_64] - - openblas =0.3 # [not x86_64] + - openblas =0.3.29 # [not x86_64] run: - mkl =2023.0 # [x86_64] - - openblas =0.3 # [not x86_64] + - openblas =0.3.29 # [not x86_64] - cuda-cudart {{ cuda_constraints }} - libcublas {{ libcublas_constraints }} test: diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index 947b136179..16a939515e 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -65,7 +65,7 @@ outputs: - liblief =0.15.1 # [not win] - python_abi =3.12 {% endif %} - - openblas =0.3 # [not x86_64] + - openblas =0.3.29 # [not x86_64] run: - python {{ python }} {% if PY_VER == '3.9' or PY_VER == '3.10' or PY_VER == '3.11' %} @@ -78,7 +78,7 @@ outputs: - liblief =0.15.1 # [not win] - python_abi =3.12 {% endif %} - - openblas =0.3 # [not x86_64] + - openblas =0.3.29 # [not x86_64] test: requires: - conda-build