Changeset 13 for trunk/slurm_drmaa/util.c

Timestamp:

01/02/11 17:13:14 (14 years ago)

Author:

mmatloka

Message:

support for slurm 2.2

File:

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

trunk/slurm_drmaa/util.c

@@ -2 +2 @@
 /*
  * PSNC DRMAA for SLURM
- * Copyright (C) 2010 Poznan Supercomputing and Networking Center
+ * Copyright (C) 2011 Poznan Supercomputing and Networking Center
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -175 +175 @@
                         break;
                 case SLURM_NATIVE_MEM:
+                #if SLURM_VERSION_NUMBER < SLURM_VERSION_NUM(2,2,0)
                         if(job_desc->job_min_memory == NO_VAL ||  fsd_atoi(value) > (int)job_desc->job_min_memory) {
                                 fsd_log_debug(("# job_min_memory = %s",value));
                                 job_desc->job_min_memory = fsd_atoi(value);
                         }
-                        else {
+                #else
+                        if(job_desc->pn_min_memory == NO_VAL ||  fsd_atoi(value) > (int)job_desc->pn_min_memory) {
+                                fsd_log_debug(("# pn_min_memory = %s",value));
+                                job_desc->pn_min_memory = fsd_atoi(value);
+                        }
+                #endif
+                        else { 
                                 fsd_log_debug(("mem value defined lower or equal to mem-per-cpu or value defined before"));
                         }
                         break;
                 case SLURM_NATIVE_MEM_PER_CPU:
+                #if SLURM_VERSION_NUMBER < SLURM_VERSION_NUM(2,2,0)
                         if(job_desc->job_min_memory == NO_VAL ||  fsd_atoi(value) > (int)job_desc->job_min_memory) {
                                 fsd_log_debug(("# job_min_memory = %s",value));
                                 job_desc->job_min_memory = fsd_atoi(value);
                         }
-                        else {
+                #else
+                        if(job_desc->pn_min_memory == NO_VAL ||  fsd_atoi(value) > (int)job_desc->pn_min_memory) {
+                                fsd_log_debug(("# pn_min_memory = %s",value));
+                                job_desc->pn_min_memory = fsd_atoi(value);
+                        }
+                #endif
+                        else { 
                                 fsd_log_debug(("mem-per-cpu value defined lower or equal to mem or value defined before"));
                         }
                         break;
                 case SLURM_NATIVE_MINCPUS:
+                #if SLURM_VERSION_NUMBER < SLURM_VERSION_NUM(2,2,0)
                         fsd_log_debug(("# job_min_cpus = %s",value));
                         job_desc->job_min_cpus = fsd_atoi(value);
+                #else
+                        fsd_log_debug(("# min_cpus = %s",value));
+                        job_desc->min_cpus = fsd_atoi(value);
+                #endif
                         break;
                 case SLURM_NATIVE_NODELIST: