Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wheels: ADIOS2 v2.10.1 #1554

Open
wants to merge 13 commits into
base: wheels
Choose a base branch
from
Open

Wheels: ADIOS2 v2.10.1 #1554

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1987bc5
Wheels: ADIOS2 v2.9.2
ax3l Nov 7, 2023
b0c6944
C-Blosc2 v2.11.1
ax3l Nov 7, 2023
a9aaad9
ADIOS2: Remove installed FindBlosc2.cmake Again
ax3l Nov 8, 2023
fe01198
[Patch] C-Blosc2 Static
ax3l Nov 10, 2023
4d4c455
No Patch: Static C-Blosc2
ax3l Nov 28, 2023
3fb361f
Windows: More Blosc2 Updates
ax3l Dec 1, 2023
245bcf0
Windows: keep FindBlosc2.cmake
ax3l Dec 22, 2023
56a8490
Win: Try ADIOS2 v2.10.0-rc1
ax3l Jan 30, 2024
8d66b7a
ADIOS2 Windows: Disable libFFI
ax3l Jan 30, 2024
3c556b9
Print CMake Version
ax3l Feb 27, 2024
618ef2c
ADIOS2: `release_210` Branch
ax3l Mar 12, 2024
cbfc753
Use Vincente's patch
ax3l Mar 25, 2024
8d27347
ADIOS2: v2.10.1
ax3l May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
# for the openPMD-api build, CMake shall search for
# static dependencies of HDF5 and ADIOS1 (see setup.py)
CIBW_ENVIRONMENT: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' ADIOS_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON'
CIBW_ENVIRONMENT_WINDOWS: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON' CMAKE_PREFIX_PATH='C:/Program Files (x86)/ADIOS2;C:/Program Files (x86)/blosc;C:/Program Files (x86)/blosc2;C:/Program Files (x86)/HDF5;C:/Program Files (x86)/ZFP;C:/Program Files (x86)/zlib'
CIBW_ENVIRONMENT_WINDOWS: HDF5_USE_STATIC_LIBRARIES='ON' ZLIB_USE_STATIC_LIBS='ON' openPMD_CMAKE_openPMD_USE_HDF5='ON' openPMD_CMAKE_openPMD_USE_ADIOS2='ON' CMAKE_PREFIX_PATH='C:/Program Files (x86)/ADIOS2;C:/Program Files (x86)/blosc2;C:/Program Files (x86)/HDF5;C:/Program Files (x86)/ZFP;C:/Program Files (x86)/zlib'
# C++17 support in macOS 10.13+ (partial) and 10.14+ (std::visit) and 10.15+ (std::filesystem::path)
# https://cibuildwheel.readthedocs.io/en/stable/cpp_standards/#macos-and-deployment-target-versions
# arm64/aarch64 (M1/M2) requires 11.0+
Expand Down
32 changes: 15 additions & 17 deletions library_builders.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-2.9.2 -B build-adios2 ^
-DCMAKE_BUILD_TYPE=Release ^
-DBUILD_SHARED_LIBS=OFF ^
-DBUILD_TESTING=OFF ^
Expand Down Expand Up @@ -51,6 +49,11 @@ exit /b 0
cmake --build build-adios2 --target install --config Release
if errorlevel 1 exit 1

:: CMake Config package of C-Blosc 2.10.1+ only
:: https://github.com/ornladios/ADIOS2/issues/3903
rmdir /s /q "%BUILD_PREFIX%/ADIOS2/lib/cmake/adios2/FindBlosc2.cmake"
if errorlevel 1 exit 1
ax3l marked this conversation as resolved.
Show resolved Hide resolved

rmdir /s /q build-adios2
if errorlevel 1 exit 1

Expand All @@ -61,19 +64,14 @@ exit /b 0
:build_blosc2
if exist blosc2-stamp exit /b 0

curl -sLo blosc2-2.10.2.zip ^
https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.10.2.zip
powershell Expand-Archive blosc2-2.10.2.zip -DestinationPath dep-blosc2

:: Fix Threads search in Blosc2Config.cmake
:: https://github.com/Blosc/c-blosc2/pull/549
curl -sLo blosc2-threads.patch ^
https://github.com/Blosc/c-blosc2/pull/549.patch
python -m patch -p 1 -d dep-blosc2/c-blosc2-2.10.2 blosc2-threads.patch
if errorlevel 1 exit 1
curl -sLo blosc2-2.11.1.zip ^
https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.11.1.zip
powershell Expand-Archive blosc2-2.11.1.zip -DestinationPath dep-blosc2

cmake -S dep-blosc2/c-blosc2-2.10.2 -B build-blosc2 ^
cmake -S dep-blosc2/c-blosc2-2.11.1 -B build-blosc2 ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%BUILD_PREFIX%/blosc2 ^
-DCMAKE_POSITION_INDEPENDENT_CODE=ON ^
-DBUILD_SHARED=OFF ^
-DBUILD_STATIC=ON ^
-DBUILD_BENCHMARKS=OFF ^
Expand Down
12 changes: 6 additions & 6 deletions library_builders.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
ax3l marked this conversation as resolved.
Show resolved Hide resolved
file adios2*.tar.gz
tar -xzf adios2*.tar.gz
rm adios2*.tar.gz
Expand All @@ -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 \
Expand All @@ -143,6 +142,7 @@ function build_adios2 {
make install

# CMake Config package of C-Blosc 2.10.1+ only
# https://github.com/ornladios/ADIOS2/issues/3903
rm -rf ${BUILD_PREFIX}/lib*/cmake/adios2/FindBlosc2.cmake

cd -
Expand Down Expand Up @@ -200,8 +200,8 @@ function build_blosc {
function build_blosc2 {
if [ -e blosc-stamp2 ]; then return; fi

curl -sLo blosc2-v2.10.2.tar.gz \
https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.10.2.tar.gz
curl -sLo blosc2-v2.11.1.tar.gz \
https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.11.1.tar.gz
file blosc2*.tar.gz
tar -xzf blosc2*.tar.gz
rm blosc2*.tar.gz
Expand Down
Loading