added gpu_mem to Sestavovac

Author: martin-kuba

cloud/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.32.1</version>
+        <version>3.33</version>
     </parent>
 
     <artifactId>cloud</artifactId>

metaacct/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.32.1</version>
+        <version>3.33</version>
     </parent>
 
     <artifactId>metaacct</artifactId>

metaacct_cmd/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.32.1</version>
+        <version>3.33</version>
     </parent>
 
     <artifactId>metaacct_cmd</artifactId>

pbsmon/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.32.1</version>
+        <version>3.33</version>
     </parent>
 
     <artifactId>pbsmon</artifactId>

pbsmon/src/main/java/cz/cesnet/meta/pbs/Node.java

@@ -50,6 +50,7 @@ public class Node extends PbsInfoObject {
     public static final String ATTRIBUTE_TOTAL_MEMORY_PBSPRO = "resources_available.mem";
     public static final String ATTRIBUTE_USED_MEMORY_TORQUE = "resources_used.mem";
     public static final String ATTRIBUTE_USED_MEMORY_PBSPRO = "resources_assigned.mem";
+    public static final String ATTRIBUTE_GPU_MEM = "resources_available.gpu_mem";
     public static final String ATTRIBUTE_QUEUE = "queue";
     public static final String ATTRIBUTE_JOBS = "jobs";
     public static final String ATTRIBUTE_AVAILABLE_BEFORE = "available_before";
@@ -453,6 +454,10 @@ public String getFreeMemoryB() {
         return PbsUtils.formatInHumanUnits(getFreeMemoryInt());
     }
 
+    public long getGpuMemoryInt() {
+        return PbsUtils.parsePbsBytes(attrs.get(ATTRIBUTE_GPU_MEM));
+    }
+
     /**
      * METACentrum-specific queue.
      *

pbsmon/src/main/java/cz/cesnet/meta/stripes/QsubPbsproActionBean.java

@@ -196,6 +196,8 @@ public List<Queue> getOfferQueues() {
     @Validate(on = {"sestavovac"}, required = true, minvalue = 1)
     long mem = 400;
     String memu = "mb";
+    long gpu_mem = 0L;
+    String gpu_memu = "mb";
     int nodes = 1;
     int ncpus = 1;
     int ngpus = 0;
@@ -233,10 +235,11 @@ public Resolution sestavovac() {
         Resolution r = data();
         if (r != null) return r;
         //Sestavovac
-        log.info("sestavovac() user={} -l walltime={}:{}:{}:,q={},nodes={}:ncpus={}:scratch_{}={}{}:mem={}{}: resources= {}:cluster={}:city={}:spec={}",
-                user, wh, wm, ws, fronta, nodes, ncpus, scratchtype, scratch, scratchu, mem, memu, resources,cluster,city,spec);
+        log.info("sestavovac() user={} -l walltime={}:{}:{}:,q={},nodes={}:ncpus={}:scratch_{}={}{}:mem={}{}:gpu_mem={}{}: resources= {}:cluster={}:city={}:spec={}",
+                user, wh, wm, ws, fronta, nodes, ncpus, scratchtype, scratch, scratchu, mem, memu, gpu_mem, gpu_memu, resources,cluster,city,spec);
 
         long memBytes = PbsUtils.parsePbsBytes(this.mem + this.memu);
+        long gpuMemBytes = PbsUtils.parsePbsBytes(this.gpu_mem + this.gpu_memu);
         long scratchBytes = PbsUtils.parsePbsBytes(this.scratch + this.scratchu);
         long walltimeSecs = walltimeSecs();
 
@@ -299,6 +302,11 @@ public Resolution sestavovac() {
                 log.debug("node {} has not enough RAM: {}<{}", node.getName(), node.getTotalMemoryInt(), memBytes);
                 continue;
             }
+            //musi mit dost GPU pameti
+            if (node.getGpuMemoryInt() < gpuMemBytes) {
+                log.debug("node {} has not enough GPU memory: {}<{}", node.getName(), node.getGpuMemoryInt(), gpuMemBytes);
+                continue;
+            }
             //musi mit vhodny typ scratche
             Scratch nodeScratch = node.getScratch();
             if (scratchBytes > 0) {
@@ -422,6 +430,22 @@ public void setMem(long mem) {
         this.mem = mem;
     }
 
+    public long getGpu_mem() {
+        return gpu_mem;
+    }
+
+    public void setGpu_mem(long gpu_mem) {
+        this.gpu_mem = gpu_mem;
+    }
+
+    public String getGpu_memu() {
+        return gpu_memu;
+    }
+
+    public void setGpu_memu(String gpu_memu) {
+        this.gpu_memu = gpu_memu;
+    }
+
     public int getNodes() {
         return nodes;
     }

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

@@ -27,6 +27,7 @@
             :ncpus=<s:select name="ncpus"><c:forEach begin="1" end="384" var="i"><s:option value="${i}">${i}</s:option></c:forEach></s:select>
             :ngpus=<s:select name="ngpus"><c:forEach begin="0" end="4" var="i"><s:option value="${i}">${i}</s:option></c:forEach></s:select>
             :mem=<s:text style="text-align: right;" name="mem" size="3"/><s:select name="memu"><s:option value="mb">mb</s:option><s:option value="gb">gb</s:option></s:select>
+            :gpu_mem=<s:text style="text-align: right;" name="gpu_mem" size="3"/><s:select name="gpu_memu"><s:option value="mb">mb</s:option><s:option value="gb">gb</s:option></s:select>
             :scratch_<s:select name="scratchtype"><s:option value="local">local</s:option><s:option value="ssd">ssd</s:option><s:option value="shared">shared</s:option></s:select>=<s:text style="text-align: right;" name="scratch" size="3"/><s:select name="scratchu"><s:option value="mb">mb</s:option><s:option value="gb">gb</s:option></s:select>
             <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</strong>cluster ... <strong><s:select name="cluster"><s:option value=""> </s:option><c:forEach items="${actionBean.clusters}" var="cl"><s:option value="${cl}">:${cl}=True</s:option></c:forEach></s:select>
             <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</strong><t:i18n cs="město" en="city"/> ... <strong> <s:select name="city"><s:option value=""> </s:option><c:forEach items="${actionBean.cities}" var="ct"><s:option value="${ct}">:${ct}=True</s:option></c:forEach></s:select>
@@ -47,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}<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}: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>
         <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}<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}: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 -N my_awesome_job
 </pre>
         <h3><f:message key="person_vysledek"/></h3>

perun_machines/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.32.1</version>
+        <version>3.33</version>
     </parent>
 
     <artifactId>perun_machines</artifactId>

pom.xml

@@ -7,9 +7,9 @@
     <packaging>pom</packaging>
 
     <!--
-    Use "mvn versions:set -DnewVersion=3.33; mvn versions:commit" to change version in all modules
+    Use "mvn versions:set -DnewVersion=3.34; mvn versions:commit" to change version in all modules
      -->
-    <version>3.32.1</version>
+    <version>3.33</version>
     <name>MetaCentrum Accounting Parent Project</name>
 
     <properties>