From e459ffe195dda7d3a14981b0b28f68bac5b5e23e Mon Sep 17 00:00:00 2001
From: Pier Giuseppe Fogli <pgf@users.noreply.github.com>
Date: Tue, 16 Apr 2024 18:05:48 +0200
Subject: [PATCH 1/3] Fix bug in set_collective added in #1277

Fix bug in set_collective added in commit f64ee26773502c7568b1ceefe5967f83230f207c that cause access always be in collective mode.
Independent access mode is not tested so it passed unnoticed.
---
 src/netCDF4/_netCDF4.pyx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
 
 

From 98fa36240d125d22fdaffb37a2826c0414ec6e7a Mon Sep 17 00:00:00 2001
From: Jeff Whitaker <jswhit@fastmail.fm>
Date: Tue, 16 Apr 2024 18:45:32 -0600
Subject: [PATCH 2/3] enable over-subscription

---
 .github/workflows/miniconda.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 9199c8688a3d859b3d19fe8bd21341dcd00b0ea0 Mon Sep 17 00:00:00 2001
From: Jeff Whitaker <jswhit@fastmail.fm>
Date: Tue, 16 Apr 2024 18:51:35 -0600
Subject: [PATCH 3/3] update

---
 Changelog | 2 ++
 1 file changed, 2 insertions(+)

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).