Fix mpich-gm bugs, thanks to Takao Hatazaki (HP).

NEWS

@@ -13,6 +13,7 @@ documents those changes that are of interest to users and admins.
     functions MUST set job->cont_id.
  -- Remove vestigial node_use (virtual or coprocessor) field from job
     request RPC.
+ -- Fix mpich-gm bugs, thanks to Takao Hatazaki (HP).
 
 * Changes in SLURM 0.6.0-pre2
 =============================

src/common/env.c

@@ -310,8 +310,8 @@ int setup_env(env_t *env)
 	}
 	
 	if (env->gmpi >= 0
-	    && setenvf(&env->env, "SLURM_GMPI", "%d", env->gmpi)) {
-		error("Unable to set SLURM_GMPI environment");
+	    && setenvf(&env->env, "GMPI_ID", "%d", env->gmpi)) {
+		error("Unable to set GMPI_ID environment");
 		rc = SLURM_FAILURE;
 	}
 	

src/slurmd/task.c

@@ -170,7 +170,7 @@ exec_task(slurmd_job_t *job, int i, int waitfd)
 	
 	t = job->task[i];
 	job->envtp->procid = t->gtid;
-	job->envtp->gmpi = t->gtid;
+	job->envtp->gmpi = getenvp(job->env, "SLURM_GMPI") ? t->gtid : -1;
 	
 	
 	setup_env(job->envtp);