diff options
| author | Pjotr Prins | 2017-10-14 07:36:49 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2017-10-14 07:36:49 +0000 |
| commit | 12400932dd780a83bdad51642abda802797960b3 (patch) | |
| tree | 66895ed7dad661f2d950fcc7ad1588513904ec9f /src | |
| parent | ee201807c0c8039aa968ec352a25fffcfdef8056 (diff) | |
| download | pangemma-12400932dd780a83bdad51642abda802797960b3.tar.gz | |
Travis: more fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/gemma.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/gemma.cpp b/src/gemma.cpp index c6863fe..75b1c33 100644 --- a/src/gemma.cpp +++ b/src/gemma.cpp @@ -3088,7 +3088,9 @@ void GEMMA::BatchRun(PARAM &cPar) { } #include "Eigen/Dense" +#if defined(OPENBLAS) && !defined(OPENBLAS_LEGACY) #include <openblas_config.h> +#endif void GEMMA::WriteLog(int argc, char **argv, PARAM &cPar) { string file_str; @@ -3105,15 +3107,18 @@ void GEMMA::WriteLog(int argc, char **argv, PARAM &cPar) { outfile << "## GEMMA Version = " << version << endl; outfile << "## GSL Version = " << GSL_VERSION << endl; outfile << "## Eigen Version = " << EIGEN_WORLD_VERSION << "." << EIGEN_MAJOR_VERSION << "." << EIGEN_MINOR_VERSION << endl; - #ifdef OPENBLAS - - outfile << "## OpenBlas =" << OPENBLAS_VERSION << " - " << openblas_get_config() << endl; // For more recent OpenBlas: << " - " << openblas_get_corename() << endl; +#ifdef OPENBLAS - // outfile << "## threads = " << openblas_get_num_threads() << endl; - outfile << "## threads = " << OPENBLAS_GEMM_MULTITHREAD_THRESHOLD << endl; + #ifndef OPENBLAS_LEGACY + outfile << "## OpenBlas =" << OPENBLAS_VERSION << " - " << openblas_get_config() << endl; + outfile << "## arch = " << openblas_get_corename() << endl; + outfile << "## threads = " << openblas_get_num_threads() << endl; + #else + outfile << "## OpenBlas = " << openblas_get_config() << endl; + #endif string* pStr = new string[4] { "sequential", "threaded", "openmp" }; outfile << "## parallel type = " << pStr[openblas_get_parallel()] << endl; - #endif +#endif outfile << "##" << endl; outfile << "## Command Line Input = "; |