Changeset 691

Timestamp:

10/27/09 16:23:13 (4 weeks ago)

Author:

kgao

Message:

1. remove mcoll_test warnings; 2. modify parameters of mvar APIs for understaning

Location:

trunk

Files:

• src/lib/mpinetcdf.c (modified) (17 diffs)
• src/lib/pnetcdf.h (modified) (2 diffs)
• test/C/pres_temp_4D.nc (modified) (previous)
• test/mcoll_perf/mcoll_perf.c (modified) (6 diffs)
• test/mcoll_perf/single_mcoll_perf_record.c (modified) (7 diffs)

trunk/src/lib/mpinetcdf.c

@@ -12485 +12485 @@
 
 static int
-ncmpi_put_mvara_all_nonrecord(int ncid, int nvars, int varid[],
-                   MPI_Offset *start[], MPI_Offset *count[],
-                   void **buf, MPI_Offset *bufcount, 
-                   MPI_Datatype *datatype) {
+ncmpi_put_mvara_all_nonrecord(int ncid, int nvars, int varids[],
+                   MPI_Offset *starts[], MPI_Offset *counts[],
+                   void **buffers, MPI_Offset *bufcounts, 
+                   MPI_Datatype *datatypes) {
 
   NC_var **varp;
@@ -12550 +12550 @@
   xbuf[i] = NULL;
   cbuf[i] = NULL; 
-  varp[i] = ncmpii_NC_lookupvar(ncp, varid[i]);
+  varp[i] = ncmpii_NC_lookupvar(ncp, varids[i]);
   if(varp[i] == NULL)
     return NC_ENOTVAR;
 
-  MPI_Type_size(datatype[i], &size);
-  status = ncmpii_dtype_decode(datatype[i], &ptype[i], &el_size[i],
+  MPI_Type_size(datatypes[i], &size);
+  status = ncmpii_dtype_decode(datatypes[i], &ptype[i], &el_size[i],
                                &cnelems[i], &isderived, &iscontig_of_ptypes[i]);
   if (status != NC_NOERR)
@@ -12563 +12563 @@
     return NC_ECHAR;
 
-  cnelems[i] *= bufcount[i];
+  cnelems[i] *= bufcounts[i];
 
   nelems[i] = 1;
   for (dim = 0; dim < varp[i]->ndims; dim++) {
-    if (count[i][dim] < 0)
+    if (counts[i][dim] < 0)
       return NC_ENEGATIVECNT;
-    nelems[i] *= count[i][dim];
+    nelems[i] *= counts[i][dim];
   }
   nbytes[i] = varp[i]->xsz * nelems[i];
@@ -12577 +12577 @@
   /* set the mpi file view */
   
-  status = set_vara_fileview_all(ncp, &(ncp->nciop->collective_fh), nvars, varp, start, count, 0);
+  status = set_vara_fileview_all(ncp, &(ncp->nciop->collective_fh), nvars, varp, starts, counts, 0);
   if(status != NC_NOERR)
     return status;
@@ -12589 +12589 @@
       cbuf[i] = (void *)malloc( cnelems[i] * el_size[i] );
       if (cbuf[i]==NULL) printf("cubf[%d] is NULL\n", i);
-      status = ncmpii_data_repack((void *)buf[i], bufcount[i], datatype[i], 
+      status = ncmpii_data_repack((void *)buffers[i], bufcounts[i], datatypes[i], 
                                 cbuf[i], cnelems[i], ptype[i]);
       if (status != NC_NOERR)
@@ -12596 +12596 @@
     } else {
 
-      cbuf[i] = (void *)buf[i];
+      cbuf[i] = (void *)buffers[i];
 
     }
@@ -12664 +12664 @@
     xbuf[i]=NULL;
   }
-  if (cbuf[i] != buf[i] && cbuf[i] != NULL){
+  if (cbuf[i] != buffers[i] && cbuf[i] != NULL){
     free(cbuf[i]);
     cbuf[i]=NULL;
@@ -12675 +12675 @@
     */
     int newnumrecs, max_numrecs;
-    newnumrecs = start[i][0] + count[i][0];
+    newnumrecs = starts[i][0] + counts[i][0];
     if (ncp->numrecs < newnumrecs) {
       ncp->numrecs = newnumrecs;
@@ -12708 +12708 @@
 }
 int
-ncmpi_get_mvara_all(int ncid, int nvars, int varid[],
-                   MPI_Offset *start[], MPI_Offset *count[],
-                   void **buf, MPI_Offset *bufcount, 
-                   MPI_Datatype *datatype) {
+ncmpi_get_mvara_all(int ncid, int nvars, int *varids,
+                   MPI_Offset **starts, MPI_Offset **counts,
+                   void **buffers, MPI_Offset *bufcounts, 
+                   MPI_Datatype *datatypes) {
   NC_var **varp;
   NC *ncp;
@@ -12766 +12766 @@
     cbuf[i] = NULL;
 
-    varp[i] = ncmpii_NC_lookupvar(ncp, varid[i]);
+    varp[i] = ncmpii_NC_lookupvar(ncp, varids[i]);
     if(varp[i] == NULL)
      return NC_ENOTVAR;
 
-    status = ncmpii_dtype_decode(datatype[i], &ptype[i], &el_size[i],
+    status = ncmpii_dtype_decode(datatypes[i], &ptype[i], &el_size[i],
                                &cnelems[i], &isderived, &iscontig_of_ptypes[i]);
     if (status != NC_NOERR)
       return status;
     
-    MPI_Type_size(datatype[i], &size);
+    MPI_Type_size(datatypes[i], &size);
  
     if ( echar(varp[i]->type, ptype[i]) )
     return NC_ECHAR;
 
-  cnelems[i] *= bufcount[i];
+  cnelems[i] *= bufcounts[i];
 
   nelems[i] = 1;
   for (dim = 0; dim < varp[i]->ndims; dim++) {
-    if (count[i][dim] < 0)
+    if (counts[i][dim] < 0)
       return NC_ENEGATIVECNT;
-    nelems[i] *= count[i][dim];
+    nelems[i] *= counts[i][dim];
   }
 
@@ -12802 +12802 @@
   /* set the mpi file view */
 
-  status = set_vara_fileview_all(ncp, &(ncp->nciop->collective_fh), nvars, varp, start, count, 1);
+  status = set_vara_fileview_all(ncp, &(ncp->nciop->collective_fh), nvars, varp, starts, counts, 1);
 //  status = set_vara_fileview(ncp, &(ncp->nciop->collective_fh), varp[i], start[i], count[i], 1);
   if(status != NC_NOERR)
@@ -12816 +12816 @@
   } else {
 
-    cbuf[i] = (void *)buf[i];
+    cbuf[i] = (void *)buffers[i];
 
   }
@@ -12891 +12891 @@
 
     status = ncmpii_data_repack(cbuf[i], cnelems[i], ptype[i],
-                                (void *)buf[i], bufcount[i], datatype[i]);
+                                (void *)buffers[i], bufcounts[i], datatypes[i]);
     if (status != NC_NOERR)
       return status;
@@ -12899 +12899 @@
   if (xbuf[i] != cbuf[i] && xbuf[i] != NULL)
     free(xbuf[i]);
-  if (cbuf[i] != buf[i] && cbuf[i] != NULL)
+  if (cbuf[i] != buffers[i] && cbuf[i] != NULL)
     free(cbuf[i]);
   } 
@@ -12916 +12916 @@
                    MPI_Offset *start[], MPI_Offset *count[],
                    void **buf, MPI_Offset *bufcount,
-                   MPI_Datatype *datatype) {
+                   MPI_Datatype *datatype)
+{
 
   NC_var **varp;
@@ -13156 +13157 @@
 
 int
-ncmpi_put_mvara_all(int ncid, int nvars, int varid[],
-                   MPI_Offset *start[], MPI_Offset *count[],
-                   void **buf, MPI_Offset *bufcount,
-                   MPI_Datatype *datatype) {
+ncmpi_put_mvara_all(int ncid, int nvars, int varids[],
+                   MPI_Offset **starts, MPI_Offset **counts,
+                   void **buffers, MPI_Offset *bufcounts,
+                   MPI_Datatype *datatypes) {
 
   NC_var *varp;
@@ -13168 +13169 @@
   if(status != NC_NOERR)
     return status;
-  varp = ncmpii_NC_lookupvar(ncp, varid[0]);
+  varp = ncmpii_NC_lookupvar(ncp, varids[0]);
   if(varp == NULL)
     return NC_ENOTVAR;
 
  if (IS_RECVAR(varp))
-  status = ncmpi_put_mvara_all_record(ncid, nvars, varid, start, count, buf, bufcount, datatype);
+  status = ncmpi_put_mvara_all_record(ncid, nvars, varids, starts, counts, buffers, bufcounts, datatypes);
  else 
-  status = ncmpi_put_mvara_all_nonrecord(ncid, nvars, varid, start, count, buf, bufcount, datatype);
+  status = ncmpi_put_mvara_all_nonrecord(ncid, nvars, varids, starts, counts, buffers, bufcounts, datatypes);
  return (status);
 }

trunk/src/lib/pnetcdf.h

@@ -694 +694 @@
                    MPI_Datatype datatype);
 
-int ncmpi_put_mvara_all(int ncid, int nvars, int varid[],
-                   MPI_Offset *start[], MPI_Offset *count[],
-                   void **buf, MPI_Offset *bufcount,
-                   MPI_Datatype *datatype);
+int ncmpi_put_mvara_all(int ncid, int nvars, int varids[],
+                   MPI_Offset **starts, MPI_Offset **counts,
+                   void **buffers, MPI_Offset *bufcounts,
+                   MPI_Datatype *datatypes);
 int
 ncmpi_iput_vara_all(int ncid, int varid,
@@ -709 +709 @@
                    MPI_Datatype datatype);
 
-int ncmpi_get_mvara_all(int ncid, int nvars, int varid[],
-                   MPI_Offset *start[], MPI_Offset *count[],
-                   void **buf, MPI_Offset *bufcount,
-                   MPI_Datatype *datatype);
+int ncmpi_get_mvara_all(int ncid, int nvars, int varids[],
+                   MPI_Offset **starts, MPI_Offset **counts,
+                   void **buffers, MPI_Offset *bufcounts,
+                   MPI_Datatype *datatypes);
 
 int ncmpi_put_vara(int ncid, int varid,

trunk/test/mcoll_perf/mcoll_perf.c

@@ -29 +29 @@
 int main(int argc, char **argv)
 {
+    MPI_Datatype newtype;
     int i, j, array_of_gsizes[3],array_of_distribs[3];
-    int order, nprocs, len, **buf, bufcount, mynod;
+    int order, nprocs, len, **buf, mynod;
+    MPI_Offset bufcount;
     int array_of_dargs[3], array_of_psizes[3];
+    MPI_File fh;
     int status;
-    MPI_Offset sizes[3], array_of_starts[3];
-    double write_time, *new_write_tim, write_bw;
+    MPI_Offset starts[3], sizes[3], array_of_starts[3];
+    double stim, write_time, *new_write_tim, write_bw;
     MPI_Offset file_size;
     double start_time, open_time, def_time, run_time;
     double *new_open_tim, *new_def_tim, *new_run_tim;
+    double read_tim, new_read_tim, read_bw;
     char *pathname, filename[50];
     char dimname[20], varname[20];
@@ -43 +47 @@
     MPI_Info info;
     MPI_Offset **starts_list, **count_list;
-    int *bufcount_list;
+    MPI_Offset *bufcount_list;
     int ndims = 3;
     int nvars = 10;
@@ -50 +54 @@
     int length;
     int mvar_flag = 0;
+    NCMPI_Request request;
     NCMPI_Request *array_of_requests;
     int unlimit_flag;
@@ -112 +117 @@
                 return 0;               
     }   
-    bufcount_list = (int *)malloc(nvars*sizeof(int));
+    bufcount_list = (MPI_Offset *)malloc(nvars*sizeof(MPI_Offset));
     if (bufcount_list == NULL){
                 printf("bufcount_list malloc error\n");
@@ -278 +283 @@
              status = ncmpi_put_mvara_all(ncid, nvars, varid,
                                 starts_list, count_list,
-                               (const void **)buf, bufcount_list, datatype_list);
+                               (void **)buf, bufcount_list, datatype_list);
              TEST_HANDLE_ERR(status);
         }
@@ -285 +290 @@
                   status = ncmpi_iput_vara_all(ncid, varid[i],
                             starts_list[i], count_list[i],
-                            (const void *)&(buf[i][0]), bufcount_list[i], MPI_INT, &array_of_requests[i]);
+                            (void *)&(buf[i][0]), bufcount_list[i], MPI_INT, &array_of_requests[i]);
                   TEST_HANDLE_ERR(status);
-                  ncmpi_wait(array_of_requests[i]);
+                  ncmpi_wait(&array_of_requests[i]);
               }
         } 

trunk/test/mcoll_perf/single_mcoll_perf_record.c

@@ -29 +29 @@
 int main(int argc, char **argv)
 {
+    MPI_Datatype newtype;
     int i, j, array_of_gsizes[3],array_of_distribs[3];
-    int order, nprocs, len, **buf, bufcount, mynod;
+    int order, nprocs, len, **buf, mynod;
+    MPI_Offset bufcount;
     int array_of_dargs[3], array_of_psizes[3];
+    MPI_File fh;
     int status;
-    MPI_Offset sizes[3], array_of_starts[3];
-    double write_time, *new_write_tim, write_bw;
+    MPI_Offset starts[3], sizes[3], array_of_starts[3];
+    double stim, write_time, *new_write_tim, write_bw;
     MPI_Offset file_size;
     double start_time, open_time, def_time, run_time;
     double *new_open_tim, *new_def_tim, *new_run_tim;
+    double read_tim, new_read_tim, read_bw;
     char *pathname, filename[50];
     char dimname[20], varname[20];
@@ -43 +47 @@
     MPI_Info info;
     MPI_Offset **starts_list, **count_list;
-    int *bufcount_list;
+    MPI_Offset *bufcount_list;
     int ndims = 3;
     int nvars = 10;
@@ -50 +54 @@
     int length;
     int mvar_flag = 0;
+    NCMPI_Request request;
     NCMPI_Request *array_of_requests;
 
@@ -110 +115 @@
                 return 0;               
     }   
-    bufcount_list = (int *)malloc(nvars*sizeof(int));
+    bufcount_list = (MPI_Offset *)malloc(nvars*sizeof(MPI_Offset));
     if (bufcount_list == NULL){
                 printf("bufcount_list malloc error\n");
@@ -270 +275 @@
              status = ncmpi_put_mvara_all(ncid, nvars, varid,
                                 starts_list, count_list,
-                               (const void **)buf, bufcount_list, datatype_list);
+                               (void **)buf, bufcount_list, datatype_list);
              TEST_HANDLE_ERR(status);
         }
@@ -277 +282 @@
                   status = ncmpi_iput_vara_all(ncid, varid[i],
                             starts_list[i], count_list[i],
-                            (const void *)&(buf[i][0]), bufcount_list[i], MPI_INT, &array_of_requests[i]);
+                            (void *)&(buf[i][0]), bufcount_list[i], MPI_INT, &array_of_requests[i]);
                   TEST_HANDLE_ERR(status);
                   ncmpi_wait(&array_of_requests[i]);
@@ -286 +291 @@
                   status = ncmpi_iput_vara_all(ncid, varid[i],
                             starts_list[i], count_list[i],
-                            (const void *)&(buf[i][0]), bufcount_list[i], MPI_INT, &array_of_requests[i]);
+                            (void *)&(buf[i][0]), bufcount_list[i], MPI_INT, &array_of_requests[i]);
                   TEST_HANDLE_ERR(status);
               }