diff --git a/.github/workflows/miniconda.yml b/.github/workflows/miniconda.yml index 33f079898..df053bcad 100644 --- 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 index 9593159a5..6211e5e5c 100644 --- 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 index 271a9e4a9..45bb30e56 100644 --- 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)