From 4d23d4977477ef65d545e9b15e923ccd5542c24e Mon Sep 17 00:00:00 2001
From: Mark Santcroos <mas781@scarletmail.rutgers.edu>
Date: Mon, 9 Jan 2017 11:13:18 -0500
Subject: [PATCH] Slowly regaining my sanity.

---
 src/radical/pilot/agent/lm/orte_lib.py     | 5 +++++
 src/radical/pilot/configs/agent_titan.json | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/radical/pilot/agent/lm/orte_lib.py b/src/radical/pilot/agent/lm/orte_lib.py
index 513684fb00..a81345283d 100755
--- 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
index 8d8a17b6f7..607f44eb3e 100644
--- 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
     }
 }