suppressed showing gpu_mem when zero

Author: martin-kuba

pbsmon/src/main/webapp/nodes/qsub_pbspro.jsp

@@ -48,13 +48,13 @@
         <h4><f:message key="person_qsub_cli"/></h4>
         qsub -l walltime=${actionBean.wh}:${actionBean.wm}:${actionBean.ws}
         <c:choose><c:when test="${actionBean.fronta=='default'}"> </c:when><c:otherwise> -q ${actionBean.fronta} </c:otherwise></c:choose>
-        -l select=${actionBean.nodes}:ncpus=${actionBean.ncpus}<c:if test="${actionBean.ngpus>0}">:ngpus=${actionBean.ngpus}</c:if>:mem=${actionBean.mem}${actionBean.memu}:gpu_mem=${actionBean.gpu_mem}${actionBean.gpu_memu}<c:if test="${actionBean.scratch>0}">:scratch_${actionBean.scratchtype}=${actionBean.scratch}${actionBean.scratchu}</c:if><c:if test="${not empty actionBean.spec}">:spec=${actionBean.spec}</c:if><c:forEach items="${actionBean.resources}" var="e"><c:if test="${not empty e.value}">:${e.key}=${e.value}</c:if></c:forEach>
+        -l select=${actionBean.nodes}:ncpus=${actionBean.ncpus}<c:if test="${actionBean.ngpus>0}">:ngpus=${actionBean.ngpus}</c:if>:mem=${actionBean.mem}${actionBean.memu}<c:if test="${actionBean.gpu_mem>0}">:gpu_mem=${actionBean.gpu_mem}${actionBean.gpu_memu}</c:if><c:if test="${actionBean.scratch>0}">:scratch_${actionBean.scratchtype}=${actionBean.scratch}${actionBean.scratchu}</c:if><c:if test="${not empty actionBean.spec}">:spec=${actionBean.spec}</c:if><c:forEach items="${actionBean.resources}" var="e"><c:if test="${not empty e.value}">:${e.key}=${e.value}</c:if></c:forEach>
         <h4><f:message key="person_qsub_bash"/></h4>
 <pre>
 #!/bin/bash
 #PBS -q ${actionBean.fronta}
 #PBS -l walltime=${actionBean.wh}:${actionBean.wm}:${actionBean.ws}
-#PBS -l select=${actionBean.nodes}:ncpus=${actionBean.ncpus}<c:if test="${actionBean.ngpus>0}">:ngpus=${actionBean.ngpus}</c:if>:mem=${actionBean.mem}${actionBean.memu}:gpu_mem=${actionBean.gpu_mem}${actionBean.gpu_memu}<c:if test="${actionBean.scratch>0}">:scratch_${actionBean.scratchtype}=${actionBean.scratch}${actionBean.scratchu}</c:if><c:if test="${not empty actionBean.spec}">:spec=${actionBean.spec}</c:if><c:forEach items="${actionBean.resources}" var="e"><c:if test="${not empty e.value}">:${e.key}=${e.value}</c:if></c:forEach>
+#PBS -l select=${actionBean.nodes}:ncpus=${actionBean.ncpus}<c:if test="${actionBean.ngpus>0}">:ngpus=${actionBean.ngpus}</c:if>:mem=${actionBean.mem}${actionBean.memu}<c:if test="${actionBean.gpu_mem>0}">:gpu_mem=${actionBean.gpu_mem}${actionBean.gpu_memu}</c:if><c:if test="${actionBean.scratch>0}">:scratch_${actionBean.scratchtype}=${actionBean.scratch}${actionBean.scratchu}</c:if><c:if test="${not empty actionBean.spec}">:spec=${actionBean.spec}</c:if><c:forEach items="${actionBean.resources}" var="e"><c:if test="${not empty e.value}">:${e.key}=${e.value}</c:if></c:forEach>
 #PBS -N my_awesome_job
 </pre>
         <h3><f:message key="person_vysledek"/></h3>