Adding ncores

USCbiostats · Sep 27, 2023 · d57476a · d57476a
1 parent c57353c
commit d57476a
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 92 deletions.
diff --git a/barry.hpp b/barry.hpp
diff --git a/include/barry/barry-macros.hpp b/include/barry/barry-macros.hpp
@@ -12,7 +12,7 @@
 #if defined(_OPENMP) || defined(__OPENMP)
 #define BARRY_NCORES_ARG(default) size_t ncores default
 #else 
-#define BARRY_NCORES_ARG(default) size_t 
+#define BARRY_NCORES_ARG(default) size_t ncores default
 #endif
 
 

diff --git a/include/barry/counters/network.hpp b/include/barry/counters/network.hpp
@@ -673,7 +673,7 @@ inline void counter_ctriads(NetCounters<NetworkDense> * counters)
 
         // i->j->k->i
         double ans = 0.0;
-        #ifdef __OPENM 
+        #if defined(__OPENMP) || defined(_OPENMP) 
         #pragma omp simd reduction(+:ans)
         #endif
         for (size_t k = 0u; k < Array.nrow(); ++k)

diff --git a/include/barry/model-meat.hpp b/include/barry/model-meat.hpp
@@ -914,7 +914,7 @@ inline double Model<Array_Type,Data_Counter_Type, Data_Rule_Type, Data_Rule_Dyn_
                 params.size()
                 ) BARRY_SAFE_EXP;
 
-        #ifdef __OPENM 
+        #if defined(__OPENMP) || defined(_OPENMP) 
         #pragma omp simd reduction(-:res)
         #endif
         for (size_t i = 0u; i < params_last_size; ++i)
@@ -924,7 +924,7 @@ inline double Model<Array_Type,Data_Counter_Type, Data_Rule_Type, Data_Rule_Dyn_
 
         res = 1.0;
         size_t stats_target_size = stats_target.size();
-        #ifdef __OPENM 
+        #if defined(__OPENMP) || defined(_OPENMP) 
         #pragma omp simd reduction(*:res)
         #endif
         for (size_t i = 0; i < stats_target_size; ++i)

diff --git a/include/barry/models/geese/flock-bones.hpp b/include/barry/models/geese/flock-bones.hpp
@@ -70,7 +70,7 @@ class Flock {
         const std::vector< double > & par,
         bool as_log = false,
         bool use_reduced_sequence = true,
-        BARRY_NCORES_ARG(=1)
+        size_t ncores = 1u
     );
 
     /**

diff --git a/include/barry/models/geese/flock-meat.hpp b/include/barry/models/geese/flock-meat.hpp
@@ -139,7 +139,7 @@ inline double Flock::likelihood_joint(
     const std::vector< double > & par,
     bool as_log,
     bool use_reduced_sequence,
-    BARRY_NCORES_ARG()
+    size_t ncores
 )
 {
 
@@ -150,14 +150,14 @@ inline double Flock::likelihood_joint(
     if (as_log) {
 
         for (auto& d : this->dat) 
-            ans += d.likelihood(par, as_log, use_reduced_sequence);
+            ans += d.likelihood(par, as_log, use_reduced_sequence, ncores);
 
     }
     else
     {
 
         for (auto& d : this->dat) 
-            ans *= d.likelihood(par, as_log, use_reduced_sequence);
+            ans *= d.likelihood(par, as_log, use_reduced_sequence, ncores);
 
     }
 

diff --git a/include/barry/models/geese/geese-bones.hpp b/include/barry/models/geese/geese-bones.hpp
@@ -216,7 +216,7 @@ class Geese {
         const std::vector< double > & par,
         bool as_log = false,
         bool use_reduced_sequence = true,
-        BARRY_NCORES_ARG(= 1)
+        size_t ncores = 1u
         );
 
     double likelihood_exhaust(const std::vector< double > & par);

diff --git a/include/barry/models/geese/geese-meat-likelihood.hpp b/include/barry/models/geese/geese-meat-likelihood.hpp
@@ -7,7 +7,7 @@ inline double Geese::likelihood(
     const std::vector< double > & par,
     bool as_log,
     bool use_reduced_sequence,
-    BARRY_NCORES_ARG()
+    size_t ncores
 ) {
 
     INITIALIZED()
@@ -150,6 +150,7 @@ inline double Geese::likelihood(
                         par0,
                         temp_stats,
                         node.narray[s],
+                        as_log,
                         ncores
                     );
                 } catch (std::exception & e) {

diff --git a/include/barry/typedefs.hpp b/include/barry/typedefs.hpp
@@ -256,7 +256,7 @@ inline bool vec_equal_approx(
 }
 ///@}
 
-#ifdef __OPENM
+#if defined(__OPENMP) || defined(_OPENMP)
 #pragma omp declare simd
 #endif
 template <typename T>
@@ -267,7 +267,7 @@ inline T vec_inner_prod(
 ) {
 
     double res = 0.0;
-    #ifdef __OPENM 
+    #if defined(__OPENMP) || defined(_OPENMP) 
     #pragma omp simd reduction(+:res)
     #else
         #ifdef __GNUC__
@@ -283,7 +283,7 @@ inline T vec_inner_prod(
 
 }
 
-#ifdef __OPENM
+#if defined(__OPENMP) || defined(_OPENMP)
 #pragma omp declare simd
 #endif
 template <>