take facebookresearch#2

algoriddle · May 9, 2023 · bac70b2 · bac70b2
1 parent c16932c
commit bac70b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml
@@ -40,17 +40,15 @@ outputs:
         - llvm-openmp  # [osx]
         - cmake =3.23.1
         - make  # [not win]
-        - mkl-devel =2021
-      host:
         - mkl =2021
+        - mkl-devel =2021
         - cudatoolkit {{ cudatoolkit }}
       run:
-        - mkl >=2021
+        - mkl =2021
         - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
     test:
       requires:
         - conda-build
-        - mkl =2021
       commands:
         - test -f $PREFIX/lib/libfaiss.so              # [linux]
         - test -f $PREFIX/lib/libfaiss.dylib           # [osx]
@@ -81,7 +79,6 @@ outputs:
         - numpy
         - scipy
         - pytorch
-        - mkl =2021
       commands:
         - python -X faulthandler -m unittest discover -v -s tests/ -p "test_*"
         - python -X faulthandler -m unittest discover -v -s tests/ -p "torch_*"

diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml
@@ -40,12 +40,12 @@ outputs:
         - llvm-openmp  # [osx]
         - cmake =3.23.1
         - make  # [not win]
+        - mkl =2021 # [x86_64]
         - mkl-devel =2021 # [x86_64]
         - openblas # [not x86_64]
-      host:
-        - mkl =2021 # [x86_64]
       run:
-        - mkl >=2021  # [win]
+        - mkl =2021  # [x86_64]
+        - openblas # [not x86_64]
     test:
       requires:
         - conda-build
@@ -82,7 +82,6 @@ outputs:
         - numpy
         - scipy
         - pytorch
-        - mkl =2021
       commands:
         - python -X faulthandler -m unittest discover -v -s tests/ -p "test_*"
         - python -X faulthandler -m unittest discover -v -s tests/ -p "torch_*"