Merge pull request #1318 from pgf/pgf-patch-set_collective

Fix bug in set_collective added in #1277
Unidata · Apr 17, 2024 · d6f5740 · d6f5740
2 parents 533118f + 9199c86
commit d6f5740
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/miniconda.yml b/.github/workflows/miniconda.yml
@@ -83,8 +83,8 @@ jobs:
         export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH" 
         which mpirun
         mpirun --version
-        #mpirun -np 4 --oversubscribe python mpi_example.py # for openmpi
-        mpirun -np 4 python mpi_example.py
+        mpirun -np 4 --oversubscribe python mpi_example.py # for openmpi
+        #mpirun -np 4 python mpi_example.py
         if [ $? -ne 0 ] ; then
           echo "hdf5 mpi test failed!"
           exit 1

diff --git a/Changelog b/Changelog
@@ -7,6 +7,8 @@
  * add support for MS-MPI `MPI_Message` detection (PR #1305)
  * fix for issue #1306 - surprising result when indexing vlen str with non-contiguous
    indices.
+ * Fix bug in set_collective introduced in PR #1277 (collective mode was
+   always set).
 
 
 

diff --git a/src/netCDF4/_netCDF4.pyx b/src/netCDF4/_netCDF4.pyx
@@ -6060,7 +6060,7 @@ NC_CHAR).
         mode = NC_COLLECTIVE if value else NC_INDEPENDENT
         with nogil:
             ierr = nc_var_par_access(self._grpid, self._varid,
-                   NC_COLLECTIVE)
+                   mode)
         _ensure_nc_success(ierr)