From 0c2c01fdeba3f7312a95daf79b0b3ceaadb685e5 Mon Sep 17 00:00:00 2001 From: conrad Date: Fri, 30 Dec 2022 20:11:26 +1000 Subject: [PATCH] rearrange --- include/armadillo_bits/config.hpp | 10 +++++----- include/armadillo_bits/config.hpp.cmake | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/armadillo_bits/config.hpp b/include/armadillo_bits/config.hpp index 35289961..8b39bcce 100644 --- a/include/armadillo_bits/config.hpp +++ b/include/armadillo_bits/config.hpp @@ -27,6 +27,11 @@ //// 2 = as per level 1, and warnings about poorly conditioned systems (low rcond) detected by solve(), spsolve(), etc //// 3 = as per level 2, and warnings about failed decompositions, failed saving/loading, etc +// #define ARMA_USE_WRAPPER +//// Comment out the above line if you prefer to directly link with BLAS, LAPACK, etc +//// instead of the Armadillo runtime library. +//// You will need to link your programs directly with -lopenblas -llapack instead of -larmadillo + #if !defined(ARMA_USE_LAPACK) #define ARMA_USE_LAPACK //// Comment out the above line if you don't have LAPACK or a high-speed replacement for LAPACK, @@ -90,11 +95,6 @@ #error "use ARMA_USE_FFTW3 instead of ARMA_USE_FFTW" #endif -// #define ARMA_USE_WRAPPER -//// Comment out the above line if you're getting linking errors when compiling your programs, -//// or if you prefer to directly link with LAPACK, BLAS + etc instead of the Armadillo runtime library. -//// You will then need to link your programs directly with -llapack -lblas instead of -larmadillo - // #define ARMA_BLAS_CAPITALS //// Uncomment the above line if your BLAS and LAPACK libraries have capitalised function names diff --git a/include/armadillo_bits/config.hpp.cmake b/include/armadillo_bits/config.hpp.cmake index 98224f85..d019ac5a 100644 --- a/include/armadillo_bits/config.hpp.cmake +++ b/include/armadillo_bits/config.hpp.cmake @@ -27,6 +27,11 @@ //// 2 = as per level 1, and warnings about poorly conditioned systems (low rcond) detected by solve(), spsolve(), etc //// 3 = as per level 2, and warnings about failed decompositions, failed saving/loading, etc +#cmakedefine ARMA_USE_WRAPPER +//// Comment out the above line if you prefer to directly link with BLAS, LAPACK, etc +//// instead of the Armadillo runtime library. +//// You will need to link your programs directly with -lopenblas -llapack instead of -larmadillo + #if !defined(ARMA_USE_LAPACK) #cmakedefine ARMA_USE_LAPACK //// Comment out the above line if you don't have LAPACK or a high-speed replacement for LAPACK, @@ -90,11 +95,6 @@ #error "use ARMA_USE_FFTW3 instead of ARMA_USE_FFTW" #endif -#cmakedefine ARMA_USE_WRAPPER -//// Comment out the above line if you're getting linking errors when compiling your programs, -//// or if you prefer to directly link with LAPACK, BLAS + etc instead of the Armadillo runtime library. -//// You will then need to link your programs directly with -llapack -lblas instead of -larmadillo - // #define ARMA_BLAS_CAPITALS //// Uncomment the above line if your BLAS and LAPACK libraries have capitalised function names