From fc0643ceef096b18e35fd81ae20e96af75927327 Mon Sep 17 00:00:00 2001 From: Tom Vander Aa Date: Fri, 14 Jun 2024 10:01:07 +0200 Subject: [PATCH] conda: blas_impl --- conda-recipes/conda_build_config.yaml | 6 +++--- conda-recipes/smurff/build.sh | 9 ++++++--- conda-recipes/smurff/meta.yaml | 6 ++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/conda-recipes/conda_build_config.yaml b/conda-recipes/conda_build_config.yaml index 1af1402c..c94dc96d 100644 --- a/conda-recipes/conda_build_config.yaml +++ b/conda-recipes/conda_build_config.yaml @@ -4,9 +4,9 @@ python: - 3.10 - 3.11 -blas_impl: - - openblas - - mkl +blas_impl: # [linux64 or win64] + - openblas # [linux64 or win64] + - mkl # [linux64 or win64] hdf5: - 1.10.4 diff --git a/conda-recipes/smurff/build.sh b/conda-recipes/smurff/build.sh index 28741daf..5322ffe1 100644 --- a/conda-recipes/smurff/build.sh +++ b/conda-recipes/smurff/build.sh @@ -6,10 +6,13 @@ then elif [ $blas_impl == "openblas" ] then SKBUILD_CMAKE_ARGS="-DENABLE_OPENBLAS=ON" +else + echo "Unknown BLAS impl: \"$blas_impl\"" + exit -1 fi +echo "extra CMAKE_ARGS: $SKBUILD_CMAKE_ARGS" + export SKBUILD_CMAKE_ARGS -$PYTHON -m pip install . \ - $EXTRA_CMAKE_ARGS \ - --no-deps -vv +$PYTHON -m pip install . --no-deps -vv diff --git a/conda-recipes/smurff/meta.yaml b/conda-recipes/smurff/meta.yaml index d551a851..defa5e8e 100644 --- a/conda-recipes/smurff/meta.yaml +++ b/conda-recipes/smurff/meta.yaml @@ -18,7 +18,8 @@ requirements: - llvm-openmp # [osx] host: - llvm-openmp # [osx] - - mkl-devel # [(linux64 or win64) and blas_impl == 'mkl'] + - mkl-devel # [blas_impl == 'mkl'] + - openblas # [blas_impl != 'mkl'] - eigen - libboost - pybind11 @@ -29,7 +30,8 @@ requirements: - setuptools_scm run: - python {{ python }} - - mkl # [(linux64 or win64) and blas_impl == 'mkl'] + - mkl # [blas_impl == 'mkl'] + - openblas # [blas_impl != 'mkl'] - libboost # [not win] - numpy - scipy