@@ -2,7 +2,6 @@

 #include "AtomicDomain.h"

 #include "math/Random.h"

-#include <omp.h>

 #include <stdint.h>

 #include <utility>

@@ -15,10 +14,7 @@ Atom AtomicDomain::front() const

 // O(1)

 Atom AtomicDomain::randomAtom() const

 {

-    uint64_t ndx = gaps::random::uniform64(0, mAtoms.size() - 1);

-    //GAPS_ASSERT(mAtoms.size() >= 1);

-    //GAPS_ASSERT(ndx < mAtoms.size());

-    return mAtoms[ndx];

+    return mAtoms[gaps::random::uniform64(0, mAtoms.size() - 1)];

 }

 // Average Case O(1)

@@ -14,8 +14,10 @@ const Rcpp::NumericMatrix &FP, unsigned checkpointInterval,

 const std::string &cptFile, unsigned pumpThreshold, unsigned nPumpSamples,

 unsigned nCores)

 {

-    unsigned availableCores = omp_get_max_threads();

-    Rprintf("Running on %d out of %d available cores\n", nCores, availableCores);

+    #ifdef __GAPS_OPENMP__

+        unsigned availableCores = omp_get_max_threads();

+        Rprintf("Running on %d out of %d available cores\n", nCores, availableCores);

+    #endif

     // create internal state from parameters and run from there

     GapsRunner runner(D, S, nFactor, nEquil, nEquilCool, nSample,

@@ -61,7 +63,7 @@ std::string getBuildReport_cpp()

     std::string simd = "SIMD not enabled\n";

 #endif

-#if defined(_OPENMP)

+#if defined(_GAPS_OPENMP)

     std::string openmp = "Compiled with OpenMP\n";

 #else

     std::string openmp = "Compiler did not support OpenMP\n";

@@ -11,7 +11,6 @@

 #include <Rcpp.h>

 #include <algorithm>

-#include <omp.h>

 // forward declarations needed for friend classes

 class AmplitudeGibbsSampler;

@@ -1,4 +1,4 @@

-PKG_CPPFLAGS =  -DSIMD -DGAPS_NDEBUG -msse4.2 -DBOOST_MATH_PROMOTE_DOUBLE_POLICY=0 -fopenmp

+PKG_CPPFLAGS =  -DSIMD -DGAPS_NDEBUG -msse4.2 -DBOOST_MATH_PROMOTE_DOUBLE_POLICY=0

 OBJECTS =   AtomicDomain.o \

             Cogaps.o \

             GapsRunner.o \

@@ -20,7 +20,14 @@

 #include <boost/math/distributions/gamma.hpp>

 #include <stdint.h>

-#include <omp.h>

+

+#if defined(__GAPS_OPENMP__)

+    #include <omp.h>

+#else

+    typedef int omp_int_t;

+    inline omp_int_t omp_get_thread_num() { return 0; }

+    inline omp_int_t omp_get_max_threads() { return 1; }

+#endif

 #define Q_GAMMA_THRESHOLD 0.000001f

 #define Q_GAMMA_MIN_VALUE 0.0

@@ -7,6 +7,8 @@

 #if !defined(_OPENMP)

     #warning "Compiler does not support OpenMP"

+#else

+    #define __GAPS_OPENMP__

 #endif

 #ifndef SSE_INSTR_SET