From 5f772d8f11d04404ed046e10d7020ac3bf1cdcd6 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Fri, 12 May 2023 09:13:28 +0200 Subject: [PATCH 1/8] Try last version 1.14.1 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ae0a0b4b..cc7dda483 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - hdf5_version : [ hdf5-1_8_23, hdf5-1_10_9, hdf5-1_12_2, hdf5-1_14_0 ] + hdf5_version : [ hdf5-1_8_23, hdf5-1_10_9, hdf5-1_12_2, hdf5-1_14_1 ] steps: - uses: actions/checkout@v3 From 1fdb1da18656db1ce5d477bc5e9d5b15af0aa8a7 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Fri, 12 May 2023 09:33:54 +0200 Subject: [PATCH 2/8] 1_10_10 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc7dda483..43e2466b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,7 +86,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - hdf5_version : [ hdf5-1_8_23, hdf5-1_10_9, hdf5-1_12_2, hdf5-1_14_1 ] + hdf5_version : [ hdf5-1_8_23, hdf5-1_10_10, hdf5-1_12_2, hdf5-1_14_1 ] steps: - uses: actions/checkout@v3 From e717d10e07d061f72e4625fbd4e8d86a55fe6c88 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Tue, 23 May 2023 14:35:00 +0200 Subject: [PATCH 3/8] Lower values --- tests/unit/tests_high_five_base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/tests_high_five_base.cpp b/tests/unit/tests_high_five_base.cpp index b07e53b3c..b60536e5c 100644 --- a/tests/unit/tests_high_five_base.cpp +++ b/tests/unit/tests_high_five_base.cpp @@ -291,7 +291,7 @@ TEST_CASE("Test group properties") { File file(file_name, File::Truncate, fapl); GroupCreateProps props; - props.add(EstimatedLinkInfo(1000, 500)); + props.add(EstimatedLinkInfo(10, 60)); auto group = file.createGroup("g", props); auto sizes = group.getEstimatedLinkInfo(); From e786bcb9d609aec20efaa3d7ec2dcfc96a5ac652 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Thu, 25 May 2023 10:16:45 +0200 Subject: [PATCH 4/8] Split test and build --- .github/workflows/coverage.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 6c648029a..7dd69db0b 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -41,7 +41,7 @@ jobs: fetch-depth: 2 submodules: true - - name: Build and test for code coverage + - name: Build for code coverage run: | CMAKE_OPTIONS=( -GNinja @@ -54,11 +54,12 @@ jobs: -DCMAKE_CXX_FLAGS="-coverage -O0" ) source $GITHUB_WORKSPACE/.github/build.sh - cd $HIGHFIVE_BUILD - (cd $GITHUB_WORKSPACE; lcov --capture --initial --directory . --no-external --output-file build/coverage-base.info) - cmake --build $HIGHFIVE_BUILD --target test - (cd $GITHUB_WORKSPACE; lcov --capture --directory . --no-external --output-file build/coverage-run.info) - lcov --add-tracefile coverage-base.info --add-tracefile coverage-run.info --output-file coverage-combined.info + - name: Test for code coverage + run: | + lcov --capture --initial --directory . --no-external --output-file build/coverage-base.info + (cd build; cmake --build $HIGHFIVE_BUILD --target test) + lcov --capture --directory . --no-external --output-file build/coverage-run.info + (cd build; lcov --add-tracefile coverage-base.info --add-tracefile coverage-run.info --output-file coverage-combined.info) - uses: codecov/codecov-action@v3 with: files: ./build/coverage-combined.info From f166661c550436ba67af83326afbc404ad6bc92b Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Thu, 25 May 2023 14:26:11 +0200 Subject: [PATCH 5/8] Fix tests --- tests/unit/tests_high_five_base.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/tests_high_five_base.cpp b/tests/unit/tests_high_five_base.cpp index b60536e5c..ca6665180 100644 --- a/tests/unit/tests_high_five_base.cpp +++ b/tests/unit/tests_high_five_base.cpp @@ -295,8 +295,8 @@ TEST_CASE("Test group properties") { auto group = file.createGroup("g", props); auto sizes = group.getEstimatedLinkInfo(); - CHECK(sizes.first == 1000); - CHECK(sizes.second == 500); + CHECK(sizes.first == 10); + CHECK(sizes.second == 60); } TEST_CASE("Test allocation time") { From 29402bfbd987d54c72cbcef91a5c97da5eb1048d Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Thu, 25 May 2023 14:54:03 +0200 Subject: [PATCH 6/8] Fix coverage --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 7dd69db0b..61c9e6c7e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -57,7 +57,7 @@ jobs: - name: Test for code coverage run: | lcov --capture --initial --directory . --no-external --output-file build/coverage-base.info - (cd build; cmake --build $HIGHFIVE_BUILD --target test) + (cd build; cmake --build build --target test) lcov --capture --directory . --no-external --output-file build/coverage-run.info (cd build; lcov --add-tracefile coverage-base.info --add-tracefile coverage-run.info --output-file coverage-combined.info) - uses: codecov/codecov-action@v3 From 05163d5dc3652323bf41f209e7ef5922f510e420 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Thu, 25 May 2023 15:07:51 +0200 Subject: [PATCH 7/8] Fix coverage --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 61c9e6c7e..b3f4a212b 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -57,7 +57,7 @@ jobs: - name: Test for code coverage run: | lcov --capture --initial --directory . --no-external --output-file build/coverage-base.info - (cd build; cmake --build build --target test) + (cd build; cmake --build . --target test) lcov --capture --directory . --no-external --output-file build/coverage-run.info (cd build; lcov --add-tracefile coverage-base.info --add-tracefile coverage-run.info --output-file coverage-combined.info) - uses: codecov/codecov-action@v3 From 3b0dba895339bf0802c8f0da6b7ea53f8d83d70f Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Thu, 25 May 2023 20:06:00 +0200 Subject: [PATCH 8/8] Build HDF5 without asserts. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43e2466b4..b7cee8175 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,7 +102,7 @@ jobs: wget https://github.com/HDFGroup/hdf5/archive/refs/tags/${{ matrix.hdf5_version }}.tar.gz --output-document hdf5.tar.gz tar xf hdf5.tar.gz mkdir -p hdf5-${{ matrix.hdf5_version }}/BUILD && cd hdf5-${{ matrix.hdf5_version }}/BUILD - cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.hdf5_version }} -DHDF5_ENABLE_Z_LIB_SUPPORT=ON -DUSE_LIBAEC=ON + cmake .. -DCMAKE_BUILD_TYPE=Release -GNinja -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.hdf5_version }} -DHDF5_ENABLE_Z_LIB_SUPPORT=ON -DUSE_LIBAEC=ON ninja && ninja install - name: Build