"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "include/armadillo_bits/config.hpp.cmake" between
armadillo-10.8.2.tar.xz and armadillo-11.0.0.tar.xz

About: Armadillo is a C++ linear algebra library (matrix maths) aiming towards a good balance between speed and ease of use.

config.hpp.cmake  (armadillo-10.8.2.tar.xz):config.hpp.cmake  (armadillo-11.0.0.tar.xz)
skipping to change at line 69 skipping to change at line 69
//// Caveat: only SuperLU version 5.2 can be used! //// Caveat: only SuperLU version 5.2 can be used!
#endif #endif
#if !defined(ARMA_SUPERLU_INCLUDE_DIR) #if !defined(ARMA_SUPERLU_INCLUDE_DIR)
#define ARMA_SUPERLU_INCLUDE_DIR ${ARMA_SUPERLU_INCLUDE_DIR}/ #define ARMA_SUPERLU_INCLUDE_DIR ${ARMA_SUPERLU_INCLUDE_DIR}/
//// If you're using SuperLU and want to explicitly include the SuperLU headers, //// If you're using SuperLU and want to explicitly include the SuperLU headers,
//// uncomment the above define and specify the appropriate include directory. //// uncomment the above define and specify the appropriate include directory.
//// Make sure the directory has a trailing / //// Make sure the directory has a trailing /
#endif #endif
#if !defined(ARMA_USE_ATLAS)
#cmakedefine ARMA_USE_ATLAS
//// NOTE: support for ATLAS is deprecated and will be removed.
#endif
#cmakedefine ARMA_USE_WRAPPER #cmakedefine ARMA_USE_WRAPPER
//// Comment out the above line if you're getting linking errors when compiling your programs, //// 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 Ar madillo runtime library. //// or if you prefer to directly link with LAPACK, BLAS + etc instead of the Ar madillo runtime library.
//// You will then need to link your programs directly with -llapack -lblas inst ead of -larmadillo //// You will then need to link your programs directly with -llapack -lblas inst ead of -larmadillo
// #define ARMA_BLAS_CAPITALS // #define ARMA_BLAS_CAPITALS
//// Uncomment the above line if your BLAS and LAPACK libraries have capitalised function names //// Uncomment the above line if your BLAS and LAPACK libraries have capitalised function names
#define ARMA_BLAS_UNDERSCORE #define ARMA_BLAS_UNDERSCORE
//// Uncomment the above line if your BLAS and LAPACK libraries have function na mes with a trailing underscore. //// Uncomment the above line if your BLAS and LAPACK libraries have function na mes with a trailing underscore.
skipping to change at line 112 skipping to change at line 117
// #define ARMA_USE_MKL_ALLOC // #define ARMA_USE_MKL_ALLOC
//// Uncomment the above line if you want to use Intel MKL mkl_malloc() and mkl_ free() instead of standard malloc() and free() //// Uncomment the above line if you want to use Intel MKL mkl_malloc() and mkl_ free() instead of standard malloc() and free()
// #define ARMA_USE_MKL_TYPES // #define ARMA_USE_MKL_TYPES
//// Uncomment the above line if you want to use Intel MKL types for complex num bers. //// Uncomment the above line if you want to use Intel MKL types for complex num bers.
//// You will need to include appropriate MKL headers before the Armadillo heade r. //// You will need to include appropriate MKL headers before the Armadillo heade r.
//// You may also need to enable or disable the following options: //// You may also need to enable or disable the following options:
//// ARMA_BLAS_LONG, ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS //// ARMA_BLAS_LONG, ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS
#cmakedefine ARMA_USE_ATLAS
#define ARMA_ATLAS_INCLUDE_DIR ${ARMA_ATLAS_INCLUDE_DIR}/
//// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h
//// uncomment the above define and specify the appropriate include directory.
//// Make sure the directory has a trailing /
#if !defined(ARMA_USE_OPENMP) #if !defined(ARMA_USE_OPENMP)
// #define ARMA_USE_OPENMP // #define ARMA_USE_OPENMP
//// Uncomment the above line to forcefully enable use of OpenMP for parallelisa tion. //// Uncomment the above line to forcefully enable use of OpenMP for parallelisa tion.
//// Note that ARMA_USE_OPENMP is automatically enabled when a compiler supporti ng OpenMP 3.1 is detected. //// Note that ARMA_USE_OPENMP is automatically enabled when a compiler supporti ng OpenMP 3.1 is detected.
#endif #endif
#if !defined(ARMA_64BIT_WORD) #if !defined(ARMA_64BIT_WORD)
// #define ARMA_64BIT_WORD // #define ARMA_64BIT_WORD
//// Uncomment the above line if you require matrices/vectors capable of holding more than 4 billion elements. //// Uncomment the above line if you require matrices/vectors capable of holding more than 4 billion elements.
//// Note that ARMA_64BIT_WORD is automatically enabled when std::size_t has 64 bits and ARMA_32BIT_WORD is not defined. //// Note that ARMA_64BIT_WORD is automatically enabled when std::size_t has 64 bits and ARMA_32BIT_WORD is not defined.
skipping to change at line 147 skipping to change at line 146
#if !defined(ARMA_OPTIMISE_BAND) #if !defined(ARMA_OPTIMISE_BAND)
#define ARMA_OPTIMISE_BAND #define ARMA_OPTIMISE_BAND
//// Comment out the above line if you don't want automatically optimised hand ling //// Comment out the above line if you don't want automatically optimised hand ling
//// of band matrices by solve() and chol() //// of band matrices by solve() and chol()
#endif #endif
#if !defined(ARMA_OPTIMISE_SYMPD) #if !defined(ARMA_OPTIMISE_SYMPD)
#define ARMA_OPTIMISE_SYMPD #define ARMA_OPTIMISE_SYMPD
//// Comment out the above line if you don't want automatically optimised hand ling //// Comment out the above line if you don't want automatically optimised hand ling
//// of symmetric/hermitian positive definite matrices by various functions: //// of symmetric/hermitian positive definite matrices by various functions:
//// solve(), inv(), pinv(), expmat(), logmat(), sqrtmat(), rcond() //// solve(), inv(), pinv(), expmat(), logmat(), sqrtmat(), rcond(), rank()
#endif
#if !defined(ARMA_OPTIMISE_INVEXPR)
#define ARMA_OPTIMISE_INVEXPR
//// Comment out the above line if you don't want automatically optimised hand
ling
//// of inv() and inv_sympd() within compound expressions
#endif
#if !defined(ARMA_CHECK_NONFINITE)
#define ARMA_CHECK_NONFINITE
//// Comment out the above line if you don't want automatic checking for nonfi
nite matrices
#endif #endif
#cmakedefine ARMA_USE_HDF5_ALT // #define ARMA_USE_HDF5_ALT
#if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER) #if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER)
#undef ARMA_USE_HDF5 #undef ARMA_USE_HDF5
#define ARMA_USE_HDF5 #define ARMA_USE_HDF5
#define ARMA_HDF5_INCLUDE_DIR ${ARMA_HDF5_INCLUDE_DIR}/ #define ARMA_HDF5_INCLUDE_DIR ${ARMA_HDF5_INCLUDE_DIR}/
#endif #endif
#if !defined(ARMA_MAT_PREALLOC) #if !defined(ARMA_MAT_PREALLOC)
#define ARMA_MAT_PREALLOC 16 #define ARMA_MAT_PREALLOC 16
#endif #endif
skipping to change at line 212 skipping to change at line 222
#if !defined(ARMA_CERR_STREAM) #if !defined(ARMA_CERR_STREAM)
#if defined(ARMA_DEFAULT_OSTREAM) #if defined(ARMA_DEFAULT_OSTREAM)
// for compatibility with earlier versions of Armadillo // for compatibility with earlier versions of Armadillo
#define ARMA_CERR_STREAM ARMA_DEFAULT_OSTREAM #define ARMA_CERR_STREAM ARMA_DEFAULT_OSTREAM
#else #else
#define ARMA_CERR_STREAM std::cerr #define ARMA_CERR_STREAM std::cerr
#endif #endif
#endif #endif
#if !defined(ARMA_PRINT_ERRORS)
#define ARMA_PRINT_ERRORS
//// Comment out the above line if you don't want errors and warnings printed (e
g. failed decompositions)
#endif
#if !defined(ARMA_PRINT_EXCEPTIONS) #if !defined(ARMA_PRINT_EXCEPTIONS)
// #define ARMA_PRINT_EXCEPTIONS // #define ARMA_PRINT_EXCEPTIONS
//// see also compiler_setup.hpp #if defined(ARMA_PRINT_EXCEPTIONS_INTERNAL)
#undef ARMA_PRINT_EXCEPTIONS
#define ARMA_PRINT_EXCEPTIONS
#endif
#endif #endif
#if !defined(ARMA_PRINT_HDF5_ERRORS) #if !defined(ARMA_PRINT_HDF5_ERRORS)
// #define ARMA_PRINT_HDF5_ERRORS // #define ARMA_PRINT_HDF5_ERRORS
#endif #endif
#if defined(ARMA_DONT_USE_LAPACK) #if defined(ARMA_DONT_USE_LAPACK)
#undef ARMA_USE_LAPACK #undef ARMA_USE_LAPACK
#endif #endif
skipping to change at line 249 skipping to change at line 257
#undef ARMA_USE_ARPACK #undef ARMA_USE_ARPACK
#endif #endif
#if defined(ARMA_DONT_USE_SUPERLU) #if defined(ARMA_DONT_USE_SUPERLU)
#undef ARMA_USE_SUPERLU #undef ARMA_USE_SUPERLU
#undef ARMA_SUPERLU_INCLUDE_DIR #undef ARMA_SUPERLU_INCLUDE_DIR
#endif #endif
#if defined(ARMA_DONT_USE_ATLAS) #if defined(ARMA_DONT_USE_ATLAS)
#undef ARMA_USE_ATLAS #undef ARMA_USE_ATLAS
#undef ARMA_ATLAS_INCLUDE_DIR
#endif #endif
#if defined(ARMA_DONT_USE_WRAPPER) #if defined(ARMA_DONT_USE_WRAPPER)
#undef ARMA_USE_WRAPPER #undef ARMA_USE_WRAPPER
#undef ARMA_USE_HDF5_ALT #undef ARMA_USE_HDF5_ALT
#endif #endif
#if defined(ARMA_DONT_USE_FORTRAN_HIDDEN_ARGS) #if defined(ARMA_DONT_USE_FORTRAN_HIDDEN_ARGS)
#undef ARMA_USE_FORTRAN_HIDDEN_ARGS #undef ARMA_USE_FORTRAN_HIDDEN_ARGS
#endif #endif
skipping to change at line 312 skipping to change at line 319
#endif #endif
#if defined(ARMA_DONT_OPTIMISE_BAND) || defined(ARMA_DONT_OPTIMISE_SOLVE_BAND) #if defined(ARMA_DONT_OPTIMISE_BAND) || defined(ARMA_DONT_OPTIMISE_SOLVE_BAND)
#undef ARMA_OPTIMISE_BAND #undef ARMA_OPTIMISE_BAND
#endif #endif
#if defined(ARMA_DONT_OPTIMISE_SYMPD) || defined(ARMA_DONT_OPTIMISE_SOLVE_SYMPD) #if defined(ARMA_DONT_OPTIMISE_SYMPD) || defined(ARMA_DONT_OPTIMISE_SOLVE_SYMPD)
#undef ARMA_OPTIMISE_SYMPD #undef ARMA_OPTIMISE_SYMPD
#endif #endif
#if defined(ARMA_DONT_PRINT_ERRORS) #if defined(ARMA_DONT_OPTIMISE_INVEXPR)
#undef ARMA_PRINT_ERRORS #undef ARMA_OPTIMISE_INVEXPR
#endif
#if defined(ARMA_DONT_CHECK_NONFINITE)
#undef ARMA_CHECK_NONFINITE
#endif #endif
// #if defined(ARMA_DONT_PRINT_ERRORS)
// #pragma message ("WARNING: support for ARMA_DONT_PRINT_ERRORS option has
been removed;")
// #pragma message ("WARNING: use ARMA_WARN_LEVEL and ARMA_DONT_PRINT_EXCEPT
IONS options instead.")
// #endif
#if defined(ARMA_DONT_PRINT_EXCEPTIONS) #if defined(ARMA_DONT_PRINT_EXCEPTIONS)
#undef ARMA_PRINT_EXCEPTIONS #undef ARMA_PRINT_EXCEPTIONS
#endif #endif
#if !defined(ARMA_DONT_ZERO_INIT) #if !defined(ARMA_DONT_ZERO_INIT)
// #define ARMA_DONT_ZERO_INIT // #define ARMA_DONT_ZERO_INIT
//// Uncomment the above line to disable initialising elements to zero during construction of dense matrices and cubes //// Uncomment the above line to disable initialising elements to zero during construction of dense matrices and cubes
#endif #endif
#if defined(ARMA_DONT_PRINT_HDF5_ERRORS) #if defined(ARMA_DONT_PRINT_HDF5_ERRORS)
 End of changes. 9 change blocks. 
19 lines changed or deleted 38 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)