Bas Couwenberg pushed to branch upstream at Debian GIS Project / netcdf4-python


Commits:
7f55ea43 by Bas Couwenberg at 2019-03-07T05:41:16Z
New upstream version 1.4.3.1
- - - - -


6 changed files:

- Changelog
- PKG-INFO
- README.md
- examples/mpi_example.py
- netCDF4/_netCDF4.pyx
- setup.py


Changes:

=====================================
Changelog
=====================================
@@ -1,3 +1,8 @@
+ version 1.4.3.1 (tag v1.4.3.1 rel)
+===================================
+ * fix bug in implementation of NETCDF4_CLASSIC support for parallel IO
+   in v1.4.3 release.
+
  version 1.4.3 (tag v1.4.3rel)
 =============================
  * make set_always_mask work in MFDataset.


=====================================
PKG-INFO
=====================================
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: netCDF4
-Version: 1.4.3
+Version: 1.4.3.1
 Author: Jeff Whitaker
 Author-email: jeffrey s whitaker at noaa gov
 Home-page: https://github.com/Unidata/netcdf4-python


=====================================
README.md
=====================================
@@ -4,10 +4,14 @@
 [![Linux Build 
Status](https://travis-ci.org/Unidata/netcdf4-python.svg?branch=master)](https://travis-ci.org/Unidata/netcdf4-python)
 [![Windows Build 
Status](https://ci.appveyor.com/api/projects/status/fl9taa9je4e6wi7n/branch/master?svg=true)](https://ci.appveyor.com/project/jswhit/netcdf4-python/branch/master)
 [![PyPI 
package](https://badge.fury.io/py/netCDF4.svg)](http://python.org/pypi/netCDF4)
+[![Anaconda-Server 
Badge](https://anaconda.org/conda-forge/netCDF4/badges/version.svg)](https://anaconda.org/conda-forge/netCDF4)
 
 ## News
 For details on the latest updates, see the 
[Changelog](https://github.com/Unidata/netcdf4-python/blob/master/Changelog).
 
+03/07/2019: Version [1.4.3.1](https://pypi.python.org/pypi/netCDF4/1.4.3.1) 
released. 
+Fixes bug in implementation of NETCDF4_CLASSIC parallel IO support in 1.4.3.
+
 03/05/2019: Version [1.4.3](https://pypi.python.org/pypi/netCDF4/1.4.3) 
released. Issues with netcdf-c 4.6.2 fixed (including broken parallel IO).  
`set_ncstring_attrs()` method added, memoryview buffer now returned when an 
in-memory Dataset is closed.
 
 10/26/2018: Version [1.4.2](https://pypi.python.org/pypi/netCDF4/1.4.2) 
released. Minor bugfixes, added `Variable.get_dims()` method and `master_file` 
kwarg for `MFDataset.__init__`.


=====================================
examples/mpi_example.py
=====================================
@@ -8,7 +8,7 @@ nc = Dataset('parallel_test.nc', 'w', parallel=True, 
comm=MPI.COMM_WORLD,
 # below should work also - MPI_COMM_WORLD and MPI_INFO_NULL will be used.
 #nc = Dataset('parallel_test.nc', 'w', parallel=True)
 d = nc.createDimension('dim',4)
-v = nc.createVariable('var', np.int, 'dim')
+v = nc.createVariable('var', np.int32, 'dim')
 v[rank] = rank
 # switch to collective mode, rewrite the data.
 v.set_collective(True)


=====================================
netCDF4/_netCDF4.pyx
=====================================
@@ -1185,7 +1185,7 @@ except ImportError:
     # python3: zip is already python2's itertools.izip
     pass
 
-__version__ = "1.4.3"
+__version__ = "1.4.3.1"
 
 # Initialize numpy
 import posixpath
@@ -2083,6 +2083,7 @@ strings.
         cdef size_t initialsize
         cdef char *path
         cdef char namstring[NC_MAX_NAME+1]
+        cdef int cmode
         IF HAS_NC_PAR:
             cdef MPI_Comm mpicomm
             cdef MPI_Info mpiinfo
@@ -2121,6 +2122,9 @@ strings.
                     mpiinfo = info.ob_mpi
                 else:
                     mpiinfo = MPI_INFO_NULL
+                cmode = NC_MPIIO | NC_NETCDF4
+                if format == 'NETCDF4_CLASSIC':
+                    cmode = cmode | NC_CLASSIC_MODEL
 
         self._inmemory = False
         if mode == 'w':
@@ -2141,7 +2145,7 @@ strings.
                 if clobber:
                     if parallel:
                         IF HAS_NC_PAR:
-                            ierr = nc_create_par(path, NC_CLOBBER | NC_MPIIO | 
NC_NETCDF4, \
+                            ierr = nc_create_par(path, NC_CLOBBER | cmode, \
                                    mpicomm, mpiinfo, &grpid)
                         ELSE:
                             pass
@@ -2156,7 +2160,7 @@ strings.
                 else:
                     if parallel:
                         IF HAS_NC_PAR:
-                            ierr = nc_create_par(path, NC_NOCLOBBER | NC_MPIIO 
| NC_NETCDF4, \
+                            ierr = nc_create_par(path, NC_NOCLOBBER | cmode, \
                                    mpicomm, mpiinfo, &grpid)
                         ELSE:
                             pass
@@ -2228,7 +2232,7 @@ strings.
                 if parallel:
                     # NC_SHARE ignored
                     IF HAS_NC_PAR:
-                        ierr = nc_create_par(path, NC_CLOBBER | NC_MPIIO | 
NC_NETCDF4, \
+                        ierr = nc_create_par(path, NC_CLOBBER | cmode, \
                                mpicomm, mpiinfo, &grpid)
                     ELSE:
                         pass
@@ -2243,7 +2247,7 @@ strings.
                 if parallel:
                     # NC_SHARE ignored
                     IF HAS_NC_PAR:
-                        ierr = nc_create_par(path, NC_NOCLOBBER | NC_MPIIO | 
NC_NETCDF4, \
+                        ierr = nc_create_par(path, NC_NOCLOBBER | cmode, \
                                mpicomm, mpiinfo, &grpid)
                     ELSE:
                         pass


=====================================
setup.py
=====================================
@@ -570,7 +570,7 @@ else:
 
 setup(name="netCDF4",
       cmdclass=cmdclass,
-      version="1.4.3",
+      version="1.4.3.1",
       long_description="netCDF version 4 has many features not found in 
earlier versions of the library, such as hierarchical groups, zlib compression, 
multiple unlimited dimensions, and new data types.  It is implemented on top of 
HDF5.  This module implements most of the new features, and can read and write 
netCDF files compatible with older versions of the library.  The API is 
modelled after Scientific.IO.NetCDF, and should be familiar to users of that 
module.\n\nThis project is hosted on a `GitHub repository 
<https://github.com/Unidata/netcdf4-python>`_ where you may access the most 
up-to-date source.",
       author="Jeff Whitaker",
       author_email="[email protected]",



View it on GitLab: 
https://salsa.debian.org/debian-gis-team/netcdf4-python/commit/7f55ea43b0602ac1f43c895b181355a8203adebb

-- 
View it on GitLab: 
https://salsa.debian.org/debian-gis-team/netcdf4-python/commit/7f55ea43b0602ac1f43c895b181355a8203adebb
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to