correcting shared variables

BackofenLab · May 5, 2022 · b8fef4b · b8fef4b
1 parent 57fd8f1
commit b8fef4b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -10,10 +10,18 @@
 # changes in development version since last release 
 ################################################################################
 
+# IntaRNA
+- compilation fix: correcting shared variables for parallelization
+- BUGFIX debug check
 
 ################################################################################  
 ################################################################################
 
+220505 Martin Raden
+ * bin/IntaRNA :
+   * compilation fix: removing queryNumber from shared variables, since constant
+ * IntaRNA/PredictorMfe2d:
+   * predict() : bugfix: debug check was calling wrong function
 
 ################################################################################
 ### version 3.3.1

diff --git a/src/IntaRNA/PredictorMfe2d.cpp b/src/IntaRNA/PredictorMfe2d.cpp
@@ -100,8 +100,8 @@ fillHybridE( const size_t j1, const size_t j2
 		throw std::runtime_error("PredictorMfe2d::fillHybridE() : i1init > j1 : "+toString(i1init)+" > "+toString(j1));
 	if (i2init > j2)
 		throw std::runtime_error("PredictorMfe2d::fillHybridE() : i2init > j2 : "+toString(i2init)+" > "+toString(j2));
-	if (!energy.isAccessible2(j1))
-		throw std::runtime_error("PredictorMfe2d::fillHybridE() : !energy.isAccessible2(j1) : "+toString(j1));
+	if (!energy.isAccessible1(j1))
+		throw std::runtime_error("PredictorMfe2d::fillHybridE() : !energy.isAccessible1(j1) : "+toString(j1));
 	if (!energy.isAccessible2(j2))
 		throw std::runtime_error("PredictorMfe2d::fillHybridE() : !energy.isAccessible2(j2) : "+toString(j2));
 #endif

diff --git a/src/bin/IntaRNA.cpp b/src/bin/IntaRNA.cpp
@@ -230,7 +230,7 @@ int main(int argc, char **argv){
 									// iterate over all window combinations
 #if INTARNA_MULITHREADING
 									// this parallelization should only be enabled if neither the outer target-loop nor the inner query-loop are parallelized
-									# pragma omp parallel for schedule(dynamic) collapse(2) num_threads( parameters.getThreads() ) shared(queryAcc,reportedInteractions,exceptionPtrDuringOmp,exceptionInfoDuringOmp,targetAcc,targetNumber,queryNumber,queryWindows,targetWindows, bestInteractions, energy) if(parallelizeWindowsLoop)
+									# pragma omp parallel for schedule(dynamic) collapse(2) num_threads( parameters.getThreads() ) shared(queryAcc,reportedInteractions,exceptionPtrDuringOmp,exceptionInfoDuringOmp,targetAcc,targetNumber,queryWindows,targetWindows, bestInteractions, energy) if(parallelizeWindowsLoop)
 #endif									
 									for (int qNumWindow = 0; qNumWindow < queryWindows.size(); ++qNumWindow) {
 									for (int tNumWindow = 0; tNumWindow < targetWindows.size(); ++tNumWindow) {