Merge pull request pmodels#7364 from roblatham00/remove-old-platforms

romio: remove a bunch of obsolete platform specific stuff

Author: roblatham00

src/mpi/romio/adio/Makefile.mk

@@ -24,8 +24,6 @@ noinst_HEADERS +=                      \
 
 include $(top_srcdir)/adio/ad_daos/Makefile.mk
 include $(top_srcdir)/adio/ad_gpfs/Makefile.mk
-include $(top_srcdir)/adio/ad_gpfs/bg/Makefile.mk
-include $(top_srcdir)/adio/ad_gpfs/pe/Makefile.mk
 include $(top_srcdir)/adio/ad_lustre/Makefile.mk
 include $(top_srcdir)/adio/ad_nfs/Makefile.mk
 ## NTFS builds are handled entirely by the separate Windows build system

src/mpi/romio/adio/ad_gpfs/ad_gpfs.c

@@ -27,7 +27,6 @@ struct ADIOI_Fns_struct ADIO_GPFS_operations = {
     ADIOI_GEN_WriteStrided,     /* WriteStrided */
     ADIOI_GPFS_Close,   /* Close */
 #ifdef ROMIO_HAVE_WORKING_AIO
-#warning Consider BG support for NFS before enabling this.
     ADIOI_GEN_IreadContig,      /* IreadContig */
     ADIOI_GEN_IwriteContig,     /* IwriteContig */
 #else
@@ -44,13 +43,7 @@ struct ADIOI_Fns_struct ADIO_GPFS_operations = {
     ADIOI_GEN_Resize,   /* Resize */
     ADIOI_GEN_Delete,   /* Delete */
     ADIOI_GEN_Feature,  /* Features */
-#ifdef BGQPLATFORM
-    "GPFS+BGQ: IBM GPFS for Blue Gene",
-#elif PEPLATFORM
-    "GPFS+PE: IBM GPFS for PE",
-#else
     "GPFS: IBM GPFS",
-#endif
     ADIOI_GEN_IreadStridedColl, /* IreadStridedColl */
     ADIOI_GEN_IwriteStridedColl,        /* IwriteStridedColl */
 #if defined(F_SETLKW64)

src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c

@@ -289,101 +289,6 @@ void ADIOI_GPFS_Calc_file_domains(ADIO_File fd,
     ADIO_Offset naggs_large = n_gpfs_blk - naggs * (n_gpfs_blk / naggs);
     ADIO_Offset naggs_small = naggs - naggs_large;
 
-#ifdef BGQPLATFORM
-    if (gpfsmpio_balancecontig == 1) {
-        /* File domains blocks are assigned to aggregators in a breadth-first
-         * fashion relative to the ions - additionally, file domains on the
-         * aggregators sharing the same bridgeset and ion have contiguous
-         * offsets. */
-
-        // initialize everything to small
-        for (i = 0; i < naggs; i++)
-            fd_size[i] = nb_cn_small * blksize;
-
-        // go thru and distribute the large across the bridges
-
-        /* bridelistoffset: agg rank list offsets using the bridgelist - each
-         * entry is created by adding up the indexes for the aggs from all
-         * previous bridges */
-        int *bridgelistoffset = ADIOI_Malloc(fd->hints->fs_hints.bg.numbridges * sizeof(int));
-        /* tmpbridgelistnum: copy of the bridgelistnum whose entries can be
-         * decremented to keep track of bridge assignments during the actual
-         * large block assignments to the agg rank list*/
-        int *tmpbridgelistnum = ADIOI_Malloc(fd->hints->fs_hints.bg.numbridges * sizeof(int));
-
-        int j;
-        for (j = 0; j < fd->hints->fs_hints.bg.numbridges; j++) {
-            int k, bridgerankoffset = 0;
-            for (k = 0; k < j; k++) {
-                bridgerankoffset += fd->hints->fs_hints.bg.bridgelistnum[k];
-            }
-            bridgelistoffset[j] = bridgerankoffset;
-        }
-
-        for (j = 0; j < fd->hints->fs_hints.bg.numbridges; j++)
-            tmpbridgelistnum[j] = fd->hints->fs_hints.bg.bridgelistnum[j];
-        int bridgeiter = 0;
-
-        /* distribute the large blocks across the aggs going breadth-first
-         * across the bridgelist - this distributes the fd sizes across the
-         * ions, so later in the file domain assignment when it iterates thru
-         * the ranklist the offsets will be contiguous within the bridge and
-         * ion as well */
-        for (j = 0; j < naggs_large; j++) {
-            int foundbridge = 0;
-            int numbridgelistpasses = 0;
-            while (!foundbridge) {
-                if (tmpbridgelistnum[bridgeiter] > 0) {
-                    foundbridge = 1;
-                    /*
-                     * printf("bridgeiter is %d tmpbridgelistnum[bridgeiter] is %d bridgelistoffset[bridgeiter] is %d\n",bridgeiter,tmpbridgelistnum[bridgeiter],bridgelistoffset[bridgeiter]);
-                     * printf("naggs is %d bridgeiter is %d bridgelistoffset[bridgeiter] is %d tmpbridgelistnum[bridgeiter] is %d\n",naggs, bridgeiter,bridgelistoffset[bridgeiter],tmpbridgelistnum[bridgeiter]);
-                     * printf("naggs is %d bridgeiter is %d setting fd_size[%d]\n",naggs, bridgeiter,bridgelistoffset[bridgeiter]+(fd->hints->bridgelistnum[bridgeiter]-tmpbridgelistnum[bridgeiter]));
-                     */
-                    int currentbridgelistnum =
-                        (fd->hints->fs_hints.bg.bridgelistnum[bridgeiter] -
-                         tmpbridgelistnum[bridgeiter]);
-                    int currentfdsizeindex = bridgelistoffset[bridgeiter] + currentbridgelistnum;
-                    fd_size[currentfdsizeindex] = (nb_cn_small + 1) * blksize;
-                    tmpbridgelistnum[bridgeiter]--;
-                }
-                if (bridgeiter == (fd->hints->fs_hints.bg.numbridges - 1)) {
-                    /* guard against infinite loop - should only ever make 1 pass
-                     * thru bridgelist */
-                    ADIOI_Assert(numbridgelistpasses == 0);
-                    numbridgelistpasses++;
-                    bridgeiter = 0;
-                } else
-                    bridgeiter++;
-            }
-        }
-        ADIOI_Free(tmpbridgelistnum);
-        ADIOI_Free(bridgelistoffset);
-
-    } else {
-        /* BG/L- and BG/P-style distribution of file domains: simple allocation of
-         * file domins to each aggregator */
-        for (i = 0; i < naggs; i++) {
-            if (i < naggs_large) {
-                fd_size[i] = (nb_cn_small + 1) * blksize;
-            } else {
-                fd_size[i] = nb_cn_small * blksize;
-            }
-        }
-    }
-#ifdef balancecontigtrace
-    int myrank;
-    MPI_Comm_rank(fd->comm, &myrank);
-    if (myrank == 0) {
-        fprintf(stderr, "naggs_small is %d nb_cn_small is %d\n", naggs_small, nb_cn_small);
-        for (i = 0; i < naggs; i++) {
-            fprintf(stderr, "fd_size[%d] set to %d agg rank is %d\n", i, fd_size[i],
-                    fd->hints->ranklist[i]);
-        }
-    }
-#endif
-
-#else // not BGQ platform
     for (i = 0; i < naggs; i++) {
         if (i < naggs_large) {
             fd_size[i] = (nb_cn_small + 1) * blksize;
@@ -392,9 +297,6 @@ void ADIOI_GPFS_Calc_file_domains(ADIO_File fd,
         }
     }
 
-#endif
-
-
 #if AGG_DEBUG
     DBG_FPRINTF(stderr, "%s(%d): "
                 "gpfs_ub       %llu, "

src/mpi/romio/adio/ad_gpfs/ad_gpfs_hints.c

@@ -18,10 +18,6 @@
 #define   ADIOI_GPFS_IND_RD_BUFFER_SIZE_DFLT    "4194304"
 #define   ADIOI_GPFS_IND_WR_BUFFER_SIZE_DFLT    "4194304"
 
-#ifdef BGQPLATFORM
-#define   ADIOI_BG_NAGG_IN_PSET_HINT_NAME   "bg_nodes_pset"
-#endif
-
 /** \page mpiio_vars MPIIO Configuration
  *
  * GPFS MPIIO configuration and performance tuning. Used by ad_gpfs ADIO.
@@ -44,13 +40,6 @@
  *     - key = ind_wr_buffer_size value = 4194304
  */
 
-#ifdef BGQPLATFORM
-/* Compute the aggregator-related parameters that are required in 2-phase collective IO of ADIO. */
-extern int ADIOI_BG_gen_agg_ranklist(ADIO_File fd, int n_proxy_per_pset);
-#elif PEPLATFORM
-extern int ADIOI_PE_gen_agg_ranklist(ADIO_File fd);
-#endif
-
 void ADIOI_GPFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
 {
 /* if fd->info is null, create a new info object.
@@ -65,8 +54,6 @@ void ADIOI_GPFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
     static char myname[] = "ADIOI_GPFS_SETINFO";
     size_t len;
 
-    int did_anything = 0;
-
     if (fd->info == MPI_INFO_NULL)
         MPI_Info_create(&(fd->info));
     info = fd->info;
@@ -107,11 +94,7 @@ void ADIOI_GPFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
         MPI_Comm_size(fd->comm, &nprocs);
         snprintf(value, MPI_MAX_INFO_VAL + 1, "%d", nprocs);
         ADIOI_Info_set(info, "cb_nodes", value);
-#ifdef BGQPLATFORM
-        fd->hints->cb_nodes = -1;
-#else
         fd->hints->cb_nodes = nprocs;
-#endif
 
         /* hint indicating that no indep. I/O will be performed on this file */
         ADIOI_Info_set(info, "romio_no_indep_rw", "false");
@@ -223,16 +206,6 @@ void ADIOI_GPFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
         ADIOI_Info_check_and_install_int(fd, users_info, "striping_unit",
                                          &(fd->hints->striping_unit), myname, error_code);
 
-#ifdef BGQPLATFORM
-        memset(value, 0, MPI_MAX_INFO_VAL + 1);
-        ADIOI_Info_get(users_info, ADIOI_BG_NAGG_IN_PSET_HINT_NAME, MPI_MAX_INFO_VAL, value, &flag);
-        if (flag && ((intval = atoi(value)) > 0)) {
-
-            did_anything = 1;
-            ADIOI_Info_set(info, ADIOI_BG_NAGG_IN_PSET_HINT_NAME, value);
-            fd->hints->cb_nodes = intval;
-        }
-#endif
     }
 
     /* note that we track i/o aggregators two ways:
@@ -256,15 +229,6 @@ void ADIOI_GPFS_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code)
         ADIOI_Strncpy(fd->hints->cb_config_list, ADIOI_CB_CONFIG_LIST_DFLT, len);
     }
 
-    /* special CB aggregator assignment */
-    if (did_anything) {
-#ifdef BGQPLATFORM
-        ADIOI_BG_gen_agg_ranklist(fd, fd->hints->cb_nodes);
-#elif PEPLATFORM
-        ADIOI_PE_gen_agg_ranklist(fd);
-#endif
-    }
-
     /* deferred_open won't be set by callers, but if the user doesn't
      * explicitly disable collecitve buffering (two-phase) and does hint that
      * io w/o independent io is going on, we'll set this internal hint as a

src/mpi/romio/adio/ad_gpfs/ad_gpfs_tuning.c

@@ -121,7 +121,7 @@ double gpfsmpio_prof_cr[GPFSMPIO_CIO_LAST + 1];
 
 void ad_gpfs_get_env_vars(void)
 {
-    char *x, *dummy;
+    char *x;
 
     gpfsmpio_comm = 0;
     x = getenv("GPFSMPIO_COMM");
@@ -135,20 +135,6 @@ void ad_gpfs_get_env_vars(void)
     x = getenv("GPFSMPIO_TUNEBLOCKING");
     if (x)
         gpfsmpio_tuneblocking = atoi(x);
-    bglocklessmpio_f_type = PVFS2_SUPER_MAGIC;
-    x = getenv("BGLOCKLESSMPIO_F_TYPE");
-    if (x)
-        bglocklessmpio_f_type = strtol(x, &dummy, 0);
-    DBG_FPRINTF(stderr, "BGLOCKLESSMPIO_F_TYPE=%ld/%#lX\n",
-                bglocklessmpio_f_type, bglocklessmpio_f_type);
-    /* note: this value will be 'sanity checked' in ADIOI_BG_persInfo_init(),
-     * when we know a bit more about what "largest possible value" and
-     * "smallest possible value" should be */
-    gpfsmpio_bg_nagg_pset = ADIOI_BG_NAGG_PSET_DFLT;
-    x = getenv("GPFSMPIO_NAGG_PSET");
-    if (x)
-        gpfsmpio_bg_nagg_pset = atoi(x);
-
     gpfsmpio_p2pcontig = 0;
     x = getenv("GPFSMPIO_P2PCONTIG");
     if (x)
@@ -163,12 +149,6 @@ void ad_gpfs_get_env_vars(void)
     x = getenv("GPFSMPIO_DEVNULLIO");
     if (x)
         gpfsmpio_devnullio = atoi(x);
-
-    gpfsmpio_bridgeringagg = 0;
-    x = getenv("GPFSMPIO_BRIDGERINGAGG");
-    if (x)
-        gpfsmpio_bridgeringagg = atoi(x);
-
 }
 
 /* report timing breakdown for MPI I/O collective call */

src/mpi/romio/adio/ad_gpfs/ad_gpfs_tuning.h

@@ -64,26 +64,10 @@ extern int gpfsmpio_timing;
 extern int gpfsmpio_timing_cw_level;
 extern int gpfsmpio_comm;
 extern int gpfsmpio_tuneblocking;
-extern long bglocklessmpio_f_type;
 extern int gpfsmpio_pthreadio;
 extern int gpfsmpio_p2pcontig;
 extern int gpfsmpio_balancecontig;
 extern int gpfsmpio_devnullio;
-extern int gpfsmpio_bridgeringagg;
-
-/* Default is, well, kind of complicated. Blue Gene /L and /P had "psets": one
- * i/o node and all compute nodes wired to it.  On Blue Gene /Q that
- * relationship is a lot more fluid.  There are still I/O nodes, and compute
- * nodes are assigned to an i/o node, but there are two routes to the i/o node,
- * via compute nodes designated as "bridge nodes".  In this code, what we used
- * to call a "pset" is actually "compute nodes associated with and including a
- * bridge node".  So, "nAgg" is roughly "number of aggregators per bridge", but
- * look closely at ADIOI_BG_persInfo_init() for the details */
-
-#define ADIOI_BG_NAGG_PSET_DFLT 16
-
-extern int gpfsmpio_bg_nagg_pset;
-
 
 /* set internal variables for tuning environment variables */
 void ad_gpfs_get_env_vars(void);

src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c

@@ -13,10 +13,6 @@
 #include "ad_gpfs.h"
 #include "ad_gpfs_aggrs.h"
 
-#ifdef BGQPLATFORM
-#include "bg/ad_bg_pset.h"
-#endif
-
 #ifdef AGGREGATION_PROFILE
 #include "mpe.h"
 #endif
@@ -522,53 +518,6 @@ static void gpfs_wr_access_end(int fd, ADIO_Offset offset, ADIO_Offset length)
     ADIOI_Assert(rc == 0);
 }
 
-#ifdef BGQPLATFORM
-/* my_start, my_end: this processes file domain.  coudd be -1,-1 for "no i/o"
- * fd_start, fd_end: arrays of length fd->hints->cb_nodes specifying all file domains */
-static int gpfs_find_access_for_ion(ADIO_File fd,
-                                    ADIO_Offset my_start, ADIO_Offset my_end,
-                                    ADIO_Offset * fd_start, ADIO_Offset * fd_end,
-                                    ADIO_Offset * start, ADIO_Offset * end)
-{
-    int my_ionode = BGQ_IO_node_id();
-    int *rank_to_ionode;
-    int i, nprocs, rank;
-    ADIO_Offset group_start = LLONG_MAX, group_end = 0;
-
-    MPI_Comm_size(fd->comm, &nprocs);
-    MPI_Comm_rank(fd->comm, &rank);
-
-    rank_to_ionode = ADIOI_Calloc(nprocs, sizeof(int));
-    MPI_Allgather(&my_ionode, 1, MPI_INT, rank_to_ionode, 1, MPI_INT, fd->comm);
-
-    /* rank_to_ionode now contains a mapping from MPI rank to IO node */
-    /* fd->hints->ranklist[] contains a list of MPI ranks that are aggregators */
-    /* fd_start[] and fd_end[] contain a list of file domains. */
-
-    /* what we really want to do is take all the file domains associated
-     * with a given i/o node and find the begin/end of that range.
-     *
-     * Because gpfs_fcntl hints are expected to be released, we'll pass this
-     * start/end back to the caller, who will both declare and free this range
-     */
-    if (my_start == -1 || my_end == -1) {
-        ADIOI_Free(rank_to_ionode);
-        return 0;       /* no work to do */
-    }
-
-    for (i = 0; i < fd->hints->cb_nodes; i++) {
-        if (my_ionode == rank_to_ionode[fd->hints->ranklist[i]]) {
-            group_start = MPL_MIN(fd_start[i], group_start);
-            group_end = MPL_MAX(fd_end[i], group_end);
-        }
-    }
-    *start = group_start;
-    *end = group_end;
-    ADIOI_Free(rank_to_ionode);
-    return 1;
-}
-#endif // BGQPLATFORM
-
 
 /* If successful, error_code is set to MPI_SUCCESS.  Otherwise an error
  * code is created and returned in error_code.
@@ -661,19 +610,6 @@ static void ADIOI_Exch_and_write(ADIO_File fd, const void *buf, MPI_Datatype
     }
 
     ADIO_Offset st_loc_ion = 0, end_loc_ion = 0, needs_gpfs_access_cleanup = 0;
-#ifdef BGQPLATFORM
-    if (ntimes > 0) {   /* only set the gpfs hint if we have io - ie this rank is
-                         * an aggregator -- otherwise will fail for deferred open */
-
-        if (getenv("ROMIO_GPFS_DECLARE_ION_ACCESS") != NULL) {
-            if (gpfs_find_access_for_ion(fd, st_loc, end_loc, fd_start, fd_end,
-                                         &st_loc_ion, &end_loc_ion)) {
-                gpfs_wr_access_start(fd->fd_sys, st_loc_ion, end_loc_ion - st_loc_ion);
-                needs_gpfs_access_cleanup = 1;
-            }
-        }
-    }
-#endif
 
     MPI_Allreduce(&ntimes, &max_ntimes, 1, MPI_INT, MPI_MAX, fd->comm);