Merge pull request #154 from ExaScience/highfive222

Fix HighFive and HDF5 version
ExaScience · Jul 2, 2024 · e396c70 · e396c70
2 parents edc7b90 + 38558bc
commit e396c70
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 42 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Install HighFive
       run: |
         cd /tmp
-        wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.9.0.tar.gz
+        wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz
         tar xzf HighFive.tar.gz
         rm HighFive.tar.gz
         cd HighFive*

diff --git a/ci/buildwheel/Dockerfile b/ci/buildwheel/Dockerfile
diff --git a/ci/buildwheel/install_deps.sh b/ci/buildwheel/install_deps.sh
@@ -9,6 +9,6 @@ echo "MACOSX_DEPLOYMENT_TARGET: [$MACOSX_DEPLOYMENT_TARGET]"
 echo "PWD: [$PWD]"
 
 brew install  --formulae eigen ../highfive.rb catch2
-brew uninstall --ignore-dependencies hdf5
+brew uninstall --ignore-dependencies hdf5@1.10
 
 ./install_hdf5.sh
diff --git a/ci/buildwheel/Dockerfile.manylinux → ci/docker/Dockerfile.manylinux b/ci/buildwheel/Dockerfile.manylinux → ci/docker/Dockerfile.manylinux
@@ -4,7 +4,7 @@ RUN yum -y install wget eigen3-devel openblas-devel hdf5-devel && \
    yum clean all
 
 #install HighFive
-RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.tar.gz && \
+RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz && \
     tar xzf HighFive.tar.gz && \
     rm HighFive.tar.gz && \
     cd HighFive* && \

diff --git a/ci/buildwheel/Dockerfile.musllinux → ci/docker/Dockerfile.musllinux b/ci/buildwheel/Dockerfile.musllinux → ci/docker/Dockerfile.musllinux
@@ -1,9 +1,9 @@
 FROM quay.io/pypa/musllinux_1_2_x86_64
 
-RUN apk add wget eigen openblas hdf5
+RUN apk add wget eigen openblas hdf5-dev
 
 #install HighFive
-RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.tar.gz && \
+RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz && \
     tar xzf HighFive.tar.gz && \
     rm HighFive.tar.gz && \
     cd HighFive* && \

diff --git a/ci/ubuntu2204/Dockerfile → ci/docker/Dockerfile.ubuntu b/ci/ubuntu2204/Dockerfile → ci/docker/Dockerfile.ubuntu
@@ -39,7 +39,7 @@ RUN cd /tmp && \
 
 #install HighFive
 RUN cd /tmp && \
-    wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.9.0.tar.gz && \
+    wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz && \
     tar xzf HighFive.tar.gz && \
     rm HighFive.tar.gz && \
     cd HighFive* && \

diff --git a/ci/ubuntu2204/build_script.sh → ci/docker/build_script.sh b/ci/ubuntu2204/build_script.sh → ci/docker/build_script.sh
diff --git a/ci/highfive.rb b/ci/highfive.rb
@@ -4,12 +4,12 @@
 class Highfive < Formula
   desc "HighFive - Header-only C++ HDF5 interface"
   homepage "https://bluebrain.github.io/HighFive/"
-  url "https://github.com/BlueBrain/HighFive/archive/v2.9.0.tar.gz"
-  sha256 "6301def8ceb9f4d7a595988612db288b448a3c0546f6c83417dab38c64994d7e"
+  url "https://github.com/BlueBrain/HighFive/archive/v2.2.2.tar.gz"
+  sha256 "5bfb356705c6feb9d46a0507573028b289083ec4b4607a6f36187cb916f085a7"
 
   depends_on "cmake" => :build
   depends_on "boost" => [ :build, :test ]
-  depends_on "hdf5"
+  depends_on "hdf5@1.10"
 
   def install
     system "cmake", ".", *std_cmake_args