-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #339 from LLNL/release/v0.29
Release/v0.29
- Loading branch information
Showing
30 changed files
with
506 additions
and
448 deletions.
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -3,29 +3,29 @@ | |
| # Spack must be available | ||
| # It would be better to install all Boost versions manually, | ||
| # as it causes errors often and could exceed the timelimit of the system. | ||
| # | ||
| # One might want to change the location of builds directory on LC clusters to avoid consuming the home directory space. | ||
| # Type the following command on an LC cluster: | ||
| # $ ln -s /usr/workspace/lc-username ~/.gitlab-runner | ||
|
|
||
| include: [component: $CI_SERVER_FQDN/lc-components/id_tokens/id_tokens-component@main] | ||
|
|
||
| stages: | ||
| - install | ||
| - build | ||
|
|
||
|
|
||
| variables: | ||
| CUSTOM_CI_BUILDS_DIR: "/usr/workspace/$$USER/metall-ci-runner-builds-dir" | ||
| GTEST_COLOR: "1" | ||
| GIT_DEPTH: 0 | ||
| # CI_DEBUG_TRACE: "true" # Enable this when debugging this CI | ||
|
|
||
|
|
||
| install_boost: | ||
| stage: install | ||
| tags: | ||
| - quartz | ||
| - ruby | ||
| - shell | ||
| script: | ||
| - hostname | ||
| - srun -N1 -ppdebug spack install boost@1.82.0 boost@1.81.0 boost@1.80.0 boost@1.79.0 boost@1.78.0 boost@1.77.0 boost@1.76.0 [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected].0 | ||
| - srun -N1 -ppci spack install boost@1.86.0 boost@1.85.0 boost@1.84.0 boost@1.83.0 boost@1.82.0 boost@1.81.0 boost@1.80.0 | ||
| - spack clean | ||
|
|
||
|
|
||
|
|
@@ -39,124 +39,46 @@ install_boost: | |
| - module load gcc/${GCC_VERSION} | ||
| - spack load --first boost@${BOOST_VERSION} arch=$(spack arch) | ||
| - export METALL_TEST_DIR="/dev/shm/metall_test-${CI_CONCURRENT_ID}-${CI_PIPELINE_IID}" | ||
| - srun -N1 -ppdebug bash ./scripts/CI/build_and_test.sh | ||
|
|
||
| build_gcc12.1.1_bst1.82.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.82.0" | ||
|
|
||
| build_gcc12.1.1_bst1.81.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.81.0" | ||
|
|
||
| build_gcc12.1.1_bst1.80.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.80.0" | ||
| - srun -N1 -ppci bash ./scripts/CI/build_and_test.sh | ||
|
|
||
| build_gcc12.1.1_bst1.79.0: | ||
| build_gcc12.1.1_bst1.86.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.79.0" | ||
| BOOST_VERSION: "1.86.0" | ||
|
|
||
| build_gcc12.1.1_bst1.78.0: | ||
| build_gcc12.1.1_bst1.85.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.78.0" | ||
| BOOST_VERSION: "1.85.0" | ||
|
|
||
| build_gcc12.1.1_bst1.77.0: | ||
| build_gcc12.1.1_bst1.84.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.77.0" | ||
| BOOST_VERSION: "1.84.0" | ||
|
|
||
| build_gcc12.1.1_bst1.76.0: | ||
| build_gcc12.1.1_bst1.83.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.76.0" | ||
| BOOST_VERSION: "1.83.0" | ||
|
|
||
| build_gcc12.1.1_bst1.75.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.75.0" | ||
|
|
||
| build_gcc12.1.1_bst1.74.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.74.0" | ||
|
|
||
| build_gcc12.1.1_bst1.73.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.73.0" | ||
|
|
||
| build_gcc12.1.1_bst1.72.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.72.0" | ||
|
|
||
| build_gcc12.1.1_bst1.71.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.71.0" | ||
|
|
||
| build_gcc12.1.1_bst1.70.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.70.0" | ||
|
|
||
| build_gcc12.1.1_bst1.69.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.69.0" | ||
|
|
||
| build_gcc12.1.1_bst1.68.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.68.0" | ||
|
|
||
| build_gcc12.1.1_bst1.67.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.67.0" | ||
|
|
||
| build_gcc12.1.1_bst1.66.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.66.0" | ||
|
|
||
| build_gcc12.1.1_bst1.65.1: | ||
| build_gcc12.1.1_bst1.82.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.65.1" | ||
| BOOST_VERSION: "1.82.0" | ||
|
|
||
| build_gcc12.1.1_bst1.65.0: | ||
| build_gcc12.1.1_bst1.81.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.65.0" | ||
| BOOST_VERSION: "1.81.0" | ||
|
|
||
| build_gcc12.1.1_bst1.64.0: | ||
| build_gcc12.1.1_bst1.80.0: | ||
| extends: .build | ||
| variables: | ||
| GCC_VERSION: "12.1.1" | ||
| BOOST_VERSION: "1.64.0" | ||
| BOOST_VERSION: "1.80.0" | ||
This file contains 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 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 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 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 |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # Find Boost header files | ||
| # Input: | ||
| # min_version - minimum required Boost version | ||
| # required - if TRUE, the function will stop the build if Boost headers are not found | ||
| # | ||
| # This function first tries to find Boost headers using the find_package() command. | ||
| # If Boost headers are not found, the function tries to find Boost headers manually. | ||
| # In the case, the following variables as hints to find Boost headers, in the following order: | ||
| # BOOST_ROOT CMake variable, Boost_ROOT CMake variable, BOOST_ROOT environment variable, Boost_ROOT environment variable | ||
| # | ||
| # Output: | ||
| # Boost_FOUND - TRUE if Boost headers are found | ||
| # Boost_INCLUDE_DIRS - Boost header files directory | ||
| # Boost_VERSION - Boost version | ||
| function(find_boost_headers min_version required) | ||
| find_package(Boost ${min_version}) | ||
| if (Boost_FOUND) | ||
| set(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} PARENT_SCOPE) | ||
| set(Boost_FOUND ${Boost_FOUND} PARENT_SCOPE) | ||
| return() | ||
| endif () | ||
|
|
||
| message(STATUS "Could not find Boost headers using the find_package() command. Trying to find Boost headers manually.") | ||
|
|
||
| # Try to find Boost headers manually using the BOOST_ROOT as a hint | ||
| find_path(Boost_INCLUDE_DIRS boost/version.hpp PATHS ${BOOST_ROOT} ${Boost_ROOT} $ENV{BOOST_ROOT} $ENV{Boost_ROOT} NO_DEFAULT_PATH) | ||
| if (Boost_INCLUDE_DIRS) | ||
|
|
||
| # Extract Boost version value from the boost/version.hpp file | ||
| file(STRINGS ${Boost_INCLUDE_DIRS}/boost/version.hpp _boost_version REGEX "#define BOOST_VERSION[ \t]+[0-9]+") | ||
| string(REGEX REPLACE "#define BOOST_VERSION[ \t]+([0-9]+)" "\\1" Boost_VERSION ${_boost_version}) | ||
|
|
||
| # Convert Boost version to the format 'MAJOR.MINOR.PATCH' | ||
| # Major version | ||
| math(EXPR Boost_VERSION_MAJOR "${Boost_VERSION} / 100000") | ||
| # Minor version | ||
| math(EXPR Boost_VERSION_MINOR "(${Boost_VERSION} / 100) % 1000") | ||
| # Patch version | ||
| math(EXPR Boost_VERSION_PATCH "${Boost_VERSION} % 100") | ||
| set(Boost_VERSION "${Boost_VERSION_MAJOR}.${Boost_VERSION_MINOR}.${Boost_VERSION_PATCH}") | ||
|
|
||
| if (${Boost_VERSION} VERSION_GREATER_EQUAL ${min_version}) | ||
| message(STATUS "Found Boost headers at ${Boost_INCLUDE_DIRS}") | ||
| message(STATUS "Boost version: ${Boost_VERSION}") | ||
| set(Boost_FOUND TRUE PARENT_SCOPE) | ||
| set(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} PARENT_SCOPE) | ||
| set(Boost_VERSION ${Boost_VERSION} PARENT_SCOPE) | ||
| return() | ||
| else () | ||
| message(WARNING "Found an old Boost version '${Boost_VERSION}'. Required version is '${min_version}'.") | ||
| endif () | ||
| endif () | ||
|
|
||
| # Not found | ||
| set(Boost_FOUND FALSE PARENT_SCOPE) | ||
| if (required) | ||
| message(FATAL_ERROR "Could not find Boost headers") | ||
| endif () | ||
|
|
||
| endfunction() |
Oops, something went wrong.