Merge branch 'master' into request-based-rma

Author: jeffhammond

src/init_finalize.c

@@ -318,6 +318,15 @@ int PARMCI_Init_thread_comm(int armci_requested, MPI_Comm comm) {
     ARMCII_GLOBAL_STATE.iov_batched_limit = 0;
   }
 
+#if defined(OPEN_MPI) && defined(OMPI_MAJOR_VERSION) && (OMPI_MAJOR_VERSION < 5)
+  /* Open-MPI 5 RMA works a lot better than older releases... */
+  ARMCII_GLOBAL_STATE.iov_method = ARMCII_IOV_BATCHED;
+#else
+  /* DIRECT leads to addr=NULL errors when ARMCI_{GetV,PutV} are used
+   * Jeff: Is this still true? */
+  ARMCII_GLOBAL_STATE.iov_method = ARMCII_IOV_DIRECT;
+#endif
+
   char *var = ARMCII_Getenv("ARMCI_IOV_METHOD");
   if (var != NULL) {
     if (strcmp(var, "AUTO") == 0)