print error message when trying to run consecutive mcmc runs with beagle

ayresdl · Aug 2, 2018 · 8365d76 · 8365d76
1 parent d3e2f23
commit 8365d76
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/examples/mcmc-primates.nex b/examples/mcmc-primates.nex
@@ -23,7 +23,7 @@ end;
 
 begin mrbayes;
 
-set usebeagle=yes;
+
 
 set autoclose=yes nowarn=yes seed=1 swapseed=1;
 
@@ -49,5 +49,6 @@ set seed=1 swapseed=1;
 [mcmc ngen=50000 nruns=1 nchains=1;]
 [mcmc ngen=1 nruns=1 nchains=1;]
 mcmc ngen=5000 nruns=1 nchains=1 printfreq=1000;
+mcmc;
 
 end;
diff --git a/src/mbbeagle.c b/src/mbbeagle.c
@@ -69,6 +69,12 @@ int InitBeagleInstance (ModelInfo *m, int division)
     double                  *inPartials;
     BitsLong                *charBits;
 
+    if (m->beagleInstance == -99) {
+        MrBayesPrint ("\n%s   Error: Consecutive MCMC runs not currently supported with BEAGLE. Please restart MrBayes.\n\n", spacer);
+        exit(1);
+    }
+
+
     if (m->useBeagle == NO)
         return ERROR;
 
@@ -169,16 +175,15 @@ int InitBeagleInstance (ModelInfo *m, int division)
 
 int createBeagleInstance(int nCijkParts, int numGammaCats, int numModelStates, int numCondLikes, int numScalers, int numChars, int numTiProbs, int numPartAmbigTips, int division)
 {
-    int                     resource, beagleInstance;
+    int                     resource, resourceCount, beagleInstance;
     BeagleInstanceDetails   details;
     long                    preferredFlags, requiredFlags;
 
+    resourceCount = beagleResourceCount;
+
     preferredFlags = beagleFlags;
-
     requiredFlags = 0L;
-
     long benchmarkFlags = BEAGLE_BENCHFLAG_SCALING_NONE;
-
     if (beagleScalingScheme == MB_BEAGLE_SCALE_ALWAYS) {
         requiredFlags |= BEAGLE_FLAG_SCALERS_LOG; //BEAGLE_FLAG_SCALERS_RAW;
         benchmarkFlags = BEAGLE_BENCHFLAG_SCALING_ALWAYS;
@@ -189,7 +194,7 @@ int createBeagleInstance(int nCijkParts, int numGammaCats, int numModelStates, i
     if (beagleResourceNumber >= 0 && beagleResourceNumber != 99)
         {
         resource = beagleResourceNumber;
-        beagleResourceCount = 1;
+        resourceCount = 1;
         }
     else if (beagleResourceCount != 0) 
         {
@@ -267,7 +272,7 @@ int createBeagleInstance(int nCijkParts, int numGammaCats, int numModelStates, i
         if (rBList != NULL) {
             double fastestTime = rBList->list[0].benchmarkResult;
             resource = rBList->list[0].number;
-            beagleResourceCount = 1;
+            resourceCount = 1;
 
             for (int i = 1; i < rBList->length; i++) {
                 if (rBList->list[i].benchmarkResult < fastestTime) {
@@ -290,8 +295,8 @@ int createBeagleInstance(int nCijkParts, int numGammaCats, int numModelStates, i
                                           numTiProbs*nCijkParts,
                                           numGammaCats,
                                           numScalers * nCijkParts,
-                                          (beagleResourceCount == 0 ? NULL : &resource),
-                                          (beagleResourceCount == 0 ? 0 : 1),
+                                          (resourceCount == 0 ? NULL : &resource),
+                                          (resourceCount == 0 ? 0 : 1),
                                           preferredFlags,
                                           requiredFlags,
                                           &details);
@@ -1508,6 +1513,11 @@ int InitBeagleMultiPartitionInstance ()
 
     m = &modelSettings[0];
 
+    if (m->beagleInstance == -99) {
+        MrBayesPrint ("\n%s   Error: Consecutive MCMC runs not currently supported with BEAGLE. Please restart MrBayes.\n\n", spacer);
+        exit(1);
+    }
+
     if (m->useBeagle == NO)
         return ERROR;
 

diff --git a/src/mcmc.c b/src/mcmc.c
@@ -4644,8 +4644,10 @@ void FreeChainMemory (void)
         if (m->useBeagle == NO)
             continue;
 
-        if (!(m->useBeagleMultiPartitions == YES && m->divisionIndex > 0))
+        if (!(m->useBeagleMultiPartitions == YES && m->divisionIndex > 0)) {
             beagleFinalizeInstance(m->beagleInstance);
+            m->beagleInstance = -99; // TODO: allow consecutive 'mcmc' runs using BEAGLE
+        }
 
         SafeFree((void **)(&m->logLikelihoods));
         SafeFree((void **)(&m->inRates));
@@ -5892,7 +5894,7 @@ int InitChainCondLikes (void)
 
     useBeagleMultiPartitions = NO;
 #   if defined (BEAGLE_MULTIPART_ENABLED)
-    if (beagleResourceNumber != 0 && numCurrentDivisions > 1 && InitBeagleMultiPartitionInstance() != ERROR)
+    if (beagleResourceNumber != 0 && numCurrentDivisions > 1 && InitBeagleMultiPartitionInstance() != ERROR && m->useBeagle == YES)
         useBeagleMultiPartitions = YES;
 #   endif