From 38558bc703709f8f0ca9b284da3497d709228b7e Mon Sep 17 00:00:00 2001 From: Tom Vander Aa Date: Fri, 28 Jun 2024 16:12:11 +0200 Subject: [PATCH] HighFive: version 2.2.2 everywhere HDF5 1.10 in Homebrew --- .github/workflows/build_linux.yml | 2 +- ci/buildwheel/Dockerfile | 33 ------------------- ci/buildwheel/install_deps.sh | 2 +- .../Dockerfile.manylinux | 2 +- .../Dockerfile.musllinux | 4 +-- .../Dockerfile => docker/Dockerfile.ubuntu} | 2 +- ci/{ubuntu2204 => docker}/build_script.sh | 0 ci/highfive.rb | 6 ++-- 8 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 ci/buildwheel/Dockerfile rename ci/{buildwheel => docker}/Dockerfile.manylinux (93%) rename ci/{buildwheel => docker}/Dockerfile.musllinux (83%) rename ci/{ubuntu2204/Dockerfile => docker/Dockerfile.ubuntu} (98%) rename ci/{ubuntu2204 => docker}/build_script.sh (100%) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index a577278c1..2de353791 100644 --- 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 deleted file mode 100644 index 8b6e1c3be..000000000 --- a/ci/buildwheel/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM quay.io/pypa/manylinux2014_x86_64 - -RUN yum -y install wget eigen3-devel openblas-devel hdf5-devel && \ - yum clean all - -RUN wget https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.sh && \ - sh cmake-3.12.0-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir && \ - rm -f cmake-3.12.0-Linux-x86_64.sh - -#install HighFive -RUN wget -O HighFive.tar.gz https://github.com/BlueBrain/HighFive/archive/v2.2.tar.gz && \ - tar xzf HighFive.tar.gz && \ - rm HighFive.tar.gz && \ - cd HighFive* && \ - mkdir build && \ - cd build && \ - cmake .. -DHIGHFIVE_USE_BOOST=OFF && \ - make -j2 && \ - make install && \ - cd ../.. && \ - rm -r HighFive* - -#install pybind11 -RUN wget -O pybind11.tar.gz https://github.com/pybind/pybind11/archive/v2.5.0.tar.gz && \ - tar xzf pybind11.tar.gz && \ - rm pybind11.tar.gz && \ - cd pybind11* && \ - mkdir build && \ - cd build && \ - cmake .. -DPYBIND11_TEST=OFF && \ - make install && \ - cd ../.. && \ - rm -r pybind11* diff --git a/ci/buildwheel/install_deps.sh b/ci/buildwheel/install_deps.sh index 9f2386568..d0db0c7af 100755 --- 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 \ No newline at end of file diff --git a/ci/buildwheel/Dockerfile.manylinux b/ci/docker/Dockerfile.manylinux similarity index 93% rename from ci/buildwheel/Dockerfile.manylinux rename to ci/docker/Dockerfile.manylinux index 1d684956e..49bca2249 100644 --- a/ci/buildwheel/Dockerfile.manylinux +++ b/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 b/ci/docker/Dockerfile.musllinux similarity index 83% rename from ci/buildwheel/Dockerfile.musllinux rename to ci/docker/Dockerfile.musllinux index 23ce5a7b7..22ae4cd3c 100644 --- a/ci/buildwheel/Dockerfile.musllinux +++ b/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 b/ci/docker/Dockerfile.ubuntu similarity index 98% rename from ci/ubuntu2204/Dockerfile rename to ci/docker/Dockerfile.ubuntu index fe621f75e..c65762042 100644 --- a/ci/ubuntu2204/Dockerfile +++ b/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 b/ci/docker/build_script.sh similarity index 100% rename from ci/ubuntu2204/build_script.sh rename to ci/docker/build_script.sh diff --git a/ci/highfive.rb b/ci/highfive.rb index 96b5c0798..7e859f4ce 100644 --- 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