From d997ea0cd6e960628f8a712ff929bae547ca6b78 Mon Sep 17 00:00:00 2001 From: Junjie Qi Date: Mon, 9 Dec 2024 21:15:42 -0800 Subject: [PATCH] fix nightily build (#4080) Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/4080 Reviewed By: mnorris11 Differential Revision: D67002610 Pulled By: junjieqi fbshipit-source-id: fb561d7bb4b23866daa0b992694fcc393e595312 --- conda/faiss-gpu-cuvs/meta.yaml | 18 +++++++++--------- conda/faiss-gpu/meta.yaml | 18 +++++++++--------- conda/faiss/meta.yaml | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/conda/faiss-gpu-cuvs/meta.yaml b/conda/faiss-gpu-cuvs/meta.yaml index bccbe9297d..d37ac56a3c 100644 --- a/conda/faiss-gpu-cuvs/meta.yaml +++ b/conda/faiss-gpu-cuvs/meta.yaml @@ -46,10 +46,10 @@ outputs: requirements: build: - {{ compiler('cxx') }} - - sysroot_linux-64 =2.17 # [linux64] + - sysroot_linux-64 # [linux64] - llvm-openmp # [osx] - cmake >=3.26.4 - - make =4.2 # [not win] + - make # [not win] - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] - mkl =2023 # [x86_64] - mkl-devel =2023 # [x86_64] @@ -57,13 +57,13 @@ outputs: host: - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] - mkl =2023 # [x86_64] - - openblas =0.3 # [not x86_64] + - openblas # [not x86_64] - libcuvs =24.08 - 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 # [not x86_64] - cuda-cudart {{ cuda_constraints }} - libcublas {{ libcublas_constraints }} - libcuvs =24.08 @@ -88,9 +88,9 @@ outputs: build: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - - swig =4.0 + - swig - cmake >=3.24.0 - - make =4.2 # [not win] + - make # [not win] - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] - mkl =2023 # [x86_64] - cuda-toolkit {{ cudatoolkit }} @@ -107,9 +107,9 @@ outputs: - {{ pin_subpackage('libfaiss', exact=True) }} test: requires: - - numpy >=1.19,<2 - - scipy =1.14 - - pytorch <2.5 + - numpy + - scipy + - pytorch - pytorch-cuda {{ cuda_constraints }} commands: - python -X faulthandler -m unittest discover -v -s tests/ -p "test_*" diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index 91eef69b2f..05f7b59008 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -47,18 +47,18 @@ outputs: requirements: build: - {{ compiler('cxx') }} - - sysroot_linux-64 =2.17 # [linux64] + - sysroot_linux-64 # [linux64] - llvm-openmp # [osx] - cmake >=3.24.0 - - make =4.2 # [not win] + - make # [not win] - mkl-devel =2023 # [x86_64] - cuda-toolkit {{ cudatoolkit }} host: - mkl =2023 # [x86_64] - - openblas =0.3 # [not x86_64] + - openblas # [not x86_64] run: - mkl =2023 # [x86_64] - - openblas =0.3 # [not x86_64] + - openblas # [not x86_64] - cuda-cudart {{ cuda_constraints }} - libcublas {{ libcublas_constraints }} test: @@ -81,9 +81,9 @@ outputs: build: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - - swig =4.0 + - swig - cmake >=3.24.0 - - make =4.2 # [not win] + - make # [not win] - cuda-toolkit {{ cudatoolkit }} host: - python {{ python }} @@ -96,9 +96,9 @@ outputs: - {{ pin_subpackage('libfaiss', exact=True) }} test: requires: - - numpy >=1.19,<2 - - scipy =1.14 - - pytorch <2.5 + - numpy + - scipy + - pytorch - pytorch-cuda {{ cuda_constraints }} commands: - python -X faulthandler -m unittest discover -v -s tests/ -p "test_*" diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml index 8b3f9ac527..79e7be953e 100644 --- a/conda/faiss/meta.yaml +++ b/conda/faiss/meta.yaml @@ -37,17 +37,17 @@ outputs: requirements: build: - {{ compiler('cxx') }} - - sysroot_linux-64 =2.17 # [linux64] + - sysroot_linux-64 # [linux64] - llvm-openmp # [osx] - cmake >=3.24.0 - - make =4.2 # [not win] + - make # [not win] - mkl-devel =2023 # [x86_64] host: - mkl =2023 # [x86_64] - - openblas =0.3 # [not x86_64] + - openblas # [not x86_64] run: - mkl =2023 # [x86_64] - - openblas =0.3 # [not x86_64] + - openblas # [not x86_64] test: requires: - conda-build @@ -68,9 +68,9 @@ outputs: build: - {{ compiler('cxx') }} - sysroot_linux-64 =2.17 # [linux64] - - swig =4.0 + - swig - cmake >=3.24.0 - - make =4.2 # [not win] + - make # [not win] host: - python {{ python }} - numpy >=1.19,<2 @@ -82,9 +82,9 @@ outputs: - {{ pin_subpackage('libfaiss', exact=True) }} test: requires: - - numpy >=1.19,<2 - - scipy =1.14 - - pytorch <2.5 + - numpy + - scipy + - pytorch commands: - python -X faulthandler -m unittest discover -v -s tests/ -p "test_*" - python -X faulthandler -m unittest discover -v -s tests/ -p "torch_*"