Changeset 37 for branches/slurm-drmaa-1.2.0/slurm_drmaa/util.c

Timestamp:

06/18/14 17:30:11 (11 years ago)

Author:

pkopta

Message:

code cleanup

File:

• branches/slurm-drmaa-1.2.0/slurm_drmaa/util.c (modified) (7 diffs)

branches/slurm-drmaa-1.2.0/slurm_drmaa/util.c

@@ -94 +94 @@
         else if (strcasecmp(mail_type_str, "FAIL") == 0)
                 rc = MAIL_JOB_FAIL;
-#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
         else if (strcasecmp(mail_type_str, "REQUEUE") == 0)
                 rc = MAIL_JOB_REQUEUE;
-#endif
         else if (strcasecmp(mail_type_str, "ALL") == 0)
-#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
                 rc = MAIL_JOB_BEGIN | MAIL_JOB_END | MAIL_JOB_FAIL | MAIL_JOB_REQUEUE;
-#else
-                rc = MAIL_JOB_BEGIN | MAIL_JOB_END | MAIL_JOB_FAIL;
-#endif
         else {
                 fsd_log_error(("Unknown mail type: %s", mail_type_str));
@@ -173 +167 @@
         fsd_free(job_desc->work_dir);
         fsd_free(job_desc->exc_nodes);
-#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
         fsd_free(job_desc->gres);
-#endif
         
         fsd_log_return(( "" ));
@@ -221 +213 @@
                         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
                         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"));
@@ -237 +222 @@
                         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
                         if(job_desc->pn_min_memory == NO_VAL ||  fsd_atoi(value) > (int)job_desc->pn_min_memory) {
                                 fsd_log_debug(("# pn_min_memory (MEM_PER_CPU) = %s",value));
                                 job_desc->pn_min_memory = fsd_atoi(value) | MEM_PER_CPU;
                         }
-                #endif
                         else { 
                                 fsd_log_debug(("mem-per-cpu value defined lower or equal to mem or value defined before"));
@@ -253 +231 @@
                         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(("# pn_min_cpus = %s",value));
                         job_desc->pn_min_cpus = fsd_atoi(value);
-                #endif
                         break;
                 case SLURM_NATIVE_NODELIST:
@@ -322 +295 @@
                         break;  
                 case SLURM_NATIVE_GRES:
-                        #if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
                         fsd_log_debug(("# gres = %s",value));
                         job_desc->gres = fsd_strdup(value);
-                        #else
-                        fsd_log_error(("GRES not supported in this version of SLURM."));
-                        #endif
                         break;
                 case SLURM_NATIVE_NO_KILL:
@@ -351 +320 @@
                 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
+                        job_desc->pn_min_tmp_disk = fsd_atoi(value);
                         break;
                 default: