Merge pull request #160 from Parallel-NetCDF/misc_fix

wkliao · web-flow · commit a34b1507df90 · 2024-11-26T14:09:54.000-06:00
Misc fix
diff --git a/src/drivers/common/error_mpi2nc.c b/src/drivers/common/error_mpi2nc.c
@@ -20,11 +20,12 @@
 
 /*----< ncmpii_error_mpi2nc() -----------------------------------------------*/
 /* translate MPI error codes to PnetCDF/netCDF error codes */
-int ncmpii_error_mpi2nc(int   mpi_errorcode, /* returned value from MPI call */
-                        char *err_msg)       /* extra error message */
+int ncmpii_error_mpi2nc(int mpi_errorcode,   /* returned value from MPI call */
+                        const char *err_msg) /* extra error message */
 {
     int errorclass, errorStringLen;
     char errorString[MPI_MAX_ERROR_STRING];
+    const char *dump_str = (err_msg == NULL) ? "" : err_msg;
 
     /* check for specific error codes understood by PnetCDF */
 
@@ -65,14 +66,13 @@ int ncmpii_error_mpi2nc(int   mpi_errorcode, /* returned value from MPI call */
      */
 
     MPI_Error_string(mpi_errorcode, errorString, &errorStringLen);
-    if (err_msg == NULL) err_msg = "";
 #ifdef PNETCDF_DEBUG
     /* report the world rank */
     int rank;
     MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    printf("rank %d: MPI error (%s) : %s\n", rank, err_msg, errorString);
+    printf("rank %d: MPI error (%s) : %s\n", rank, dump_str, errorString);
 #else
-    printf("MPI error (%s) : %s\n", err_msg, errorString);
+    printf("MPI error (%s) : %s\n", dump_str, errorString);
 #endif
 
     return NC_EFILE; /* other unknown file I/O error */
diff --git a/src/drivers/include/common.h b/src/drivers/include/common.h
@@ -107,7 +107,7 @@ ncmpii_create_imaptype(int ndims, const MPI_Offset *count,
                        MPI_Datatype *imaptype);
 
 extern int
-ncmpii_error_mpi2nc(int mpi_errorcode, char *msg);
+ncmpii_error_mpi2nc(int mpi_errorcode, const char *msg);
 
 extern int
 ncmpii_error_posix2nc(char *err_msg);
diff --git a/src/drivers/ncmpio/ncmpio_close.c b/src/drivers/ncmpio/ncmpio_close.c
@@ -190,14 +190,9 @@ ncmpio_close(void *ncdp)
             if (mpireturn == MPI_SUCCESS) {
                 /* obtain file size */
                 MPI_Offset *file_size;
-                mpireturn = MPI_File_seek(fh, 0, MPI_SEEK_END);
+                mpireturn = MPI_File_get_size(fh, &file_size);
                 if (mpireturn != MPI_SUCCESS) {
-                    err = ncmpii_error_mpi2nc(mpireturn,"MPI_File_seek");
-                    if (status == NC_NOERR) status = err;
-                }
-                mpireturn = MPI_File_get_position(fh, &file_size);
-                if (mpireturn != MPI_SUCCESS) {
-                    err = ncmpii_error_mpi2nc(mpireturn,"MPI_File_get_position");
+                    err = ncmpii_error_mpi2nc(mpireturn,"MPI_File_get_size");
                     if (status == NC_NOERR) status = err;
                 }
                 /* truncate file size to header size, if larger than header */
diff --git a/test/testcases/flexible.c b/test/testcases/flexible.c
@@ -135,6 +135,7 @@ int main(int argc, char **argv) {
             printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",
                    __FILE__,__LINE__,j,i,j+rank+10,buf[j][i]);
             nerrs++;
+            j = NY;
             break;
         }
 
@@ -147,6 +148,7 @@ int main(int argc, char **argv) {
             printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",
                    __FILE__,__LINE__,j,i,j+rank+10,buf[j][i]);
             nerrs++;
+            j = NY;
             break;
         }
 
@@ -169,10 +171,12 @@ int main(int argc, char **argv) {
             printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",
                    __FILE__,__LINE__,j,i,j+rank+10,schar_buf[j*NX+i]);
             nerrs++;
+            j = NY;
             break;
         }
 
     for (j=0; j<NY; j++) for (i=0; i<NX; i++) schar_buf[j*NX+i] = -1;
+
     err = ncmpi_get_vara_all(ncid, varid3, start, count, schar_buf+NX, 1, buftype); CHECK_ERR
 
     /* check read contents */
