remove work-around for old conda-build bug

conda-forge · Mar 25, 2024 · d61d4a4 · d61d4a4
1 parent 6b28e45
commit d61d4a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -202,9 +202,11 @@ outputs:
       host:
         - openblas   0.3.26  # [blas_impl == "openblas"]
         - mkl-devel  2024.0  # [blas_impl == "mkl"]
+        - blis 0.9.0         # [blas_impl == "blis"]
       run:
         - openblas   0.3.26  # [blas_impl == "openblas"]
         - mkl-devel  2024.0  # [blas_impl == "mkl"]
+        - blis 0.9.0         # [blas_impl == "blis"]
         - {{ pin_subpackage("liblapack", exact=True) }}      # [blas_impl != 'blis']
         - {{ pin_subpackage("liblapacke", exact=True) }}     # [blas_impl != 'blis']
         - liblapack  {{ version }} *netlib                   # [blas_impl == 'blis']
@@ -238,22 +240,19 @@ outputs:
         - posix         # [win]
         - llvm-openmp   # [linux and ((blas_impl == "openblas") or (blas_impl == "mkl"))]
       host:
-      # Building with blis fails due to a conda-build bug
-      {% if blas_impl != 'blis' %}
-        - {{ pin_subpackage("liblapack", exact=True) }}
-        - {{ pin_subpackage("liblapacke", exact=True) }}
-        - {{ pin_subpackage("libcblas", exact=True) }}
         - {{ pin_subpackage("libblas", exact=True) }}
-      {% else %}
-        - blis 0.9.0
-      {% endif %}
-      run:
+        - {{ pin_subpackage("libcblas", exact=True) }}
         - {{ pin_subpackage("liblapack", exact=True) }}      # [blas_impl != 'blis']
         - {{ pin_subpackage("liblapacke", exact=True) }}     # [blas_impl != 'blis']
         - liblapack  {{ version }} *netlib                   # [blas_impl == 'blis']
         - liblapacke {{ version }} *netlib                   # [blas_impl == 'blis']
-        - {{ pin_subpackage("libcblas", exact=True) }}
+      run:
         - {{ pin_subpackage("libblas", exact=True) }}
+        - {{ pin_subpackage("libcblas", exact=True) }}
+        - {{ pin_subpackage("liblapack", exact=True) }}      # [blas_impl != 'blis']
+        - {{ pin_subpackage("liblapacke", exact=True) }}     # [blas_impl != 'blis']
+        - liblapack  {{ version }} *netlib                   # [blas_impl == 'blis']
+        - liblapacke {{ version }} *netlib                   # [blas_impl == 'blis']
         - {{ pin_subpackage("blas-devel", exact=True) }}
     test:
       commands:

diff --git a/recipe/test_blas.sh b/recipe/test_blas.sh
@@ -9,11 +9,6 @@ cd build
 
 SKIP_TESTS="dummy"
 
-if [[ "${blas_impl}" == "blis" ]]; then
-  # conda-build can't install a correct environment for testing
-  conda install -c conda-forge/label/lapack_rc -c conda-forge "libblas=*=*blis" "libcblas=*=*blis" "liblapack=*=*netlib" "liblapacke=*=*netlib" --use-local --yes -p $PREFIX
-fi
-
 if [[ "$target_platform" != osx-* ]]; then
   ulimit -s unlimited
 fi