make varn APIs separated from var APIs

1. the optional arguments of varn APIs are different from var
2. the dimensionality of starts, and counts are also different

Author: wkliao

examples/put_varn_int.py

@@ -153,7 +153,7 @@ def pnetcdf_io(file_name, file_format):
     w_buf = np.full(w_len, rank, dtype=np.int32)
 
     # set the buffer pointers to different offsets to the I/O buffe
-    v.put_var_all(w_buf, start = starts, count = counts, num = num_reqs)
+    v.put_varn_all(w_buf, num = num_reqs, starts = starts, counts = counts)
 
     # close the file
     f.close()

src/pnetcdf/_Variable.pyx

@@ -166,7 +166,7 @@ def run_test(format):
         v = f.variables[f'data{i}']
         assert(f.inq_buff_size() - f.inq_buff_usage() > 0)
         # post the request to write an array of values
-        req_id = v.bput_var(data, start = starts, count = counts, num = num_subarrays)
+        req_id = v.bput_varn(data, num_subarrays, starts, counts)
         # track the request ID for each write request
         req_ids.append(req_id)
 
@@ -182,7 +182,7 @@ def run_test(format):
     # post requests to write the 2nd half of variables w/o tracking req ids
     for i in range(num_reqs):
         v = f.variables[f'data{num_reqs + i}']
-        v.bput_var(data, start = starts, count = counts, num = num_subarrays)
+        v.bput_varn(data, num_subarrays, starts, counts)
 
     # commit the posted requests all at once using wait_all (collective i/o)
     f.wait_all(num = pnetcdf.NC_PUT_REQ_ALL)

test/tst_var_bput_varn.py

@@ -120,15 +120,15 @@ def runTest(self):
         """testing variable get varn for CDF-5/CDF-2/CDF-1 file"""
         dataref = np.full((buf_len,), rank, np.float32)
         f = pnetcdf.File(self.file_path, 'r')
-        # test collective i/o get_var
+        # test collective i/o get_varn
         v1 = f.variables['var1']
         buff = np.empty((buf_len,), v1.dtype)
-        v1.get_var_all(buff, start = starts, count = counts, num = num_reqs)
+        v1.get_varn_all(buff, num_reqs, starts, counts)
         assert_array_equal(buff, dataref)
-        # test independent i/o get_var
+        # test independent i/o get_varn
         f.begin_indep()
         buff = np.empty((buf_len,), v1.dtype)
-        v1.get_var(buff, start = starts, count = counts, num = num_reqs)
+        v1.get_varn(buff, num_reqs, starts, counts)
         assert_array_equal(buff, dataref)
         f.close()
 

test/tst_var_get_varn.py

@@ -135,7 +135,7 @@ def setUp(self):
             v = f.variables[f'data{i}']
             buff = np.empty(shape = buf_len, dtype = v.datatype)
             # post the request to read multiple slices (subarrays) of the variable
-            req_id = v.iget_var(buff, start = starts, count = counts, num = num_subarray_reqs)
+            req_id = v.iget_varn(buff, num_subarray_reqs, starts, counts)
             # track the reqeust ID for each read reqeust
             req_ids.append(req_id)
             # store the reference of variable values
@@ -154,7 +154,7 @@ def setUp(self):
             v = f.variables[f'data{i}']
             buff = np.empty(buf_len, dtype = v.datatype)
             # post the request to read a list of subarrays from the variable
-            v.iget_var(buff, start = starts, count = counts, num = num_subarray_reqs)
+            v.iget_varn(buff, num_subarray_reqs, starts, counts)
             # store the reference of variable values
             v_datas.append(buff)
 

test/tst_var_iget_varn.py

@@ -136,7 +136,7 @@ def setUp(self):
         for i in range(num_reqs):
             v = f.variables[f'data{i}']
             # post the request to write an array of values
-            req_id = v.iput_var(data, start = starts, count = counts, num = num_subarrays)
+            req_id = v.iput_varn(data, num_subarrays, starts, counts)
             # track the reqeust ID for each write reqeust
             req_ids.append(req_id)
 
@@ -153,7 +153,7 @@ def setUp(self):
         for i in range(num_reqs):
             v = f.variables[f'data{num_reqs + i}']
             # post the request to write an array of values
-            v.iput_var(data, start = starts, count = counts, num = num_subarrays)
+            v.iput_varn(data, num_subarrays, starts, counts)
 
         # all processes commit all pending requests to the file at once using wait_all (collective i/o)
         f.wait_all(num = pnetcdf.NC_PUT_REQ_ALL)

test/tst_var_iput_varn.py

@@ -114,12 +114,12 @@ def setUp(self):
             buf_len += w_req_len
         data = np.empty(buf_len, dtype=np.float32)
         data.fill(rank)
-        # collective put_var
-        var1.put_var_all(data, start = starts, count = counts, num = num_reqs)
+        # collective put_varn
+        var1.put_varn_all(data, num_reqs, starts, counts)
 
-        # independent put_var
+        # independent put_varn
         f.begin_indep()
-        var2.put_var(data, start = starts, count = counts, num = num_reqs)
+        var2.put_varn(data, num_reqs, starts, counts)
         f.close()
         comm.Barrier()
         assert validate_nc_file(os.environ.get('PNETCDF_DIR'), self.file_path) == 0 if os.environ.get('PNETCDF_DIR') is not None else True