From 77825c52bdc077b2450cf89e2dec1e887e12f4ab Mon Sep 17 00:00:00 2001
From: Lucas Hosseini <lucas.hosseini@gmail.com>
Date: Tue, 18 May 2021 09:09:55 -0700
Subject: [PATCH] Fix conda recipes. (#1894)

Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1894

Reviewed By: wickedfoo

Differential Revision: D28510244

Pulled By: beauby

fbshipit-source-id: 32983b7eeab497b8d576caaadd56e13a2134a4ab
---
 conda/faiss-gpu/meta.yaml |  8 +++-----
 conda/faiss/meta.yaml     | 10 +++-------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml
index 2dffac455..43b305229 100644
--- a/conda/faiss-gpu/meta.yaml
+++ b/conda/faiss-gpu/meta.yaml
@@ -39,12 +39,10 @@ outputs:
         - cmake >=3.18
         - make  # [not win]
       host:
-        - mkl-devel >=2018
-        - blas =*=mkl
+        - mkl =2018
         - cudatoolkit {{ cudatoolkit }}
       run:
         - mkl >=2018
-        - blas =*=mkl
         - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
     test:
       commands:
@@ -65,11 +63,11 @@ outputs:
         - make  # [not win]
       host:
         - python {{ python }}
-        - numpy 1.11.*
+        - numpy =1.11
         - {{ pin_subpackage('libfaiss', exact=True) }}
       run:
         - python {{ python }}
-        - {{ pin_compatible('numpy') }}
+        - numpy >=1.11,<2
         - {{ pin_subpackage('libfaiss', exact=True) }}
     test:
       requires:
diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml
index 689a32339..3a6f6d4a9 100644
--- a/conda/faiss/meta.yaml
+++ b/conda/faiss/meta.yaml
@@ -31,8 +31,6 @@ outputs:
       string: "h{{ PKG_HASH }}_{{ number }}_cpu"
       run_exports:
         - {{ pin_compatible('libfaiss', exact=True) }}
-      ignore_run_exports:
-        - mkl  # [osx]
     requirements:
       build:
         - {{ compiler('cxx') }}
@@ -40,11 +38,9 @@ outputs:
         - cmake >=3.17
         - make  # [not win]
       host:
-        - mkl-devel >=2018
-        - blas =*=mkl
+        - mkl =2018
       run:
         - mkl >=2018
-        - blas =*=mkl
     test:
       commands:
         - test -f $PREFIX/lib/libfaiss$SHLIB_EXT       # [not win]
@@ -65,11 +61,11 @@ outputs:
         - make  # [not win]
       host:
         - python {{ python }}
-        - numpy 1.11.*
+        - numpy =1.11
         - {{ pin_subpackage('libfaiss', exact=True) }}
       run:
         - python {{ python }}
-        - {{ pin_compatible('numpy') }}
+        - numpy >=1.11,<2
         - {{ pin_subpackage('libfaiss', exact=True) }}
     test:
       requires: