Merge branch 'build-conda' of https://github.com/tarang-jain/faiss in…

…to build-conda
facebookresearch · Dec 10, 2024 · 4701989 · 4701989
2 parents bdb2a15 + a70c8ce
commit 4701989
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/conda/faiss-gpu-cuvs/meta.yaml b/conda/faiss-gpu-cuvs/meta.yaml
@@ -46,24 +46,24 @@ 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]
         - cuda-toolkit {{ cudatoolkit }}
       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 {{ cudatoolkit }}
       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
@@ -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
@@ -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_*"