code cleanup

natefoo · Jun 18, 2014 · 3cf30d9 · 3cf30d9
1 parent 8acc159
commit 3cf30d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 40 deletions.
diff --git a/NEWS b/NEWS
@@ -0,0 +1,2 @@
+1.2.0 
+For SLURM > 2.6
diff --git a/slurm_drmaa/job.c b/slurm_drmaa/job.c
@@ -132,12 +132,10 @@ slurmdrmaa_job_update_status( fsd_job_t *self )
 				case JOB_PENDING:
 					switch(job_info->job_array[0].state_reason)
 					{
-						#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,2,0)
 						case WAIT_HELD_USER:   /* job is held by user */
 							fsd_log_debug(("interpreting as DRMAA_PS_USER_ON_HOLD"));
 							self->state = DRMAA_PS_USER_ON_HOLD;
 							break;
-						#endif
 						case WAIT_HELD:  /* job is held by administrator */
 							fsd_log_debug(("interpreting as DRMAA_PS_SYSTEM_ON_HOLD"));
 							self->state = DRMAA_PS_SYSTEM_ON_HOLD;
@@ -173,9 +171,7 @@ slurmdrmaa_job_update_status( fsd_job_t *self )
 				case JOB_FAILED:
 				case JOB_TIMEOUT:
 				case JOB_NODE_FAIL:
-				#if SLURM_VERSION_NUMBER >= SLURM_VERSION_NUM(2,3,0)
 				case JOB_PREEMPTED:
-				#endif
 					fsd_log_debug(("interpreting as DRMAA_PS_FAILED"));
 					self->state = DRMAA_PS_FAILED;
 					self->exit_status = job_info->job_array[0].exit_code;

diff --git a/slurm_drmaa/util.c b/slurm_drmaa/util.c
@@ -93,16 +93,10 @@ static int slurmdrmaa_mail_type_parse(const char *mail_type_str)
 		rc = MAIL_JOB_END;
 	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));
 	}
@@ -172,9 +166,7 @@ slurmdrmaa_free_job_desc(job_desc_msg_t *job_desc)
 	fsd_free(job_desc->std_err);	
 	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(( "" ));
 }
@@ -220,45 +212,26 @@ slurmdrmaa_add_attribute(job_desc_msg_t *job_desc, unsigned attr, const char *va
 			job_desc->shared = 0;
 			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 (MEM_PER_CPU) = %s",value));
 				job_desc->pn_min_memory = fsd_atoi(value) | MEM_PER_CPU;
 			}
-		#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
 			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"));
 			}
 			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:
 			fsd_free(job_desc->req_nodes);
@@ -321,12 +294,8 @@ slurmdrmaa_add_attribute(job_desc_msg_t *job_desc, unsigned attr, const char *va
 			job_desc->time_limit = slurmdrmaa_datetime_parse(value); 
 			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:
 			fsd_log_debug(("# no_kill = 1"));
@@ -350,11 +319,7 @@ slurmdrmaa_add_attribute(job_desc_msg_t *job_desc, unsigned attr, const char *va
 			break;
 		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:
 			fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,"Invalid attribute");