airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [31/50] [abbrv] airavata git commit: Groovy template updates to match XSLT updates for campus gateways
Date Fri, 28 Apr 2017 15:23:12 GMT
Groovy template updates to match XSLT updates for campus gateways


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cad84183
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cad84183
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cad84183

Branch: refs/heads/develop
Commit: cad84183ef2b0dfd15e570aaa7f29922ae4ea270
Parents: 1794197
Author: Marcus Christie <machristie@apache.org>
Authored: Tue Apr 25 14:52:04 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Tue Apr 25 14:52:58 2017 -0400

----------------------------------------------------------------------
 .../configuration/server/src/main/resources/LSF_Groovy.template   | 3 +++
 .../configuration/server/src/main/resources/UGE_Groovy.template   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/cad84183/modules/configuration/server/src/main/resources/LSF_Groovy.template
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/LSF_Groovy.template b/modules/configuration/server/src/main/resources/LSF_Groovy.template
index 428b42b..f72e313 100644
--- a/modules/configuration/server/src/main/resources/LSF_Groovy.template
+++ b/modules/configuration/server/src/main/resources/LSF_Groovy.template
@@ -7,6 +7,8 @@
    if (nodes != null && nodes != "") out.print '#BSUB -n ' + nodes + '\n'
    if (jobName != null && jobName != "") out.print '#BSUB -J ' + jobName + '\n'
    if (mailAddress != null && mailAddress != "") out.print '#BSUB -u ' + mailAddress
+ '\n'
+   out.print '#BSUB -B\n'
+   out.print '#BSUB -N\n'
    if (accountString != null && accountString != "") out.print '#BSUB -P  ' + accountString
+ '\n'
    if (maxWallTime != null && maxWallTime != "") out.print '#BSUB -W ' + maxWallTime
+ '\n'
    if (standardOutFile != null && standardOutFile != "") out.print '#BSUB -o ' +
standardOutFile + '\n'
@@ -20,6 +22,7 @@
    if (workingDirectory != null && workingDirectory != "")  out.print 'cd ' + workingDirectory
+'\n'
    if (preJobCommands != null) for(pjc in preJobCommands)  out.print pjc +'\n'
    if (jobSubmitterCommand != null && jobSubmitterCommand != "")  out.print jobSubmitterCommand
+ ' '
+   if (processPerNode != null && processPerNode != "")  out.print processPerNode
+ ' '
    if (executablePath != null && executablePath != "")  out.print  executablePath
+ ' '
    if (inputs != null) for(input in inputs)  out.print input + ' '
    out.print '\n'

http://git-wip-us.apache.org/repos/asf/airavata/blob/cad84183/modules/configuration/server/src/main/resources/UGE_Groovy.template
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/UGE_Groovy.template b/modules/configuration/server/src/main/resources/UGE_Groovy.template
index df454dd..ce378f9 100644
--- a/modules/configuration/server/src/main/resources/UGE_Groovy.template
+++ b/modules/configuration/server/src/main/resources/UGE_Groovy.template
@@ -11,7 +11,7 @@
    if (standardOutFile != null && standardOutFile != "") out.print '#$ -o ' + standardOutFile
+ '\n'
    if (standardErrorFile != null && standardErrorFile != "") out.print '#$ -e ' +
standardErrorFile + '\n'
    if (nodes != null && nodes != "" && processPerNode != null &&
processPerNode != "")
-        out.print '#$ -pe ' + processPerNode + 'way' + (12 * nodes)
+        out.print '#$ -pe orte ' + processPerNode
 %>
 #\$ -V
 #\$ -m beas
@@ -21,6 +21,7 @@
    if (workingDirectory != null && workingDirectory != "")  out.print 'cd ' + workingDirectory
+'\n'
    if (preJobCommands != null) for(pjc in preJobCommands)  out.print pjc +'\n'
    if (jobSubmitterCommand != null && jobSubmitterCommand != "")  out.print jobSubmitterCommand
+ ' '
+   if (processPerNode != null && processPerNode != "")  out.print processPerNode
+ ' '
    if (executablePath != null && executablePath != "")  out.print  executablePath
+ ' '
    if (inputs != null) for(input in inputs)  out.print input + ' '
    out.print '\n'


Mime
View raw message