From 6413bdbcf3456261d48ada7b563c6abed72545c4 Mon Sep 17 00:00:00 2001 From: Igor Sfiligoi Date: Mon, 13 Jan 2025 09:37:51 -0800 Subject: [PATCH] Remove mkl-include dependency, use blas-devel instead --- .github/workflows/main.yml | 4 ++-- README.md | 2 +- src/skbio_alt.cpp | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ff744c..21f88af 100644 --- 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 index a879a7a..a7f0002 100644 --- 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 index 1db2713..474ecfc 100644 --- a/src/skbio_alt.cpp +++ b/src/skbio_alt.cpp @@ -9,9 +9,8 @@ #include #include -// Not using anything mkl specific, but this is what we get from Conda -#include -#include +#include +#include static std::mt19937 myRandomGenerator;