From 4cc27bef98edf0f3386c71e27cc20fc139133f26 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 6 Nov 2023 16:51:03 -0800 Subject: [PATCH] Wheels: ADIOS2 v2.9.2 Build wheels with ADIOS2 v2.9.2, which fixes c-blosc2 issues with null-blocks. --- library_builders.bat | 10 ++++------ library_builders.sh | 7 +++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/library_builders.bat b/library_builders.bat index 6becb312ea..df7d217a69 100644 --- a/library_builders.bat +++ b/library_builders.bat @@ -17,13 +17,11 @@ exit /b 0 :build_adios2 if exist adios2-stamp exit /b 0 - ::curl -sLo adios2-2.9.1.zip ^ - :: https://github.com/ornladios/ADIOS2/archive/v2.9.1.zip - curl -sLo adios2-2.9.1.zip ^ - https://github.com/ax3l/ADIOS2/archive/refs/heads/release-2.9.1-bp-wheels.zip - powershell Expand-Archive adios2-2.9.1.zip -DestinationPath dep-adios2 + curl -sLo adios2-2.9.2.zip ^ + https://github.com/ornladios/ADIOS2/archive/v2.9.2.zip + powershell Expand-Archive adios2-2.9.2.zip -DestinationPath dep-adios2 - cmake -S dep-adios2/ADIOS2-release-2.9.1-bp-wheels -B build-adios2 ^ + cmake -S dep-adios2/ADIOS2-release-2.9.2 -B build-adios2 ^ -DCMAKE_BUILD_TYPE=Release ^ -DBUILD_SHARED_LIBS=OFF ^ -DBUILD_TESTING=OFF ^ diff --git a/library_builders.sh b/library_builders.sh index 1326c4e989..1e7ac882cb 100644 --- a/library_builders.sh +++ b/library_builders.sh @@ -103,10 +103,8 @@ function build_adios1 { function build_adios2 { if [ -e adios2-stamp ]; then return; fi - #curl -sLo adios2-2.9.1.tar.gz \ - # https://github.com/ornladios/ADIOS2/archive/v2.9.1.tar.gz - curl -sLo adios2-2.9.1.tar.gz \ - https://github.com/ax3l/ADIOS2/archive/refs/heads/release-2.9.1-bp-wheels.tar.gz + curl -sLo adios2-2.9.2.tar.gz \ + https://github.com/ornladios/ADIOS2/archive/v2.9.2.tar.gz file adios2*.tar.gz tar -xzf adios2*.tar.gz rm adios2*.tar.gz @@ -129,6 +127,7 @@ function build_adios2 { -DADIOS2_USE_MHS=OFF \ -DADIOS2_USE_MPI=OFF \ -DADIOS2_USE_PNG=OFF \ + -DADIOS2_USE_Sodium=OFF \ -DADIOS2_USE_SST=ON \ -DADIOS2_USE_ZFP=ON \ -DADIOS2_RUN_INSTALL_TEST=OFF \