A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/master'
[simgrid.git]
/
teshsuite
/
smpi
/
mpich3-test
/
datatype
/
contig-zero-count.c
diff --git
a/teshsuite/smpi/mpich3-test/datatype/contig-zero-count.c
b/teshsuite/smpi/mpich3-test/datatype/contig-zero-count.c
index
6236173
..
a6b9cd9
100644
(file)
--- a/
teshsuite/smpi/mpich3-test/datatype/contig-zero-count.c
+++ b/
teshsuite/smpi/mpich3-test/datatype/contig-zero-count.c
@@
-23,25
+23,25
@@
int main(int argc, char **argv)
{
int err, errs = 0;
- MPI_Init(&argc, &argv); /* MPI-1.2 doesn't allow for MPI_Init(0,0) */
+ MPI_Init(&argc, &argv);
/* MPI-1.2 doesn't allow for MPI_Init(0,0) */
parse_args(argc, argv);
/* To improve reporting of problems about operations, we
-
change the error handler to errors return */
- MPI_Comm_set_errhandler(
MPI_COMM_WORLD, MPI_ERRORS_RETURN
);
+
*
change the error handler to errors return */
+ MPI_Comm_set_errhandler(
MPI_COMM_WORLD, MPI_ERRORS_RETURN
);
/* perform some tests */
err = contig_test();
- if (err && verbose)
fprintf(stderr, "%d errors in contig test.\n",
-
err);
+ if (err && verbose)
+
fprintf(stderr, "%d errors in contig test.\n",
err);
errs += err;
/* print message and exit */
if (errs) {
- fprintf(stderr, "Found %d errors\n", errs);
+
fprintf(stderr, "Found %d errors\n", errs);
}
else {
- printf(" No Errors\n");
+
printf(" No Errors\n");
}
MPI_Finalize();
return 0;
@@
-63,52
+63,45
@@
int contig_test(void)
int size;
MPI_Aint extent;
- err = MPI_Type_contiguous(count,
- MPI_INT,
- &newtype);
+ err = MPI_Type_contiguous(count, MPI_INT, &newtype);
if (err != MPI_SUCCESS) {
- if (verbose) {
- fprintf(stderr,
- "error creating type in contig_test()\n");
- }
- errs++;
+ if (verbose) {
+ fprintf(stderr, "error creating type in contig_test()\n");
+ }
+ errs++;
}
err = MPI_Type_size(newtype, &size);
if (err != MPI_SUCCESS) {
- if (verbose) {
- fprintf(stderr,
- "error obtaining type size in contig_test()\n");
- }
- errs++;
+ if (verbose) {
+ fprintf(stderr, "error obtaining type size in contig_test()\n");
+ }
+ errs++;
}
-
+
if (size != 0) {
- if (verbose) {
- fprintf(stderr,
- "error: size != 0 in contig_test()\n");
- }
- errs++;
- }
+ if (verbose) {
+ fprintf(stderr, "error: size != 0 in contig_test()\n");
+ }
+ errs++;
+ }
err = MPI_Type_extent(newtype, &extent);
if (err != MPI_SUCCESS) {
- if (verbose) {
- fprintf(stderr,
- "error obtaining type extent in contig_test()\n");
- }
- errs++;
+ if (verbose) {
+ fprintf(stderr, "error obtaining type extent in contig_test()\n");
+ }
+ errs++;
}
-
+
if (extent != 0) {
- if (verbose) {
- fprintf(stderr,
- "error: extent != 0 in contig_test()\n");
- }
- errs++;
- }
+ if (verbose) {
+ fprintf(stderr, "error: extent != 0 in contig_test()\n");
+ }
+ errs++;
+ }
- MPI_Type_free(
&newtype
);
+ MPI_Type_free(
&newtype
);
return errs;
}
@@
-117,19
+110,18
@@
int contig_test(void)
int parse_args(int argc, char **argv)
{
/*
- int ret;
-
- while ((ret = getopt(argc, argv, "v")) >= 0)
- {
-
switch (ret) {
-
case 'v':
-
verbose = 1;
-
break;
-
}
- }
- */
+
*
int ret;
+ *
+
*
while ((ret = getopt(argc, argv, "v")) >= 0)
+
*
{
+
*
switch (ret) {
+
*
case 'v':
+
*
verbose = 1;
+
*
break;
+
*
}
+
*
}
+
*/
if (argc > 1 && strcmp(argv[1], "-v") == 0)
- verbose = 1;
+
verbose = 1;
return 0;
}
-