@@ -181,6 +185,7 @@ int main(int argc, char **argv) {
             printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",
                    __FILE__,__LINE__,j,i,j+rank+10,schar_buf[j*NX+i]);
             nerrs++;
+            j = NY;
             break;
         }
 
@@ -259,6 +264,7 @@ int main(int argc, char **argv) {
             printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",
                    __FILE__,__LINE__,j,i,buf[j][i],getValue);
             nerrs++;
+            j = (int)count[0];
             break;
         }
     }
@@ -272,6 +278,7 @@ int main(int argc, char **argv) {
             printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",
                    __FILE__,__LINE__,j,i,buf[j][i],getValue);
             nerrs++;
+            j = (int)count[0];
             break;
         }
     }
@@ -288,6 +295,7 @@ int main(int argc, char **argv) {
             printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",
                    __FILE__,__LINE__,j,i,buf[j][i],getValue);
             nerrs++;
+            j = (int)count[0];
             break;
         }
     }
@@ -304,6 +312,7 @@ int main(int argc, char **argv) {
             printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",
                    __FILE__,__LINE__,j,i,buf[j][i],getValue);
             nerrs++;
+            j = (int)count[0];
             break;
         }
     }
diff --git a/test/testcases/test_vard_rec.c b/test/testcases/test_vard_rec.c
@@ -45,7 +45,7 @@ int main(int argc, char **argv) {
 
     char         filename[256];
     int          i, j, err, nerrs=0, ncid, varid, dimids[2], unlimit_dimid;
-    int          rank, nprocs, array_of_blocklengths[2], buf[NY][NX];
+    int          rank, nprocs, verbose, array_of_blocklengths[2], buf[NY][NX];
     MPI_Offset   recsize, len;
     MPI_Aint     array_of_displacements[2];
     MPI_Datatype rec_filetype;
@@ -54,6 +54,8 @@ int main(int argc, char **argv) {
     MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
     MPI_Comm_rank(MPI_COMM_WORLD, &rank);
 
+    verbose = 0;
+
     if (argc > 2) {
         if (!rank) printf("Usage: %s [filename]\n",argv[0]);
         MPI_Finalize();
@@ -94,6 +96,10 @@ int main(int argc, char **argv) {
                              MPI_INT, &rec_filetype);
     MPI_Type_commit(&rec_filetype);
 
+    if (verbose)
+        printf("%d: %s line %d: displacements=%ld blocklengths=%d\n",rank,
+               __func__,__LINE__, array_of_displacements[0], array_of_blocklengths[0]);
+
     /* write the record variable */
     err = ncmpi_put_vard_all(ncid, varid, rec_filetype, buf, NX, MPI_INT);
     CHECK_ERR
@@ -113,6 +119,10 @@ int main(int argc, char **argv) {
                              MPI_INT, &rec_filetype);
     MPI_Type_commit(&rec_filetype);
 
+    if (verbose)
+        printf("%d: %s line %d: displacements=%ld blocklengths=%d\n",rank,
+               __func__,__LINE__, array_of_displacements[0], array_of_blocklengths[0]);
+
     /* write the record variable */
     err = ncmpi_put_vard_all(ncid, varid, rec_filetype, buf[1], NX, MPI_INT);
     CHECK_ERR
@@ -142,6 +152,12 @@ int main(int argc, char **argv) {
                              MPI_INT, &rec_filetype);
     MPI_Type_commit(&rec_filetype);
 
+    if (verbose)
+        printf("%d: %s line %d: displacements=%ld %ld blocklengths=%d %d\n",rank,
+               __func__,__LINE__,
+               array_of_displacements[0], array_of_displacements[1],
+               array_of_blocklengths[0], array_of_blocklengths[1]);
+
     /* reset contents of buf before read */
     for (j=0; j<NY; j++) for (i=0; i<NX; i++) buf[j][i] = -1;
 
diff --git a/test/testcases/tst_vars_fill.m4 b/test/testcases/tst_vars_fill.m4
@@ -55,6 +55,7 @@ test_vars_$1(char *filename)
 {
     char var_name[32];
     int i, j, k, nprocs, rank, err, nerrs=0, ncid, dimid[2], varid[NVARS];
+    int max_nerrs;
     MPI_Offset start[2], count[2], stride[2];
     $1 buf[NY][NX];
 
@@ -123,9 +124,11 @@ test_vars_$1(char *filename)
                 }
             }
         }
+fn_exit:
+        MPI_Allreduce(&nerrs, &max_nerrs, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD);
+        if (max_nerrs > 0) break;
     }
 
