Slowly regaining my sanity.

radical-cybertools · Jan 9, 2017 · 4d23d49 · andre-merzky · Jan 9, 2017 · marksantcroos
1 parent 65234c8
commit 4d23d49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/radical/pilot/agent/lm/orte_lib.py b/src/radical/pilot/agent/lm/orte_lib.py
@@ -23,6 +23,11 @@ def __init__(self, cfg, session):
 
         LaunchMethod.__init__(self, cfg, session)
 
+        # We remove all ORTE related environment variables from the launcher
+        # environment, so that we can use ORTE for both launch of the
+        # (sub-)agent and CU execution.
+        self.env_removables.extend(["OMPI_", "OPAL_", "PMIX_"])
+
 
     # --------------------------------------------------------------------------
     #

diff --git a/src/radical/pilot/configs/agent_titan.json b/src/radical/pilot/configs/agent_titan.json
@@ -14,6 +14,7 @@
             "components" : {
                 "AgentStagingInputComponent"  : 1,
                 "AgentSchedulingComponent"    : 1,
+                "AgentExecutingComponent"     : 1,
                 "AgentStagingOutputComponent" : 1
             }
         }
@@ -53,8 +54,6 @@
 
     "agent_name" : "agent_0",
     "components" : {
-        # AgentExecutingComponent doesn't work from Compute Node with ORTE_LIB
-        "AgentExecutingComponent" : 1,
         "UpdateWorker"            : 1
     }
 }