diff options
| author | Pjotr Prins | 2020-05-22 11:07:44 -0500 |
|---|---|---|
| committer | Pjotr Prins | 2020-05-22 11:07:44 -0500 |
| commit | b309569fe9497befa008ac2d2cbc04f2e861ce76 (patch) | |
| tree | 19f530a3532edfaeb25ccf4f614f21b60e3abc8c /src | |
| parent | 8c82a8294483ffac4d8e9635376723f26a8ae27b (diff) | |
| download | pangemma-b309569fe9497befa008ac2d2cbc04f2e861ce76.tar.gz | |
Removing more eigenlib references
Diffstat (limited to 'src')
| -rw-r--r-- | src/fastblas.cpp | 8 | ||||
| -rw-r--r-- | src/fastopenblas.h | 4 | ||||
| -rw-r--r-- | src/version.h | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/fastblas.cpp b/src/fastblas.cpp index e9e38d0..42c59ee 100644 --- a/src/fastblas.cpp +++ b/src/fastblas.cpp @@ -29,6 +29,7 @@ #include "mathfunc.h" #include <string.h> #include "eigenlib.h" +#include <cblas.h> const char *FastblasTrans = "T"; const char *FastblasNoTrans = "N"; @@ -243,7 +244,12 @@ void fast_eigen_dgemm(const char *TransA, const char *TransB, const double alpha */ #include <gsl/gsl_permutation.h> -#include <gsl/gsl_linalg.h> +// #include <gsl/gsl_linalg.h> + +extern "C" { + int gsl_linalg_LU_invert(const gsl_matrix * LU, const gsl_permutation * p, gsl_matrix * inverse); + int gsl_linalg_LU_decomp(gsl_matrix * A, gsl_permutation * p, int * signum); +} void gsl_matrix_inv(gsl_matrix *m) { diff --git a/src/fastopenblas.h b/src/fastopenblas.h index 2fc743e..7f453da 100644 --- a/src/fastopenblas.h +++ b/src/fastopenblas.h @@ -25,11 +25,11 @@ #include <iostream> extern "C" { - // #include <cblas.h> // For OpenBlas / Atlas + #include <cblas.h> // For OpenBlas / Atlas } // #include "gsl/gsl_matrix.h" -void fast_cblas_dgemm(const enum CBLAS_ORDER Order, +void fast_cblas_dgemm(const enum CBLAS_ORDER , const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_TRANSPOSE TransB, const size_t M, diff --git a/src/version.h b/src/version.h index cfb3ba9..d413933 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ // version.h generated by GEMMA scripts/gen_version_info.sh -#define GEMMA_VERSION "0.98.1" -#define GEMMA_DATE "2018-12-10" -#define GEMMA_YEAR "2018" -#define GEMMA_PROFILE "" +#define GEMMA_VERSION "0.98.2" +#define GEMMA_DATE "2020-05-22" +#define GEMMA_YEAR "2020" +#define GEMMA_PROFILE "/gnu/store/h9xwdvc7kqx7cvpvs6iascfdw5zgzhyd-profile" |