Wheels: 0.17.0 #1833
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,10 @@ BUILD_PREFIX="${BUILD_PREFIX:-/usr/local}" | |
| if [ "$(uname -s)" = "Darwin" ] | ||
| then | ||
| CPU_COUNT="${CPU_COUNT:-3}" | ||
| SUDO="sudo" | ||
| else | ||
| CPU_COUNT="${CPU_COUNT:-2}" | ||
| SUDO="" | ||
| fi | ||
|
|
||
| function install_buildessentials { | ||
|
|
@@ -75,11 +77,31 @@ function install_buildessentials { | |
| function build_adios2 { | ||
| if [ -e adios2-stamp ]; then return; fi | ||
|
|
||
| # curl -sLo adios2-2.11.0.tar.gz \ | ||
| # https://github.com/ornladios/ADIOS2/archive/v2.11.0.tar.gz | ||
| # file adios2*.tar.gz | ||
| # tar -xzf adios2*.tar.gz | ||
| # rm adios2*.tar.gz | ||
|
|
||
| # cd ADIOS2-* | ||
| # # Need this PR for static builds https://github.com/ornladios/ADIOS2/pull/4812 | ||
| # # Since the PR does not cleanly merge, this is a custom patch that checks out | ||
| # # the subdirectories of the atl, dill, EVPath and ffs thirdparty libraries | ||
| # patch -p1 ../0001-Pull-in-atl-dill-EVPath-ffs-after-merging-https-gith.patch | ||
| # cd .. | ||
|
|
||
| # temporary for macOS on ADIOS 2.11.0 | ||
| git clone https://github.com/ornladios/ADIOS2 ADIOS2-2.11.0 | ||
| cd ADIOS2-2.11.0 | ||
| git checkout 7a21e4ef2f5def6659e67084b5210a66582d4b1a | ||
|
Member
Author
There was a problem hiding this comment. @franzpoeschel do we need this commit for something specific or can we go back to vanilla 2.11.0 + the patch below for DILL? There was a problem hiding this comment. I've modified this patch to include only the ADIOS thirdparty/ffs change. I suspect that the EVPath change isn't necessary, and if it can be excluded then the other can go into ADIOS master and release_211.
Member
Author
There was a problem hiding this comment. Ok, let's see if the latest version of ornladios/ADIOS2#4820, modifying only if(TARGET dill::dill)
set(FFS_USE_DILL ON CACHE INTERNAL "")
else()
set(FFS_USE_DILL OFF CACHE INTERNAL "")
endif() works on 2.11.0 for macOS
Member
Author
There was a problem hiding this comment. Sadly, it looks like it needs the EVPath changes, too. |
||
| if [ "$(uname -s)" = "Darwin" ] | ||
| then | ||
| curl -sLo 4820.patch https://github.com/ornladios/ADIOS2/pull/4820.patch | ||
| GIT_COMMITTER_NAME="Greg Eisenhauer" GIT_COMMITTER_EMAIL="eisen@cc.gatech.edu" \ | ||
| git am 4820.patch | ||
| git diff | ||
| fi | ||
| cd .. | ||
|
|
||
| # build | ||
| mkdir build-adios2 | ||
|
|
@@ -94,7 +116,7 @@ function build_adios2 { | |
| -DADIOS2_Blosc2_PREFER_SHARED=OFF \ | ||
| -DADIOS2_USE_BZip2=OFF \ | ||
| -DADIOS2_USE_Blosc2=ON \ | ||
| -DADIOS2_USE_Campaign=ON \ | ||
| -DADIOS2_USE_Fortran=OFF \ | ||
| -DADIOS2_USE_HDF5=OFF \ | ||
| -DADIOS2_USE_MHS=OFF \ | ||
|
|
@@ -112,11 +134,11 @@ function build_adios2 { | |
| -DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} ../ADIOS2-* | ||
|
|
||
| make -j${CPU_COUNT} | ||
| ${SUDO} make install | ||
|
|
||
| # CMake Config package of C-Blosc 2.10.1+ only | ||
| # https://github.com/ornladios/ADIOS2/issues/3903 | ||
| ${SUDO} rm -rf ${BUILD_PREFIX}/lib*/cmake/adios2/FindBlosc2.cmake | ||
|
|
||
| cd - | ||
|
|
||
|
|
@@ -163,14 +185,40 @@ function build_blosc2 { | |
| "${architecture_specific_flags[@]}" \ | ||
| ../c-blosc2-* | ||
| make -j${CPU_COUNT} | ||
| ${SUDO} make install | ||
| cd - | ||
|
|
||
| rm -rf build-blosc2 | ||
|
|
||
| touch blosc-stamp2 | ||
| } | ||
|
|
||
| function build_sqlite { | ||
| if [ -e sqlite-stamp ]; then return; fi | ||
|
|
||
| SQLITE_VERSION="3510200" # "3.51.2" | ||
|
|
||
| curl -sLO https://www.sqlite.org/2026/sqlite-autoconf-${SQLITE_VERSION}.tar.gz | ||
| file sqlite-autoconf*.tar.gz | ||
| tar xzf sqlite-autoconf-${SQLITE_VERSION}.tar.gz | ||
| rm sqlite-autoconf*.tar.gz | ||
|
|
||
| cd sqlite-autoconf-${SQLITE_VERSION} | ||
|
|
||
| ./configure \ | ||
| --disable-shared \ | ||
| --prefix=${BUILD_PREFIX} \ | ||
| --all \ | ||
| --disable-readline | ||
| make | ||
| ${SUDO} make install | ||
|
|
||
| cd - | ||
| rm -rf sqlite-autoconf* | ||
|
|
||
| touch sqlite-stamp | ||
| } | ||
|
|
||
| function build_zfp { | ||
| if [ -e zfp-stamp ]; then return; fi | ||
|
|
||
|
|
@@ -192,7 +240,7 @@ function build_zfp { | |
| -DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} \ | ||
| ../zfp-* | ||
| make -j${CPU_COUNT} | ||
| ${SUDO} make install | ||
| cd - | ||
|
|
||
| rm -rf build-zfp | ||
|
|
@@ -220,8 +268,8 @@ function build_zlib { | |
| -DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX} | ||
|
|
||
| PATH=${CMAKE_BIN}:${PATH} cmake --build build-zlib --parallel ${CPU_COUNT} | ||
| PATH=${CMAKE_BIN}:${PATH} ${SUDO} cmake --build build-zlib --target install | ||
| ${SUDO} rm -rf ${BUILD_PREFIX}/lib/libz.*dylib ${BUILD_PREFIX}/lib/libz.*so | ||
|
|
||
| rm -rf build-zlib | ||
|
|
||
|
|
@@ -292,7 +340,7 @@ function build_hdf5 { | |
| fi | ||
|
|
||
| make -j${CPU_COUNT} | ||
| ${SUDO} make install | ||
| cd .. | ||
|
|
||
| touch hdf5-stamp | ||
|
|
@@ -314,6 +362,7 @@ fi | |
|
|
||
| install_buildessentials | ||
| build_zlib | ||
| build_sqlite | ||
| build_zfp | ||
| build_blosc2 | ||
| build_hdf5 | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.