You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/07/12 00:38:55 UTC
git commit: cpucount fix
Repository: airavata
Updated Branches:
refs/heads/master feb304400 -> 606388efa
cpucount fix
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/606388ef
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/606388ef
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/606388ef
Branch: refs/heads/master
Commit: 606388efac223d8a287a66dc01ce5bc587cc7c1d
Parents: feb3044
Author: lahiru <la...@apache.org>
Authored: Fri Jul 11 18:38:38 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Fri Jul 11 18:38:38 2014 -0400
----------------------------------------------------------------------
modules/configuration/server/src/main/resources/PBSTemplate.xslt | 4 ++--
.../java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/606388ef/modules/configuration/server/src/main/resources/PBSTemplate.xslt
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/PBSTemplate.xslt b/modules/configuration/server/src/main/resources/PBSTemplate.xslt
index 584c70b..6862cf6 100644
--- a/modules/configuration/server/src/main/resources/PBSTemplate.xslt
+++ b/modules/configuration/server/src/main/resources/PBSTemplate.xslt
@@ -61,8 +61,8 @@ export<xsl:text> </xsl:text><xsl:value-of select="."/>
cd <xsl:text> </xsl:text><xsl:value-of select="ns:workingDirectory"/><xsl:text>
</xsl:text>
<xsl:choose><xsl:when test="ns:jobSubmitterCommand">
<xsl:value-of select="ns:jobSubmitterCommand"/><xsl:text> </xsl:text> <xsl:choose>
- <xsl:when test="(ns:nodes)">
-<xsl:value-of select="ns:nodes"/><xsl:text> </xsl:text>
+ <xsl:when test="(ns:cpuCount)">
+<xsl:value-of select="ns:cpuCount"/><xsl:text> </xsl:text>
</xsl:when>
</xsl:choose></xsl:when></xsl:choose><xsl:value-of select="ns:executablePath"/><xsl:text> </xsl:text>
<xsl:for-each select="ns:inputs/ns:input">
http://git-wip-us.apache.org/repos/asf/airavata/blob/606388ef/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
index f5283e7..e74c619 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java
@@ -141,6 +141,7 @@ public class GFACSSHUtils {
jobDescriptor.setProcessesPerNode(applicationDeploymentType.getProcessorsPerNode());
jobDescriptor.setMaxWallTime(String.valueOf(applicationDeploymentType.getMaxWallTime()));
jobDescriptor.setJobSubmitter(applicationDeploymentType.getJobSubmitterCommand());
+ jobDescriptor.setCPUCount(applicationDeploymentType.getCpuCount());
if (applicationDeploymentType.getProjectAccount() != null) {
if (applicationDeploymentType.getProjectAccount().getProjectAccountNumber() != null) {
jobDescriptor.setAcountString(applicationDeploymentType.getProjectAccount().getProjectAccountNumber());