From 4b2aab4227bcb4e2bc5fa33dac9c5d519ac8dde3 Mon Sep 17 00:00:00 2001 From: c3-builder Date: Wed, 27 Mar 2024 17:26:25 +0000 Subject: [PATCH 1/2] Fix suitesparse path --- .../easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb b/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb index 9bac0454227..b101da5867a 100644 --- a/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb +++ b/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb @@ -32,8 +32,14 @@ use_pip = True sanity_pip_check = True download_dep_fail = True -preinstallopts = 'CVXOPT_BUILD_FFTW=1 CVXOPT_BUILD_GSL=1 CVXOPT_BLAS_EXTRA_LINK_ARGS="$LIBLAPACK" ' -preinstallopts += 'CVXOPT_FFTW_EXTRA_LINK_ARGS="$LIBFFT" CVXOPT_SUITESPARSE_SRC_DIR=$EBROOTSUITESPARSE' +preinstallopts = " ".join([ + 'CVXOPT_BUILD_FFTW=1', + 'CVXOPT_BUILD_GSL=1', + 'CVXOPT_BLAS_EXTRA_LINK_ARGS="$LIBLAPACK"', + 'CVXOPT_FFTW_EXTRA_LINK_ARGS="$LIBFFT"', + 'CVXOPT_SUITESPARSE_LIB_DIR=$EBROOTSUITESPARSE/lib', + 'CVXOPT_SUITESPARSE_INC_DIR=$EBROOTSUITESPARSE/include', +]) installopts = ' --no-binary cvxopt' From 2e8300840b3953c95fe03f88ef4ce68c9175d0ff Mon Sep 17 00:00:00 2001 From: c3-builder Date: Thu, 28 Mar 2024 10:47:38 +0000 Subject: [PATCH 2/2] Fix BLAS and LAPACK linking --- easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb b/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb index b101da5867a..2c32ff36414 100644 --- a/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb +++ b/easybuild/easyconfigs/c/CVXOPT/CVXOPT-1.3.1-foss-2022a.eb @@ -35,7 +35,8 @@ download_dep_fail = True preinstallopts = " ".join([ 'CVXOPT_BUILD_FFTW=1', 'CVXOPT_BUILD_GSL=1', - 'CVXOPT_BLAS_EXTRA_LINK_ARGS="$LIBLAPACK"', + 'CVXOPT_BLAS_EXTRA_LINK_ARGS="$LIBBLAS"', + 'CVXOPT_LAPACK_EXTRA_LINK_ARGS="$LIBLAPACK"', 'CVXOPT_FFTW_EXTRA_LINK_ARGS="$LIBFFT"', 'CVXOPT_SUITESPARSE_LIB_DIR=$EBROOTSUITESPARSE/lib', 'CVXOPT_SUITESPARSE_INC_DIR=$EBROOTSUITESPARSE/include',