Skip to content

Commit 528bb71

Browse files
authored
Wheels: 0.15.2 (#1515)
* Version: 0.15.2 * C-Blosc2: v2.10.2 * [Patch] ADIOS2: Fix ChunkV Issue & Static Builds * Cleaning: Win w/o Blosc Block * Windows: Upgrade CMake Only CMake 3.24+ supports static zlib. https://cmake.org/cmake/help/latest/module/FindZLIB.html#hints * C-Blosc2: Keep Internal Zlib on Windows Downstream issues in openPMD-api: ``` -- Configuring done (10.0s) CMake Error at C:/Program Files (x86)/ADIOS2/lib/cmake/adios2/adios2-targets.cmake:86 (set_target_properties): The link interface of target "adios2::adios2_blosc2" contains: Blosc2::blosc2_static but the target was not found. Possible reasons include: * There is a typo in the target name. * A find_package call is missing for an IMPORTED target. * An ALIAS target is missing. Call Stack (most recent call first): C:/Program Files (x86)/ADIOS2/lib/cmake/adios2/adios2-config-common.cmake:192 (include) C:/Program Files (x86)/ADIOS2/lib/cmake/adios2/adios2-config.cmake:29 (include) CMakeLists.txt:443 (find_package) ``` * C-Blosc2: No Zlib internal tests * [Patch] Fix Threads search in Blosc2Config.cmake See: Blosc/c-blosc2#549
1 parent 9d46036 commit 528bb71

4 files changed

Lines changed: 29 additions & 46 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- uses: actions/checkout@v2
7171
with:
7272
path: 'src'
73-
ref: '0.15.1'
73+
ref: '0.15.2'
7474

7575
- uses: actions/checkout@v2
7676
with:

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ branches:
88

99
env:
1010
global:
11-
- OPENPMD_GIT_REF="0.15.1"
11+
- OPENPMD_GIT_REF="0.15.2"
1212

1313
- CIBW_PROJECT_REQUIRES_PYTHON=">=3.8"
1414
# Install dependencies on Linux and OSX

library_builders.bat

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,19 @@ goto:main
1111

1212
:install_buildessentials
1313
python -m pip install --upgrade pip setuptools wheel
14+
python -m pip install --upgrade cmake
1415
python -m pip install --upgrade "patch==1.*"
1516
exit /b 0
1617

1718
:build_adios2
1819
if exist adios2-stamp exit /b 0
20+
::curl -sLo adios2-2.9.1.zip ^
21+
:: https://github.com/ornladios/ADIOS2/archive/v2.9.1.zip
1922
curl -sLo adios2-2.9.1.zip ^
20-
https://github.com/ornladios/ADIOS2/archive/v2.9.1.zip
23+
https://github.com/ax3l/ADIOS2/archive/refs/heads/release-2.9.1-bp-wheels.zip
2124
powershell Expand-Archive adios2-2.9.1.zip -DestinationPath dep-adios2
2225

23-
cmake -S dep-adios2/ADIOS2-2.9.1 -B build-adios2 ^
26+
cmake -S dep-adios2/ADIOS2-release-2.9.1-bp-wheels -B build-adios2 ^
2427
-DCMAKE_BUILD_TYPE=Release ^
2528
-DBUILD_SHARED_LIBS=OFF ^
2629
-DBUILD_TESTING=OFF ^
@@ -55,53 +58,33 @@ exit /b 0
5558
if errorlevel 1 exit 1
5659
exit /b 0
5760

58-
:build_blosc
59-
if exist blosc-stamp exit /b 0
60-
61-
curl -sLo blosc-1.21.0.zip ^
62-
https://github.com/Blosc/c-blosc/archive/v1.21.0.zip
63-
powershell Expand-Archive blosc-1.21.0.zip -DestinationPath dep-blosc
64-
65-
cmake -S dep-blosc/c-blosc-1.21.0 -B build-blosc ^
66-
-DCMAKE_BUILD_TYPE=Release ^
67-
-DBUILD_BENCHMARKS=OFF ^
68-
-DBUILD_SHARED=OFF ^
69-
-DBUILD_STATIC=ON ^
70-
-DBUILD_TESTS=OFF ^
71-
-DZLIB_USE_STATIC_LIBS=ON ^
72-
-DDEACTIVATE_SNAPPY=ON
73-
if errorlevel 1 exit 1
74-
75-
cmake --build build-blosc --parallel %CPU_COUNT%
76-
if errorlevel 1 exit 1
77-
78-
cmake --build build-blosc --target install --config Release
79-
if errorlevel 1 exit 1
80-
81-
rmdir /s /q build-blosc
82-
if errorlevel 1 exit 1
83-
84-
break > blosc-stamp
85-
if errorlevel 1 exit 1
86-
exit /b 0
87-
8861
:build_blosc2
8962
if exist blosc2-stamp exit /b 0
9063

91-
curl -sLo blosc2-2.10.1.zip ^
92-
https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.10.1.zip
93-
powershell Expand-Archive blosc2-2.10.1.zip -DestinationPath dep-blosc2
64+
curl -sLo blosc2-2.10.2.zip ^
65+
https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.10.2.zip
66+
powershell Expand-Archive blosc2-2.10.2.zip -DestinationPath dep-blosc2
9467

95-
cmake -S dep-blosc2/c-blosc2-2.10.1 -B build-blosc2 ^
68+
:: Fix Threads search in Blosc2Config.cmake
69+
:: https://github.com/Blosc/c-blosc2/pull/549
70+
curl -sLo blosc2-threads.patch ^
71+
https://github.com/Blosc/c-blosc2/pull/549.patch
72+
python -m patch -p 1 -d dep-blosc2/c-blosc2-2.10.2 blosc2-threads.patch
73+
if errorlevel 1 exit 1
74+
75+
cmake -S dep-blosc2/c-blosc2-2.10.2 -B build-blosc2 ^
9676
-DCMAKE_BUILD_TYPE=Release ^
9777
-DBUILD_SHARED=OFF ^
9878
-DBUILD_STATIC=ON ^
9979
-DBUILD_BENCHMARKS=OFF ^
10080
-DBUILD_EXAMPLES=OFF ^
10181
-DBUILD_FUZZERS=OFF ^
10282
-DBUILD_PLUGINS=OFF ^
103-
-DBUILD_TESTS=OFF
104-
:: -DPREFER_EXTERNAL_ZLIB=ON
83+
-DBUILD_TESTS=OFF ^
84+
-DPIGZ_ENABLE_TESTS=OFF ^
85+
-DZLIB_ENABLE_TESTS=OFF ^
86+
-DZLIBNG_ENABLE_TESTS=OFF
87+
:: -DPREFER_EXTERNAL_ZLIB=ON ^
10588
:: -DZLIB_USE_STATIC_LIBS=ON
10689
if errorlevel 1 exit 1
10790

library_builders.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ function build_adios1 {
103103
function build_adios2 {
104104
if [ -e adios2-stamp ]; then return; fi
105105

106-
#curl -sLo adios2-2.9.0.tar.gz \
107-
# https://github.com/ornladios/ADIOS2/archive/v2.9.0.tar.gz
108-
curl -sLo adios2-fix-blosc2-findpackage.tar.gz \
109-
https://github.com/ax3l/ADIOS2/archive/refs/heads/fix-blosc2-findpackage.tar.gz
106+
#curl -sLo adios2-2.9.1.tar.gz \
107+
# https://github.com/ornladios/ADIOS2/archive/v2.9.1.tar.gz
108+
curl -sLo adios2-2.9.1.tar.gz \
109+
https://github.com/ax3l/ADIOS2/archive/refs/heads/release-2.9.1-bp-wheels.tar.gz
110110
file adios2*.tar.gz
111111
tar -xzf adios2*.tar.gz
112112
rm adios2*.tar.gz
@@ -200,8 +200,8 @@ function build_blosc {
200200
function build_blosc2 {
201201
if [ -e blosc-stamp2 ]; then return; fi
202202

203-
curl -sLo blosc2-v2.10.1.tar.gz \
204-
https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.10.1.tar.gz
203+
curl -sLo blosc2-v2.10.2.tar.gz \
204+
https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.10.2.tar.gz
205205
file blosc2*.tar.gz
206206
tar -xzf blosc2*.tar.gz
207207
rm blosc2*.tar.gz

0 commit comments

Comments
 (0)