From d4bfd6f9c5f835a6296df13f056a56ede0facdb7 Mon Sep 17 00:00:00 2001
From: Avi Knecht <aknecht@br005.pvt.bridges.psc.edu>
Date: Mon, 22 May 2017 11:22:37 -0400
Subject: [PATCH] Updated workflow executable loading for remote sites.
---
chipathlon/workflow.py | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/chipathlon/workflow.py b/chipathlon/workflow.py
index d13cded..9328384 100644
--- a/chipathlon/workflow.py
+++ b/chipathlon/workflow.py
@@ -192,11 +192,23 @@ class Workflow(object):
for root, dirs, files in os.walk("%s/%s" % (os.path.dirname(os.path.realpath(__file__)), chipathlon.conf.job_scripts)):
for f in files:
if not os.path.splitext(f)[1] == '.pyc':
- self._add_executable(f, os.path.join(root, f))
+ self._add_executable(
+ f,
+ os.path.join(root, f),
+ site=self.execute_site,
+ arch=self.config["sites"][self.execute_site].get("arch", "x86_64"),
+ os_type=self.config["sites"][self.execute_site].get("os", "linux")
+ )
break
# Handle necessary installed scripts
for cmd in chipathlon.conf.system_commands:
- self._add_executable(cmd, os.path.join(chipathlon.conf.system_path, cmd))
+ self._add_executable(
+ cmd,
+ os.path.join(chipathlon.conf.system_path, cmd),
+ site=self.execute_site,
+ arch=self.config["sites"][self.execute_site].get("arch", "x86_64"),
+ os_type=self.config["sites"][self.execute_site].get("os", "linux")
+ )
return
def _load_workflow_jobs(self):
--
GitLab