Skip to content

Commit b698fe8

Browse files
committed
Build with a more recent gcc and openblas - note there is a speed regression on guix because of openblas
1 parent c7fc1d1 commit b698fe8

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

‎.guix-dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Typical Guix container invocation
2-
~/opt/guix/bin/guix environment -C guix --ad-hoc gcc-toolchain gdb gsl openblas zlib bash ld-wrapper perl vim which gperftools
2+
guix environment -C guix --ad-hoc gcc-toolchain gdb gsl openblas zlib bash ld-wrapper perl vim which gperftools
33

‎src/debug.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ inline int fedisableexcept(unsigned int excepts)
139139

140140
#endif
141141

142+
/*
142143
void enable_segfpe() {
143144
if (!is_fpe_check_mode() || is_legacy_mode()) return;
144145
#ifdef __GNUC__
@@ -159,6 +160,7 @@ void disable_segfpe() {
159160
#endif
160161
#endif
161162
}
163+
*/
162164

163165
void write(const char *s, const char *msg) {
164166
if (!is_debug_data_mode() && !is_debug_dump_mode()) return;

‎src/gemma.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,7 +1642,7 @@ void GEMMA::BatchRun(PARAM &cPar) {
16421642
clock_t time_begin, time_start;
16431643
time_begin = clock();
16441644

1645-
if (is_check_mode()) enable_segfpe(); // fast NaN checking by default
1645+
// if (is_check_mode()) enable_segfpe(); // fast NaN checking by default
16461646

16471647
// Read Files.
16481648
cout << "Reading Files ... " << endl;
@@ -1932,7 +1932,7 @@ void GEMMA::BatchRun(PARAM &cPar) {
19321932
VARCOV cVarcov;
19331933
cVarcov.CopyFromParam(cPar);
19341934

1935-
if (is_check_mode()) disable_segfpe(); // disable fast NaN checking for now
1935+
// if (is_check_mode()) disable_segfpe(); // disable fast NaN checking for now
19361936

19371937
if (!cPar.file_bfile.empty()) {
19381938
cVarcov.AnalyzePlink();
@@ -2047,7 +2047,7 @@ void GEMMA::BatchRun(PARAM &cPar) {
20472047
VARCOV cVarcov;
20482048
cVarcov.CopyFromParam(cPar);
20492049

2050-
if (is_check_mode()) disable_segfpe(); // fast NaN checking for now
2050+
// if (is_check_mode()) disable_segfpe(); // fast NaN checking for now
20512051

20522052
if (!cPar.file_bfile.empty()) {
20532053
cVarcov.AnalyzePlink();

‎src/lapack.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ void lapack_eigen_symmv(gsl_matrix *A, gsl_vector *eval, gsl_matrix *evec,
196196

197197
// disable fast NaN checking for now - dsyevr throws NaN errors,
198198
// but fixes them (apparently)
199-
if (is_check_mode()) disable_segfpe();
199+
// if (is_check_mode()) disable_segfpe();
200200

201201
// DSYEVR - computes selected eigenvalues and, optionally,
202202
// eigenvectors of a real symmetric matrix
@@ -223,7 +223,7 @@ void lapack_eigen_symmv(gsl_matrix *A, gsl_vector *eval, gsl_matrix *evec,
223223
if (INFO != 0) cerr << "ERROR: value of INFO is " << INFO;
224224
enforce_msg(INFO == 0, "lapack_eigen_symmv failed");
225225

226-
if (is_check_mode()) enable_segfpe(); // reinstate fast NaN checking
226+
// if (is_check_mode()) enable_segfpe(); // reinstate fast NaN checking
227227

228228
gsl_matrix_transpose(evec);
229229

0 commit comments

Comments
 (0)