Merge branch 'develop' of git.nic.uoregon.edu:/gitroot/xpress-apex in…

…to develop
UO-OACISS · Mar 22, 2021 · 9041359 · 9041359
2 parents f7153f6 + 81a8d90
commit 9041359
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/apex/utils.cpp b/src/apex/utils.cpp
@@ -424,7 +424,21 @@ uint64_t test_for_MPI_comm_rank(uint64_t commrank) {
     const char * tmpvar = getenv("PMI_RANK");
     if (tmpvar != NULL) {
         commrank = atol(tmpvar);
-        // printf("Changing MPICH rank to %lu\n", commrank);
+        // printf("Changing PMI rank to %lu\n", commrank);
+        return commrank;
+    }
+    // cray ALPS
+    tmpvar = getenv("ALPS_APP_PE");
+    if (tmpvar != NULL) {
+        commrank = atol(tmpvar);
+        // printf("Changing ALPS rank to %lu\n", commrank);
+        return commrank;
+    }
+    // cray
+    tmpvar = getenv("CRAY_PMI_RANK");
+    if (tmpvar != NULL) {
+        commrank = atol(tmpvar);
+        // printf("Changing CRAY_PMI rank to %lu\n", commrank);
         return commrank;
     }
     // OpenMPI, Spectrum
@@ -462,6 +476,12 @@ uint64_t test_for_MPI_comm_size(uint64_t commsize) {
         // printf("Changing MPICH size to %lu\n", commsize);
         return commsize;
     }
+    tmpvar = getenv("CRAY_PMI_SIZE");
+    if (tmpvar != NULL) {
+        commsize = atol(tmpvar);
+        // printf("Changing MPICH size to %lu\n", commsize);
+        return commsize;
+    }
     // OpenMPI, Spectrum
     tmpvar = getenv("OMPI_COMM_WORLD_SIZE");
     if (tmpvar != NULL) {