Browse code

merge conflicts

Tom Sherman authored on 24/05/2018 20:34:28
Showing 6 changed files

... ...
@@ -221,7 +221,6 @@ void GapsRunner::displayStatus(const std::string &type, unsigned nIterTotal)
221 221
         Rprintf("%s %d of %d, Atoms:%lu(%lu) Chi2 = %.2f\n\n", type.c_str(),
222 222
             mCurrentIter + 1, nIterTotal, mASampler.nAtoms(),
223 223
             mPSampler.nAtoms(), mASampler.chi2());
224
-
225 224
     }
226 225
 }
227 226
 
... ...
@@ -1,4 +1,4 @@
1
-PKG_CPPFLAGS =  -DSIMD -DGAPS_NDEBUG -msse4.2 -DBOOST_MATH_PROMOTE_DOUBLE_POLICY=0 -fopenmp
1
+PKG_CPPFLAGS =  -DSIMD -DGAPS_NDEBUG -msse4.2 -DBOOST_MATH_PROMOTE_DOUBLE_POLICY=0
2 2
 OBJECTS =   AtomicDomain.o \
3 3
             Cogaps.o \
4 4
             GapsRunner.o \
... ...
@@ -49,4 +49,4 @@ Archive& operator>>(Archive &ar, Vector &vec)
49 49
         ar >> vec.mValues[i];
50 50
     }
51 51
     return ar;
52
-}
53 52
\ No newline at end of file
53
+}
54 54
new file mode 100644
... ...
@@ -0,0 +1,5 @@
1
+#ifndef __COGAPS_MTX_PARSER_H__
2
+#define __COGAPS_MTX_PARSER_H__
3
+
4
+
5
+#endif
0 6
\ No newline at end of file
1 7
new file mode 100644
... ...
@@ -0,0 +1,5 @@
1
+#ifndef __COGAPS_TSV_PARSER_H__
2
+#define __COGAPS_TSV_PARSER_H__
3
+
4
+
5
+#endif
0 6
\ No newline at end of file
... ...
@@ -20,7 +20,14 @@
20 20
 #include <boost/math/distributions/gamma.hpp>
21 21
 
22 22
 #include <stdint.h>
23
-#include <omp.h>
23
+
24
+#ifdef __GAPS_OPENMP__
25
+    #include <omp.h>
26
+#else
27
+    typedef int omp_int_t;
28
+    inline omp_int_t omp_get_thread_num() { return 0; }
29
+    inline omp_int_t omp_get_max_threads() { return 1; }
30
+#endif
24 31
 
25 32
 #define Q_GAMMA_THRESHOLD 0.000001f
26 33
 #define Q_GAMMA_MIN_VALUE 0.0