Merge pull request #571 from scipion-em/jj_fix_runSteps_executor

V3.10.2
scipion-em · Oct 14, 2024 · b8d48c0 · b8d48c0
2 parents 3919ee2 + e2fef0f
commit b8d48c0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,4 @@
+V3.10.2: hotfix: Executor frees the GPU/s used via step id instead of node.
 V3.10.1: hotfix: Avoid double Gpu assignment in scipion parallelize protocols with concurrent GPU steps
 V3.10.0
 developers:

diff --git a/pyworkflow/constants.py b/pyworkflow/constants.py
@@ -43,7 +43,7 @@
 VERSION_1_1 = '1.1.0'
 VERSION_1_2 = '1.2.0'
 VERSION_2_0 = '2.0.0'
-VERSION_3_0 = '3.10.1'
+VERSION_3_0 = '3.10.2'
 
 # For a new release, define a new constant and assign it to LAST_VERSION
 # The existing one has to be added to OLD_VERSIONS list.

diff --git a/pyworkflow/protocol/executor.py b/pyworkflow/protocol/executor.py
@@ -337,7 +337,7 @@ def runSteps(self, steps,
             for node in nodesFinished:
                 step = runningSteps.pop(node)  # remove entry from runningSteps
                 freeNodes.append(node)  # the node is available now
-                self.freeGpusSlot(node)
+                self.freeGpusSlot(step.getObjId())
                 # Notify steps termination and check if we should continue
                 doContinue = stepFinishedCallback(step)
                 if not doContinue: