Changeset 35 for trunk/slurm_drmaa/util.c

Timestamp:

04/22/14 16:14:49 (11 years ago)

Author:

pkopta

Message:

Michael Gutteridge <michael.gutteridge@…> patch for "mincpus" calculations.

File:

• trunk/slurm_drmaa/util.c (modified) (10 diffs)

trunk/slurm_drmaa/util.c

@@ -118 +118 @@
         SLURM_NATIVE_CONSTRAINT,
         SLURM_NATIVE_CONTIGUOUS,
+        SLURM_NATIVE_CPUS_PER_TASK,
         SLURM_NATIVE_EXCLUSIVE,
         SLURM_NATIVE_MEM,
@@ -211 +212 @@
                         job_desc->contiguous = 1;
                         break;
+                case SLURM_NATIVE_CPUS_PER_TASK:
+                        fsd_log_debug(( "# cpus_per_task = %s", value));
+            job_desc->cpus_per_task = fsd_atoi(value);
+                        break;
                 case SLURM_NATIVE_EXCLUSIVE:
                         fsd_log_debug(( "# exclusive -> shared = 0"));
@@ -252 +257 @@
                         job_desc->job_min_cpus = fsd_atoi(value);
                 #else
-                        fsd_log_debug(("# min_cpus = %s",value));
-                        job_desc->min_cpus = fsd_atoi(value);
+                        fsd_log_debug(("# pn_min_cpus = %s",value));
+                        job_desc->pn_min_cpus = fsd_atoi(value);
                 #endif
                         break;
@@ -311 +316 @@
                         fsd_log_debug(("# ntasks = %s",value));
                         job_desc->num_tasks = fsd_atoi(value); 
-                        slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_MINCPUS,value);
                         break;  
                 case SLURM_NATIVE_TIME_LIMIT:
@@ -347 +351 @@
                 case SLURM_NATIVE_TMP:
                         fsd_log_debug(("# tmp = %s", value));
-                        #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,3,0)
-                        job_desc->pn_min_tmp_disk = fsd_atoi(value);
-                        #else
-                        job_desc->job_min_tmp_disk = fsd_atoi(value);
-                        #endif
+                                #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,3,0)
+                                        job_desc->pn_min_tmp_disk = fsd_atoi(value);
+                                        #else
+                                        job_desc->job_min_tmp_disk = fsd_atoi(value);
+                                        #endif
                         break;
                 default:
@@ -365 +369 @@
         char *ctxt = NULL;
         char * volatile add_attr_copy = fsd_strdup(add_attr);
+
+        fsd_log_enter(( "" ));
 
         TRY
@@ -392 +398 @@
                         slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_CONTIGUOUS,NULL);
                 }
+                else if (strcmp(name,"cpus-per-task") == 0) {
+                        slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_CPUS_PER_TASK,value);
+                }
                 else if(strcmp(name,"exclusive") == 0) {
                         slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_EXCLUSIVE,NULL);
@@ -473 +482 @@
           }
         END_TRY
+        fsd_log_return(( "" ));
 }
 
@@ -508 +518 @@
                                                 slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_CONSTRAINT, arg);
                                                 break;  
+                                        case 'c' :
+                                                slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_CPUS_PER_TASK, arg);
+                                                break;  
                                         case 'N' :      
                                                 slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_NODES, arg);
@@ -563 +576 @@
         FINALLY
          {
+        fsd_log_debug(( "finalizing job constraints" ));
+        if( job_desc->cpus_per_task > 0 ) {
+            job_desc->min_cpus = job_desc->num_tasks * job_desc->cpus_per_task ;
+            fsd_log_debug((
+                        "set min_cpus to ntasks*cpus_per_task: %d",
+                        job_desc->min_cpus 
+                        ));
+        } else {
+            job_desc->min_cpus = job_desc->num_tasks ; 
+            fsd_log_debug((
+                        "set min_cpus to ntasks: %d",
+                        job_desc->min_cpus 
+                        ));
+        }
                 fsd_free(native_spec_copy);
                 fsd_free(native_specification);