Merge pull request #58 from sfiligoi/blas-devel-250113

Remove mkl-include dependency, use blas-devel instead
biocore · Jan 13, 2025 · 29b259b · 29b259b
2 parents 26f545f + 6413bdb
commit 29b259b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,9 +28,9 @@ jobs:
         df -h .
         if [[ "$(uname -s)" == "Linux" ]];
         then
-          conda create -q --yes --strict-channel-priority -n unifrac -c conda-forge -c bioconda gxx_linux-64 gfortran_linux-64 hdf5 mkl-include lz4 zlib hdf5-static libcblas liblapacke make curl
+          conda create -q --yes --strict-channel-priority -n unifrac -c conda-forge -c bioconda gxx_linux-64 gfortran_linux-64 hdf5 lz4 zlib hdf5-static libcblas liblapacke blas-devel make curl
         else
-          conda create -q --yes --strict-channel-priority -n unifrac -c conda-forge -c bioconda clangxx_osx-64 hdf5 mkl-include lz4 hdf5-static libcblas liblapacke make curl
+          conda create -q --yes --strict-channel-priority -n unifrac -c conda-forge -c bioconda clangxx_osx-64 hdf5 lz4 hdf5-static libcblas liblapacke blas-devel make curl
         fi 
         conda clean --yes -t
         df -h .

diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ make install
 `conda-forge` channel, for example (on Linux):
 
 ```
-conda create --strict-channel-priority -n unifrac-binaries -c conda-forge -c bioconda gxx_linux-64 gfortran_linux-64 hdf5 mkl-include lz4 zlib hdf5-static libcblas liblapacke make curl
+conda create --strict-channel-priority -n unifrac-binaries -c conda-forge -c bioconda gxx_linux-64 gfortran_linux-64 hdf5 lz4 zlib hdf5-static libcblas liblapacke blas-devel make curl
 conda activate unifrac-binaries
 ```
 

diff --git a/src/skbio_alt.cpp b/src/skbio_alt.cpp
@@ -9,9 +9,8 @@
 #include <random>
 #include <algorithm>
 
-// Not using anything mkl specific, but this is what we get from Conda
-#include <mkl_cblas.h>
-#include <mkl_lapacke.h>
+#include <cblas.h>
+#include <lapacke.h>
 
 static std::mt19937 myRandomGenerator;