Commit 36d2bb34 authored by Adam Caprez's avatar Adam Caprez
Browse files

Change to using local execute site

parent 847f2aae
......@@ -88,14 +88,14 @@ class Workflow(object):
for f in files:
ex_name = f.split("_")[0]
self.executables[ex_name] = Executable(name=ex_name, os=os_type, arch=arch)
self.executables[ex_name].addPFN(PFN("file://%s/%s" % (root, f), "condorpool"))
self.executables[ex_name].addPFN(PFN("file://%s/%s" % (root, f), "local"))
self.dax.addExecutable(self.executables[ex_name])
break
# Load actual scripts
for root, dirs, files in os.walk("%s/%s" % (os.path.dirname(os.path.realpath(__file__)), chipathlon.conf.job_scripts)):
for f in files:
self.executables[f] = Executable(name=f, os=os_type, arch=arch)
self.executables[f].addPFN(PFN("file://%s/%s" % (root, f), "condorpool"))
self.executables[f].addPFN(PFN("file://%s/%s" % (root, f), "local"))
self.dax.addExecutable(self.executables[f])
break
self._raise()
......@@ -323,24 +323,26 @@ class Workflow(object):
</directory>
<directory type="local-storage" path="%s">
<file-server operation="all" url="file://%s" />
</directory>
</site>
<site handle="condorpool" arch="x86_64" os="LINUX">
</directory>""" % (
os.path.join(self.basepath, "work"),
os.path.join(self.basepath, "work"),
os.path.join(self.basepath, "output"),
os.path.join(self.basepath, "output")
)
# NEED TO DETERMINE HOW TO READ IN THIS INFO
for namespace in self.config["profile"]:
for key in self.config["profile"][namespace]:
sites += """\n\t<profile namespace="%s" key="%s">%s</profile> """ % (namespace, key, self.config["profile"][namespace][key])
sites +="""</site>
<site handle="dummylocal" arch="x86_64" os="LINUX">
<directory type="shared-scratch" path="%s">
<file-server operation="all" url="file://%s" />
</directory>
""" % (
os.path.join(self.basepath, "work"),
os.path.join(self.basepath, "work"),
os.path.join(self.basepath, "output"),
os.path.join(self.basepath, "output"),
os.path.join(self.basepath, "work"),
os.path.join(self.basepath, "work")
)
# NEED TO DETERMINE HOW TO READ IN THIS INFO
for namespace in self.config["profile"]:
for key in self.config["profile"][namespace]:
sites += """\n\t<profile namespace="%s" key="%s">%s</profile> """ % (namespace, key, self.config["profile"][namespace][key])
sites += "</site></sitecatalog>"
sites = sites.replace("\n", "")
wh.write("\n".join([line for line in xml.dom.minidom.parseString(sites).toprettyxml().split('\n') if line.strip()]))
......@@ -360,7 +362,7 @@ class Workflow(object):
--output-site local \\
--dax "%s" \\
--randomdir \\
""" % (self.basepath + "/input/conf.rc", "condorpool", self.basepath + "/work/", self.basepath + "/input/chipathlon.dax"))
""" % (self.basepath + "/input/conf.rc", "local", self.basepath + "/work/", self.basepath + "/input/chipathlon.dax"))
submit += textwrap.dedent("""\
--submit`
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment