[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-344-gd2cb666
mysql vizuser
noreply at mpich.org
Tue Jul 16 17:19:55 CDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via d2cb66671016753efd22f3293ed8984c97b91441 (commit)
via 036d7ea8817f8ffdd2846074ae724c0a102f356d (commit)
from 90522a130cef97ffe5c0870b4a9ab6b40f17fa58 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/d2cb66671016753efd22f3293ed8984c97b91441
commit d2cb66671016753efd22f3293ed8984c97b91441
Author: Rob Latham <robl at mcs.anl.gov>
Date: Tue Jul 16 16:59:19 2013 -0500
big redo to generalize file_info test
Since different file systems have different default hints, make a start
at being a bit more sophisticated with respect to what we should compare
against.
If no arguments given, file_info will simply test that hints set can be
retrieved.
If given the -b (bluegene) or -u (unix file system) flag, file_info will
check those default values.
todo: add pvfs, lustre, and other file systems of interest.
fixes tt #1810
diff --git a/src/mpi/romio/test/file_info.c b/src/mpi/romio/test/file_info.c
index 25ad88c..7f2a779 100644
--- a/src/mpi/romio/test/file_info.c
+++ b/src/mpi/romio/test/file_info.c
@@ -13,25 +13,37 @@
#include <stdlib.h>
/* this test wants to compare the hints it gets from a file with a set of
- * default hints. These hints are specific to the MPI-IO implementation, so
- * pick one of the following profiles to use */
+ * default hints. These hints are specific to the MPI-IO implementation, so if
+ * you want to test something besides the default you'll have to use a command
+ * line argument */
+
+typedef struct hint_defaults {
+ int cb_buffer_size;
+ int ind_rd_buffer_size;
+ int ind_wr_buffer_size;
+ const char *romio_cb_read;
+ const char *romio_cb_write;
+ const char *cb_config_list;
+} hint_defaults;
+
+hint_defaults UFS_DEFAULTS = {
+ .cb_buffer_size = 16777216,
+ .ind_rd_buffer_size = 4194304,
+ .ind_wr_buffer_size = 524288,
+ .romio_cb_read = "automatic",
+ .romio_cb_write = "automatic",
+ .cb_config_list = "*:1"
+};
+
+hint_defaults BLUEGENE_DEFAULTS = {
+ .cb_buffer_size = 16777216,
+ .ind_rd_buffer_size = 4194304,
+ .ind_wr_buffer_size = 4194304,
+ .romio_cb_read = "enable",
+ .romio_cb_write = "enable",
+ .cb_config_list = NULL};
-#if 1 /* hints are for BlueGene */
-# define DFLT_CB_BUFFER_SIZE 16777216
-# define DFLT_IND_RD_BUFFER_SIZE 4194304
-# define DFLT_IND_WR_BUFFER_SIZE 4194304
-# define DFLT_ROMIO_CB_READ "enable"
-# define DFLT_ROMIO_CB_WRITE "enable"
-# define SKIP_CB_CONFIG_LIST_TEST 1
-#endif
-#if 0 /* hints for MPICH2 */
-# define DFLT_CB_BUFFER_SIZE 16777216
-# define DFLT_IND_RD_BUFFER_SIZE 4194304
-# define DFLT_IND_WR_BUFFER_SIZE 524288
-# define DFLT_ROMIO_CB_READ "automatic"
-# define DFLT_ROMIO_CB_WRITE "automatic"
-#endif
/* #undef INFO_DEBUG */
/* Test will print out information about unexpected hint keys or values that
@@ -40,6 +52,8 @@
* but not print out these "interesting" non-error cases. */
static int verbose = 0;
+static int test_ufs = 0;
+static int test_bluegene = 0;
int main(int argc, char **argv)
{
@@ -47,6 +61,7 @@ int main(int argc, char **argv)
MPI_File fh;
MPI_Info info, info_used;
char *filename, key[MPI_MAX_INFO_KEY], value[MPI_MAX_INFO_VAL];
+ hint_defaults *defaults;
MPI_Init(&argc,&argv);
@@ -59,6 +74,8 @@ int main(int argc, char **argv)
i = 1;
while ((i < argc) && strcmp("-fname", *argv)) {
if (!strcmp("-v", *argv)) verbose = 1;
+ else if (!strcmp("-u", *argv)) test_ufs = 1;
+ else if (!strcmp("-b", *argv)) test_bluegene = 1;
i++;
argv++;
}
@@ -73,14 +90,26 @@ int main(int argc, char **argv)
MPI_Bcast(&len, 1, MPI_INT, 0, MPI_COMM_WORLD);
MPI_Bcast(filename, len+1, MPI_CHAR, 0, MPI_COMM_WORLD);
MPI_Bcast(&verbose, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ MPI_Bcast(&test_ufs, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ MPI_Bcast(&test_bluegene, 1, MPI_INT, 0, MPI_COMM_WORLD);
}
else {
MPI_Bcast(&len, 1, MPI_INT, 0, MPI_COMM_WORLD);
filename = (char *) malloc(len+1);
MPI_Bcast(filename, len+1, MPI_CHAR, 0, MPI_COMM_WORLD);
MPI_Bcast(&verbose, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ MPI_Bcast(&test_ufs, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ MPI_Bcast(&test_bluegene, 1, MPI_INT, 0, MPI_COMM_WORLD);
+ }
+ if (test_ufs) {
+ defaults = &UFS_DEFAULTS;
+ } else if (test_bluegene) {
+ defaults = &BLUEGENE_DEFAULTS;
+ } else {
+ defaults = NULL;
}
+
/* open the file with MPI_INFO_NULL */
MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_CREATE | MPI_MODE_RDWR,
MPI_INFO_NULL, &fh);
@@ -89,102 +118,104 @@ int main(int argc, char **argv)
MPI_File_get_info(fh, &info_used);
MPI_Info_get_nkeys(info_used, &nkeys);
- for (i=0; i<nkeys; i++) {
- MPI_Info_get_nthkey(info_used, i, key);
- MPI_Info_get(info_used, key, MPI_MAX_INFO_VAL-1, value, &flag);
+ if (defaults != NULL) {
+ for (i=0; i<nkeys; i++) {
+ MPI_Info_get_nthkey(info_used, i, key);
+ MPI_Info_get(info_used, key, MPI_MAX_INFO_VAL-1, value, &flag);
#ifdef INFO_DEBUG
- if (!mynod)
- fprintf(stderr, "Process %d, Default: key = %s, value = %s\n", mynod,
- key, value);
+ if (!mynod)
+ fprintf(stderr, "Process %d, Default: key = %s, value = %s\n", mynod,
+ key, value);
#endif
- if (!strcmp("striping_factor", key)) {
- default_striping_factor = atoi(value);
- /* no check */
- }
- else if (!strcmp("cb_buffer_size", key)) {
- if (atoi(value) != DFLT_CB_BUFFER_SIZE) {
- errs++;
- if (verbose) fprintf(stderr, "cb_buffer_size is %d; should be %d\n",
- atoi(value), DFLT_CB_BUFFER_SIZE);
+ if (!strcmp("striping_factor", key)) {
+ default_striping_factor = atoi(value);
+ /* no check */
}
- }
- else if (!strcmp("romio_cb_read", key)) {
- if (strcmp(DFLT_ROMIO_CB_READ, value)) {
- errs++;
- if (verbose) fprintf(stderr, "romio_cb_read is set to %s; should be %s\n",
- value, DFLT_ROMIO_CB_READ);
+ else if (!strcmp("cb_buffer_size", key)) {
+ if (atoi(value) != defaults->cb_buffer_size) {
+ errs++;
+ if (verbose) fprintf(stderr, "cb_buffer_size is %d; should be %d\n",
+ atoi(value), defaults->cb_buffer_size);
+ }
}
- }
- else if (!strcmp("romio_cb_write", key)) {
- if (strcmp(DFLT_ROMIO_CB_WRITE, value)) {
- errs++;
- if (verbose) fprintf(stderr, "romio_cb_write is set to %s; should be %s\n",
- value, DFLT_ROMIO_CB_WRITE);
+ else if (!strcmp("romio_cb_read", key)) {
+ if (strcmp(defaults->romio_cb_read, value)) {
+ errs++;
+ if (verbose) fprintf(stderr, "romio_cb_read is set to %s; should be %s\n",
+ value, defaults->romio_cb_read);
+ }
}
- }
- else if (!strcmp("cb_nodes", key)) {
- /* unreliable test -- just ignore value */
- }
- else if (!strcmp("romio_no_indep_rw", key)) {
- if (strcmp("false", value)) {
- errs++;
- if (verbose) fprintf(stderr, "romio_no_indep_rw is set to %s; should be %s\n",
- value, "false");
+ else if (!strcmp("romio_cb_write", key)) {
+ if (strcmp(defaults->romio_cb_write, value)) {
+ errs++;
+ if (verbose) fprintf(stderr, "romio_cb_write is set to %s; should be %s\n",
+ value, defaults->romio_cb_write);
+ }
}
- }
- else if (!strcmp("ind_rd_buffer_size", key)) {
- if (atoi(value) != DFLT_IND_RD_BUFFER_SIZE) {
- errs++;
- if (verbose) fprintf(stderr, "ind_rd_buffer_size is %d; should be %d\n",
- atoi(value), DFLT_IND_RD_BUFFER_SIZE);
+ else if (!strcmp("cb_nodes", key)) {
+ /* unreliable test -- just ignore value */
}
- }
- else if (!strcmp("ind_wr_buffer_size", key)) {
- if (atoi(value) != DFLT_IND_WR_BUFFER_SIZE) {
- errs++;
- if (verbose) fprintf(stderr, "ind_wr_buffer_size is %d; should be %d\n",
- atoi(value), DFLT_IND_WR_BUFFER_SIZE);
+ else if (!strcmp("romio_no_indep_rw", key)) {
+ if (strcmp("false", value)) {
+ errs++;
+ if (verbose) fprintf(stderr, "romio_no_indep_rw is set to %s; should be %s\n",
+ value, "false");
+ }
}
- }
- else if (!strcmp("romio_ds_read", key)) {
- if (strcmp("automatic", value)) {
- errs++;
- if (verbose) fprintf(stderr, "romio_ds_read is set to %s; should be %s\n",
- value, "automatic");
+ else if (!strcmp("ind_rd_buffer_size", key)) {
+ if (atoi(value) != defaults->ind_rd_buffer_size) {
+ errs++;
+ if (verbose) fprintf(stderr, "ind_rd_buffer_size is %d; should be %d\n",
+ atoi(value), defaults->ind_rd_buffer_size);
+ }
}
- }
- else if (!strcmp("romio_ds_write", key)) {
- /* Unreliable test -- value is file system dependent. Ignore. */
- }
- else if (!strcmp("cb_config_list", key)) {
-#ifndef SKIP_CB_CONFIG_LIST_TEST
- if (strcmp("*:1", value)) {
- errs++;
- if (verbose) fprintf(stderr, "cb_config_list is set to %s; should be %s\n",
- value, "*:1");
+ else if (!strcmp("ind_wr_buffer_size", key)) {
+ if (atoi(value) != defaults->ind_wr_buffer_size) {
+ errs++;
+ if (verbose) fprintf(stderr, "ind_wr_buffer_size is %d; should be %d\n",
+ atoi(value), defaults->ind_wr_buffer_size);
+ }
+ }
+ else if (!strcmp("romio_ds_read", key)) {
+ if (strcmp("automatic", value)) {
+ errs++;
+ if (verbose) fprintf(stderr, "romio_ds_read is set to %s; should be %s\n",
+ value, "automatic");
+ }
}
+ else if (!strcmp("romio_ds_write", key)) {
+ /* Unreliable test -- value is file system dependent. Ignore. */
+ }
+ else if (!strcmp("cb_config_list", key)) {
+#ifndef SKIP_CB_CONFIG_LIST_TEST
+ if (strcmp(defaults->cb_config_list, value)) {
+ errs++;
+ if (verbose) fprintf(stderr, "cb_config_list is set to %s; should be %s\n",
+ value, defaults->cb_config_list);
+ }
#endif
- }
- /* don't care about the defaults for these keys */
- else if (!strcmp("romio_cb_pfr", key)) {
- }
- else if (!strcmp("romio_cb_fr_types", key)) {
- }
- else if (!strcmp("romio_cb_fr_alignment", key)) {
- }
- else if (!strcmp("romio_cb_ds_threshold", key)) {
- }
- else if (!strcmp("romio_cb_alltoall", key)) {
- }
- else {
- if (verbose) fprintf(stderr, "unexpected key %s (not counted as an error)\n", key);
+ }
+ /* don't care about the defaults for these keys */
+ else if (!strcmp("romio_cb_pfr", key)) {
+ }
+ else if (!strcmp("romio_cb_fr_types", key)) {
+ }
+ else if (!strcmp("romio_cb_fr_alignment", key)) {
+ }
+ else if (!strcmp("romio_cb_ds_threshold", key)) {
+ }
+ else if (!strcmp("romio_cb_alltoall", key)) {
+ }
+ else {
+ if (verbose) fprintf(stderr, "unexpected key %s (not counted as an error)\n", key);
+ }
}
}
MPI_Info_free(&info_used);
MPI_File_close(&fh);
-
-/* delete the file */
+
+ /* delete the file */
if (!mynod) MPI_File_delete(filename, MPI_INFO_NULL);
MPI_Barrier(MPI_COMM_WORLD);
@@ -279,26 +310,9 @@ int main(int argc, char **argv)
atoi(value), 8388608);
}
}
- else if (!strcmp("romio_cb_read", key)) {
- if (strcmp(DFLT_ROMIO_CB_READ, value)) {
- errs++;
- if (verbose) fprintf(stderr, "romio_cb_read is set to %s; should be %s\n",
- value, DFLT_ROMIO_CB_READ);
- }
- }
- else if (!strcmp("romio_cb_write", key)) {
- if (strcmp(DFLT_ROMIO_CB_WRITE, value)) {
- errs++;
- if (verbose) fprintf(stderr, "romio_cb_write is set to %s; should be %s\n",
- value, DFLT_ROMIO_CB_WRITE);
- }
- }
+ /* only check the hints we set */
else if (!strcmp("cb_nodes", key)) {
- if (atoi(value) != (nprocs/2)) {
- errs++;
- if (verbose) fprintf(stderr, "cb_nodes is %d; should be %d\n", atoi(value),
- nprocs/2);
- }
+ /* unreliable test: just skip */
}
else if (!strcmp("romio_no_indep_rw", key)) {
if (strcmp("false", value)) {
http://git.mpich.org/mpich.git/commitdiff/036d7ea8817f8ffdd2846074ae724c0a102f356d
commit 036d7ea8817f8ffdd2846074ae724c0a102f356d
Author: Michael Blocksome <blocksom at us.ibm.com>
Date: Wed Apr 3 13:15:10 2013 -0500
another bg romio fix from after merge
diff --git a/src/mpi/romio/test/file_info.c b/src/mpi/romio/test/file_info.c
index 07bf8c9..25ad88c 100644
--- a/src/mpi/romio/test/file_info.c
+++ b/src/mpi/romio/test/file_info.c
@@ -16,11 +16,22 @@
* default hints. These hints are specific to the MPI-IO implementation, so
* pick one of the following profiles to use */
+#if 1 /* hints are for BlueGene */
+# define DFLT_CB_BUFFER_SIZE 16777216
+# define DFLT_IND_RD_BUFFER_SIZE 4194304
+# define DFLT_IND_WR_BUFFER_SIZE 4194304
+# define DFLT_ROMIO_CB_READ "enable"
+# define DFLT_ROMIO_CB_WRITE "enable"
+
+# define SKIP_CB_CONFIG_LIST_TEST 1
+#endif
+#if 0 /* hints for MPICH2 */
# define DFLT_CB_BUFFER_SIZE 16777216
# define DFLT_IND_RD_BUFFER_SIZE 4194304
# define DFLT_IND_WR_BUFFER_SIZE 524288
# define DFLT_ROMIO_CB_READ "automatic"
# define DFLT_ROMIO_CB_WRITE "automatic"
+#endif
/* #undef INFO_DEBUG */
/* Test will print out information about unexpected hint keys or values that
-----------------------------------------------------------------------
Summary of changes:
src/mpi/romio/test/file_info.c | 239 ++++++++++++++++++++++------------------
1 files changed, 132 insertions(+), 107 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list