Moving pragmas around

USCbiostats · Oct 5, 2023 · f7d239d · f7d239d
1 parent 9f96dc4
commit f7d239d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/include/barry/model-meat.hpp b/include/barry/model-meat.hpp
@@ -226,7 +226,7 @@ inline void Model<Array_Type,Data_Counter_Type,Data_Rule_Type, Data_Rule_Dyn_Typ
         );
 
     #if defined(__OPENMP) || defined(_OPENMP)
-    #pragma omp parallel for simd num_threads(ncores) \
+    #pragma omp parallel for num_threads(ncores) collapse(1) \
         shared(n_params, pset_stats, pset_probs, normalizing_constants, pset_sizes, \
             params) \
         default(none)
@@ -238,6 +238,9 @@ inline void Model<Array_Type,Data_Counter_Type,Data_Rule_Type, Data_Rule_Dyn_Typ
         size_t pset_start = pset_locations[s];
 
         // Looping over observations of the pset
+        #if defined(__OPENMP) || defined(_OPENMP)
+        #pragma omp simd 
+        #endif
         for (size_t a = 0u; a < pset_sizes[s]; ++a)
         {
 

diff --git a/include/barry/models/geese/geese-meat-likelihood.hpp b/include/barry/models/geese/geese-meat-likelihood.hpp
@@ -24,7 +24,7 @@ inline void pset_loop(
     if (!x.is_dense())
         throw std::logic_error("This is only supported for dense arrays.");
 
-    const std::vector< size_t > & location_x = locations[n];
+    const size_t * location_x = &locations[n][0u];
 
     // Extracting the possible values of each offspring
     double off_mult = 1.0;
@@ -65,7 +65,7 @@ inline void pset_loop(
         }
 
         // Retrieving the location to the respective set of probabilities
-        off_mult *= n_off->subtree_prob[location_x[o]];
+        off_mult *= n_off->subtree_prob[*(location_x + o)];
 
     }
 
@@ -154,6 +154,7 @@ inline double Geese::likelihood(
             // Starting the prob
             size_t array_id = node.narray[s];
             size_t support_id = arrays2support[array_id];
+            const double * psetsprobs_s = &psetprobs[pset_locations[support_id]];
 
             // Retrieving the sets of arrays
             const std::vector< PhyloArray > & psets =
@@ -173,7 +174,7 @@ inline double Geese::likelihood(
                 pset_loop(
                     n, s, nfunctions, node_id, array_id, totprob_n,
                     par0, states, psets, locations, 
-                    node_offspring, &psetprobs[pset_locations[support_id]]
+                    node_offspring, psetsprobs_s
                 );
             }