Merge pull request #1077 from Coolicedtea/ci/threadsafe_hdf5

Use threadsafe hdf5 for python wheel
PyTables · Nov 8, 2023 · 565f9c4 · 565f9c4
2 parents 1d03f23 + 989827f
commit 565f9c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
@@ -14,6 +14,11 @@ Changes from 3.9.1 to 3.9.2
 XXX version-specific blurb XXX
 
 
+Improvements
+------------
+
+- PyTables wheels now use a threadsafe installation of the hdf5 library.
+
 Changes from 3.9.0 to 3.9.1
 ===========================
 

diff --git a/ci/github/get_hdf5.sh b/ci/github/get_hdf5.sh
@@ -5,8 +5,10 @@ set -e -x
 
 PROJECT_DIR="$(pwd)"
 EXTRA_MPI_FLAGS=''
+EXTRA_SERIAL_FLAGS=""
 if [ -z ${HDF5_MPI+x} ]; then
     echo "Building serial"
+    EXTRA_SERIAL_FLAGS="--enable-threadsafe --enable-unsupported"
 else
     echo "Building with MPI"
     EXTRA_MPI_FLAGS="--enable-parallel --enable-shared"
@@ -123,7 +125,7 @@ if [[ "$OSTYPE" == "darwin"* && "$CIBW_ARCHS" = "arm64"  ]]; then
     patch -p0 < "$PROJECT_DIR/ci/osx_cross_configure.patch"
     patch -p0 < "$PROJECT_DIR/ci/osx_cross_src_makefile.patch"
 
-    ./configure --prefix="$HDF5_DIR" --with-zlib="$HDF5_DIR" "$EXTRA_MPI_FLAGS" --enable-build-mode=production \
+    eval ./configure --prefix="$HDF5_DIR" --with-zlib="$HDF5_DIR" "$EXTRA_MPI_FLAGS" "$EXTRA_SERIAL_FLAGS" --enable-build-mode=production \
         --host=aarch64-apple-darwin --enable-tests=no
 
     mkdir -p native-build/bin
@@ -133,7 +135,7 @@ if [[ "$OSTYPE" == "darwin"* && "$CIBW_ARCHS" = "arm64"  ]]; then
     popd
     export PATH=$(pwd)/native-build/bin:$PATH
 else
-    ./configure --prefix="$HDF5_DIR" --with-zlib="$HDF5_DIR" "$EXTRA_MPI_FLAGS" --enable-build-mode=production
+    eval ./configure --prefix="$HDF5_DIR" --with-zlib="$HDF5_DIR" "$EXTRA_MPI_FLAGS" "$EXTRA_SERIAL_FLAGS" --enable-build-mode=production
 fi
 make -j "$NPROC"
 make install