phynexis-deps/armadillo-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use original option name for now

Browse Source
This commit is contained in:
conrad
2025-06-11 15:35:14 +10:00
parent 36a5188083
commit 48a33a1fc3
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -303,7 +303,7 @@ the active solution platform must be set to x64, instead of win32.
The MSVC project was tested on Windows 10 (64 bit) with Visual Studio C++ 2019.
Adaptations may be required for 32 bit systems, later versions of Windows and/or the compiler.
For example, options such as `ARMA_BLAS_64BIT_INT` and `ARMA_BLAS_UNDERSCORE`,
For example, options such as `ARMA_BLAS_LONG_LONG` and `ARMA_BLAS_UNDERSCORE`,
defined in `include/armadillo_bits/config.hpp`, may need to be either enabled or disabled.
The folder `examples/lib_win64` contains a copy of lib and dll files
@@ -333,7 +333,7 @@ as used by the replacement libraries. Specifically, the following defines
may need to be enabled or disabled:
ARMA_USE_WRAPPER
ARMA_BLAS_64BIT_INT
ARMA_BLAS_LONG_LONG
ARMA_DONT_USE_FORTRAN_HIDDEN_ARGS
ARMA_BLAS_UNDERSCORE
ARMA_BLAS_CAPITALS
docs.html
+4 -3
View File
@@ -19787,7 +19787,8 @@ Append an underscore to BLAS and LAPACK function names (eg. dgemm_ vs dgemm). En
</tr>
<tr>
<td style="vertical-align: top;">
<code>ARMA_BLAS_64BIT_INT</code>
<!-- <code>ARMA_BLAS_64BIT_INT</code> -->
<code>ARMA_BLAS_LONG_LONG</code>
</td>
<td style="vertical-align: top;">
&nbsp;
@@ -19930,7 +19931,7 @@ Use Intel MKL <i>mkl_malloc()</i> and <i>mkl_free()</i> instead of standard <i>m
Use Intel MKL types for complex numbers.
You will need to include appropriate MKL headers before the Armadillo header.
You may also need to enable one or more of the following options:
<code>ARMA_BLAS_64BIT_INT</code>, <code>ARMA_DONT_USE_FORTRAN_HIDDEN_ARGS</code>
<code>ARMA_BLAS_LONG_LONG</code>, <code>ARMA_DONT_USE_FORTRAN_HIDDEN_ARGS</code>
</td>
</tr>
<tr>
@@ -19957,7 +19958,7 @@ Use 64 bit integers for matrix and vector sizes.
Automatically enabled when using a 64-bit platform, except when using Armadillo in the R environment (via RcppArmadillo).
Useful if matrices/vectors capable of holding more than 4 billion elements are required.
This can also be enabled by adding <code>#define&nbsp;ARMA_64BIT_WORD</code> before each instance of <code>#include&nbsp;&lt;armadillo&gt;</code>.
<br>See also the <code>ARMA_BLAS_64BIT_INT</code> option.
<br>See also the <code>ARMA_BLAS_LONG_LONG</code> option.
</td>
</tr>
<tr>
include/armadillo_bits/config.hpp
+4 -4
View File
@@ -102,7 +102,7 @@
//// Uncomment the above line if your BLAS and LAPACK libraries have function names with a trailing underscore.
//// Conversely, comment it out if the function names don't have a trailing underscore.
// #define ARMA_BLAS_64BIT_INT
// #define ARMA_BLAS_LONG_LONG
//// Uncomment the above line if your BLAS and LAPACK libraries use 64 bit integers, ie. "long long" instead of "int"
// #define ARMA_BLAS_NOEXCEPT
@@ -128,7 +128,7 @@
//// Uncomment the above line to use Intel MKL types for complex numbers.
//// You will need to include appropriate MKL headers before the Armadillo header.
//// You may also need to enable or disable the following options:
//// ARMA_BLAS_64BIT_INT, ARMA_USE_FORTRAN_HIDDEN_ARGS
//// ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS
#if !defined(ARMA_USE_OPENMP)
// #define ARMA_USE_OPENMP
@@ -320,8 +320,8 @@
#undef ARMA_BLAS_64BIT_INT
#define ARMA_BLAS_64BIT_INT
#pragma message ("options ARMA_BLAS_LONG and ARMA_BLAS_LONG_LONG are deprecated;")
#pragma message ("use ARMA_BLAS_64BIT_INT instead")
// #pragma message ("options ARMA_BLAS_LONG and ARMA_BLAS_LONG_LONG are deprecated;")
// #pragma message ("use ARMA_BLAS_64BIT_INT instead")
#endif
#if defined(ARMA_DONT_OPTIMISE_BAND) || defined(ARMA_DONT_OPTIMISE_SOLVE_BAND)
include/armadillo_bits/config.hpp.cmake
+4 -4
View File
@@ -102,7 +102,7 @@
//// Uncomment the above line if your BLAS and LAPACK libraries have function names with a trailing underscore.
//// Conversely, comment it out if the function names don't have a trailing underscore.
// #define ARMA_BLAS_64BIT_INT
// #define ARMA_BLAS_LONG_LONG
//// Uncomment the above line if your BLAS and LAPACK libraries use 64 bit integers, ie. "long long" instead of "int"
// #define ARMA_BLAS_NOEXCEPT
@@ -128,7 +128,7 @@
//// Uncomment the above line to use Intel MKL types for complex numbers.
//// You will need to include appropriate MKL headers before the Armadillo header.
//// You may also need to enable or disable the following options:
//// ARMA_BLAS_64BIT_INT, ARMA_USE_FORTRAN_HIDDEN_ARGS
//// ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS
#if !defined(ARMA_USE_OPENMP)
// #define ARMA_USE_OPENMP
@@ -320,8 +320,8 @@
#undef ARMA_BLAS_64BIT_INT
#define ARMA_BLAS_64BIT_INT
#pragma message ("options ARMA_BLAS_LONG and ARMA_BLAS_LONG_LONG are deprecated;")
#pragma message ("use ARMA_BLAS_64BIT_INT instead")
// #pragma message ("options ARMA_BLAS_LONG and ARMA_BLAS_LONG_LONG are deprecated;")
// #pragma message ("use ARMA_BLAS_64BIT_INT instead")
#endif
#if defined(ARMA_DONT_OPTIMISE_BAND) || defined(ARMA_DONT_OPTIMISE_SOLVE_BAND)