-fn_exit:
     err = ncmpi_close(ncid); CHECK_ERR
     return nerrs;
 }

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ int main(int argc, char **argv) {`
`135`	`135`	`printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",`
`136`	`136`	`__FILE__,__LINE__,j,i,j+rank+10,buf[j][i]);`
`137`	`137`	`nerrs++;`
	`138`	`+ j = NY;`
`138`	`139`	`break;`
`139`	`140`	`}`
`140`	`141`
`@@ -147,6 +148,7 @@ int main(int argc, char **argv) {`
`147`	`148`	`printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",`
`148`	`149`	`__FILE__,__LINE__,j,i,j+rank+10,buf[j][i]);`
`149`	`150`	`nerrs++;`
	`151`	`+ j = NY;`
`150`	`152`	`break;`
`151`	`153`	`}`
`152`	`154`
`@@ -169,10 +171,12 @@ int main(int argc, char **argv) {`
`169`	`171`	`printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",`
`170`	`172`	`__FILE__,__LINE__,j,i,j+rank+10,schar_buf[j*NX+i]);`
`171`	`173`	`nerrs++;`
	`174`	`+ j = NY;`
`172`	`175`	`break;`
`173`	`176`	`}`
`174`	`177`
`175`	`178`	`for (j=0; j<NY; j++) for (i=0; i<NX; i++) schar_buf[j*NX+i] = -1;`
	`179`	`+`
`176`	`180`	`err = ncmpi_get_vara_all(ncid, varid3, start, count, schar_buf+NX, 1, buftype); CHECK_ERR`
`177`	`181`
`178`	`182`	`/* check read contents */`
`@@ -181,6 +185,7 @@ int main(int argc, char **argv) {`
`181`	`185`	`printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",`
`182`	`186`	`__FILE__,__LINE__,j,i,j+rank+10,schar_buf[j*NX+i]);`
`183`	`187`	`nerrs++;`
	`188`	`+ j = NY;`
`184`	`189`	`break;`
`185`	`190`	`}`
`186`	`191`
`@@ -259,6 +264,7 @@ int main(int argc, char **argv) {`
`259`	`264`	`printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",`
`260`	`265`	`__FILE__,__LINE__,j,i,buf[j][i],getValue);`
`261`	`266`	`nerrs++;`
	`267`	`+ j = (int)count[0];`
`262`	`268`	`break;`
`263`	`269`	`}`
`264`	`270`	`}`
`@@ -272,6 +278,7 @@ int main(int argc, char **argv) {`
`272`	`278`	`printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",`
`273`	`279`	`__FILE__,__LINE__,j,i,buf[j][i],getValue);`
`274`	`280`	`nerrs++;`
	`281`	`+ j = (int)count[0];`
`275`	`282`	`break;`
`276`	`283`	`}`
`277`	`284`	`}`
`@@ -288,6 +295,7 @@ int main(int argc, char **argv) {`
`288`	`295`	`printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",`
`289`	`296`	`__FILE__,__LINE__,j,i,buf[j][i],getValue);`
`290`	`297`	`nerrs++;`
	`298`	`+ j = (int)count[0];`
`291`	`299`	`break;`
`292`	`300`	`}`
`293`	`301`	`}`
`@@ -304,6 +312,7 @@ int main(int argc, char **argv) {`
`304`	`312`	`printf("Error at %s line %d: expect buf[%d][%d]=%d but got %d\n",`
`305`	`313`	`__FILE__,__LINE__,j,i,buf[j][i],getValue);`
`306`	`314`	`nerrs++;`
	`315`	`+ j = (int)count[0];`
`307`	`316`	`break;`
`308`	`317`	`}`
`309`	`318`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ test_vars_$1(char *filename)`
`55`	`55`	`{`
`56`	`56`	`char var_name[32];`
`57`	`57`	`int i, j, k, nprocs, rank, err, nerrs=0, ncid, dimid[2], varid[NVARS];`
	`58`	`+ int max_nerrs;`
`58`	`59`	`MPI_Offset start[2], count[2], stride[2];`
`59`	`60`	`$1 buf[NY][NX];`
`60`	`61`
`@@ -123,9 +124,11 @@ test_vars_$1(char *filename)`
`123`	`124`	`}`
`124`	`125`	`}`
`125`	`126`	`}`
	`127`	`+fn_exit:`
	`128`	`+ MPI_Allreduce(&nerrs, &max_nerrs, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD);`
	`129`	`+ if (max_nerrs > 0) break;`
`126`	`130`	`}`
`127`	`131`
`128`		`-fn_exit:`
`129`	`132`	`err = ncmpi_close(ncid); CHECK_ERR`
`130`	`133`	`return nerrs;`
`131`	`134`	`}`