Skip to content

Commit 2b288e2

Browse files
adayton1liu15robinson96adrienbernede
authored
Merge pull request #267 from LLNL/v0.13.0-RC
v0.13.0 Release Candidate --------- Co-authored-by: Alan Dayton <[email protected]> * Build fixes (#264) * Fix conflicting variable name in CMake * Update gcc version in host config * Make sure hip offload architecture gets passed correctly * Use GitLab container registry as a Spack build cache (#265) * Apply changes for build cache * Fix registry url + uniformed log --------- Co-authored-by: Alan Dayton <[email protected]> * Update version number * Update release notes * Update tpls * Update BLT * Revert change to minimum CMake version --------- Co-authored-by: Ben Liu <[email protected]> Co-authored-by: robinson96 <[email protected]> Co-authored-by: Adrien Bernede <[email protected]>
2 parents a997808 + 83867de commit 2b288e2

38 files changed

+852
-495
lines changed

‎.gitlab-ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ stages:
7373
include:
7474
- local: '.gitlab/custom-jobs-and-variables.yml'
7575
- project: 'radiuss/radiuss-shared-ci'
76-
ref: 'v2023.12.0'
76+
ref: 'v2024.04.0'
7777
file: 'pipelines/${CI_MACHINE}.yml'
7878
- artifact: '${CI_MACHINE}-jobs.yml'
7979
job: 'generate-job-lists'
@@ -82,9 +82,11 @@ stages:
8282
pipeline_variables: true
8383

8484
include:
85+
- project: 'lc-templates/id_tokens'
86+
file: 'id_tokens.yml'
8587
# [Optional] checks preliminary to running the actual CI test
8688
#- project: 'radiuss/radiuss-shared-ci'
87-
# ref: 'v2023.12.0'
89+
# ref: 'v2024.04.0'
8890
# file: 'utilities/preliminary-ignore-draft-pr.yml'
8991
# pipelines subscribed by the project
9092
- local: '.gitlab/subscribed-pipelines.yml'

‎.gitlab/custom-jobs-and-variables.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ variables:
2727
# Arguments for top level allocation
2828
POODLE_SHARED_ALLOC: "--exclusive --partition=pdebug --time=10 --nodes=1"
2929
# Arguments for job level allocation
30-
# Note: We repeat the reservation, necessary when jobs are manually re-triggered.
3130
POODLE_JOB_ALLOC: "--overlap --nodes=1"
3231
# Project specific variants for poodle
3332
PROJECT_POODLE_VARIANTS: ""
@@ -46,7 +45,7 @@ variables:
4645

4746
# Tioga
4847
# Arguments for top level allocation
49-
TIOGA_SHARED_ALLOC: "--exclusive --time-limit=20m --nodes=1"
48+
TIOGA_SHARED_ALLOC: "--queue=pci --exclusive --time-limit=20m --nodes=1"
5049
# Arguments for job level allocation
5150
TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+5s"
5251
# Project specific variants for tioga
@@ -71,3 +70,15 @@ variables:
7170
artifacts:
7271
reports:
7372
junit: junit.xml
73+
74+
.reproducer_vars:
75+
script:
76+
- |
77+
echo -e "
78+
# Required variables \n
79+
export MODULE_LIST=\"${MODULE_LIST}\" \n
80+
export SPEC=\"${SPEC//\"/\\\"}\" \n
81+
# Allow to set job script for debugging (only this differs from CI) \n
82+
export DEBUG_MODE=true \n
83+
# Using the CI build cache is optional and requires a token. Set it like so: \n
84+
# export REGISTRY_TOKEN=\"<your token here>\" \n"

‎.gitlab/jobs/corona.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
##############################################################################
77

88
# Override reproducer section to define project specific variables.
9-
.corona_reproducer_vars: &corona_reproducer_vars
10-
- |
11-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
12-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
9+
.corona_reproducer_vars:
10+
script:
11+
- !reference [.reproducer_vars, script]
1312

1413
########################
1514
# Overridden shared jobs

‎.gitlab/jobs/lassen.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
##############################################################################
77

88
# Override reproducer section to define project specific variables.
9-
.lassen_reproducer_vars: &lassen_reproducer_vars
10-
- |
11-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
12-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
9+
.lassen_reproducer_vars:
10+
script:
11+
- !reference [.reproducer_vars, script]
1312

1413
########################
1514
# Overridden shared jobs

‎.gitlab/jobs/poodle.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
# SPDX-License-Identifier: BSD-3-Clause
66
###############################################################################
77

8-
# Override reproducer section to define projet specific variables.
9-
.poodle_reproducer_vars: &poodle_reproducer_vars
10-
- |
11-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
12-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
8+
# Override reproducer section to define project specific variables.
9+
.poodle_reproducer_vars:
10+
script:
11+
- !reference [.reproducer_vars, script]
1312

1413
########################
1514
# Overridden shared jobs

‎.gitlab/jobs/ruby.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
# SPDX-License-Identifier: BSD-3-Clause
66
###############################################################################
77

8-
# Override reproducer section to define projet specific variables.
9-
.poodle_reproducer_vars: &poodle_reproducer_vars
10-
- |
11-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
12-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
8+
# Override reproducer section to define project specific variables.
9+
.ruby_reproducer_vars:
10+
script:
11+
- !reference [.reproducer_vars, script]
1312

1413
########################
1514
# Overridden shared jobs

‎.gitlab/jobs/tioga.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
##############################################################################
77

88
# Override reproducer section to define project specific variables.
9-
.tioga_reproducer_vars: &tioga_reproducer_vars
10-
- |
11-
echo -e "export MODULE_LIST=\"${MODULE_LIST}\""
12-
echo -e "export SPEC=\"${SPEC//\"/\\\"}\""
9+
.tioga_reproducer_vars:
10+
script:
11+
- !reference [.reproducer_vars, script]
1312

1413
########################
1514
# Overridden shared jobs

‎.uberenv_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"package_final_phase": "initconfig",
55
"package_source_dir": "../..",
66
"spack_url": "https://github.com/spack/spack.git",
7-
"spack_branch": "develop-2024-01-21",
7+
"spack_branch": "develop-2024-05-26",
88
"spack_activate": {},
99
"spack_configs_path": "scripts/radiuss-spack-configs",
1010
"spack_packages_path": ["scripts/radiuss-spack-configs/packages", "scripts/spack_packages/packages"],

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ cmake_minimum_required(VERSION 3.18)
1616
##########################################################################
1717

1818
project(CARE
19-
LANGUAGES CXX
20-
VERSION 0.12.0)
19+
LANGUAGES C CXX
20+
VERSION 0.13.0)
2121

2222
include(${PROJECT_SOURCE_DIR}/cmake/Setup.cmake)
2323

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[comment]: # (SPDX-License-Identifier: BSD-3-Clause)
66
[comment]: # (#################################################################)
77

8-
# CARE v0.12.0
8+
# CARE v0.13.0
99

1010
CARE: CHAI and RAJA Extensions
1111
===============================

‎RELEASE_NOTES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ in this file.
1212

1313
The format of this file is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
1414

15+
## [Version 0.13.0] - Release date 2024-06-11
16+
17+
### Added
18+
- Alias for execution policy specificially for kernels with reductions
19+
- Chunked loop policies
20+
1521
## [Version 0.12.0] - Release date 2024-03-11
1622

1723
### Added

‎blt

Submodule blt updated 25 files

‎cmake/SetupMacros.cmake

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,24 @@ macro(care_find_package)
6969

7070
## parse the arguments to the macro
7171
cmake_parse_arguments(
72-
arg "${options}" "${singleValuedArgs}" "${multiValuedArgs}" ${ARGN})
72+
care_arg "${options}" "${singleValuedArgs}" "${multiValuedArgs}" ${ARGN})
7373

74-
if(NOT DEFINED arg_NAME)
74+
if(NOT DEFINED care_arg_NAME)
7575
message(FATAL_ERROR "NAME is a required parameter for the care_find_package macro.")
7676
endif()
7777

78-
string(TOUPPER ${arg_NAME} _name_upper)
79-
80-
find_package(${arg_NAME} QUIET NO_DEFAULT_PATH PATHS ${${_name_upper}_DIR})
81-
set(${_name_upper}_FOUND ${${arg_NAME}_FOUND})
78+
string(TOUPPER ${care_arg_NAME} care_name_upper)
79+
find_package(${care_arg_NAME} QUIET NO_DEFAULT_PATH PATHS ${${care_name_upper}_DIR})
80+
set(${care_name_upper}_FOUND ${${care_arg_NAME}_FOUND})
8281

83-
if(${arg_REQUIRED} AND NOT ${${_name_upper}_FOUND})
84-
message(FATAL_ERROR "Could not find ${arg_NAME}. Set ${_name_upper}_DIR to the install location of ${arg_NAME}.")
82+
if(${care_arg_REQUIRED} AND NOT ${${care_name_upper}_FOUND})
83+
message(FATAL_ERROR "Could not find ${care_arg_NAME}. Set ${care_name_upper}_DIR to the install location of ${care_arg_NAME}.")
8584
endif()
8685

87-
unset(_name_upper)
86+
unset(care_name_upper)
8887

89-
if(${arg_TARGETS})
90-
care_convert_to_system_includes(TARGETS ${arg_TARGETS} RECURSIVE)
88+
if(${care_arg_TARGETS})
89+
care_convert_to_system_includes(TARGETS ${care_arg_TARGETS} RECURSIVE)
9190
endif()
9291

9392
endmacro()

‎configs/lc/hip/rocm-3.6-43-20200704_clang11.0.0.cmake

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎configs/lc/hip/rznevada.cmake

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎configs/lc/hip/rzwhamo.cmake

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎configs/lc/toss_4_x86_64_ib/clang.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ set(COMPILER_BASE "/usr/tce/packages/clang/clang-14.0.6-magic" CACHE PATH "")
99
set(CMAKE_C_COMPILER "${COMPILER_BASE}/bin/clang" CACHE PATH "")
1010
set(CMAKE_CXX_COMPILER "${COMPILER_BASE}/bin/clang++" CACHE PATH "")
1111

12-
set(GCC_HOME "/usr/tce/packages/gcc/gcc-10.3.1-magic" CACHE PATH "")
12+
set(GCC_HOME "/usr/tce/packages/gcc/gcc-12.1.1-magic" CACHE PATH "")
1313
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${GCC_HOME}" CACHE STRING "")
1414
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${GCC_HOME}" CACHE STRING "")
1515

1616
set(BLT_EXPORT_THIRDPARTY OFF CACHE BOOL "")
17-

‎configs/lc/toss_4_x86_64_ib/clang_tsan.cmake

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
##############################################################################
2+
# Copyright (c) 2024, Lawrence Livermore National Security, LLC and CARE
3+
# project contributors. See the CARE LICENSE file for details.
4+
#
5+
# SPDX-License-Identifier: BSD-3-Clause
6+
##############################################################################
7+
8+
set(COMPILER_BASE "/usr/tce/packages/clang/clang-14.0.6-magic" CACHE PATH "")
9+
set(CMAKE_C_COMPILER "${COMPILER_BASE}/bin/clang" CACHE PATH "")
10+
set(CMAKE_CXX_COMPILER "${COMPILER_BASE}/bin/clang++" CACHE PATH "")
11+
12+
set(GCC_HOME "/usr/tce/packages/gcc/gcc-12.1.1-magic" CACHE PATH "")
13+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${GCC_HOME} -fsanitize=thread -g" CACHE STRING "")
14+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${GCC_HOME} -fsanitize=thread -g" CACHE STRING "")
15+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread" CACHE STRING "")
16+
17+
set(ENABLE_OPENMP ON CACHE BOOL "")
18+
set(BLT_EXPORT_THIRDPARTY OFF CACHE BOOL "")
19+

‎configs/lc/toss_3_x86_64_ib/clang.cmake renamed to ‎configs/lc/toss_4_x86_64_ib/intel.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
# SPDX-License-Identifier: BSD-3-Clause
66
##############################################################################
77

8-
set(COMPILER_BASE "/usr/tce/packages/clang/clang-14.0.4" CACHE PATH "")
9-
set(CMAKE_C_COMPILER "${COMPILER_BASE}/bin/clang" CACHE PATH "")
10-
set(CMAKE_CXX_COMPILER "${COMPILER_BASE}/bin/clang++" CACHE PATH "")
8+
set(COMPILER_BASE "/usr/tce/packages/intel/intel-2022.1.0-magic" CACHE PATH "")
9+
set(CMAKE_C_COMPILER "${COMPILER_BASE}/bin/icx" CACHE PATH "")
10+
set(CMAKE_CXX_COMPILER "${COMPILER_BASE}/bin/icpx" CACHE PATH "")
1111

12-
set(GCC_HOME "/usr/tce/packages/gcc/gcc-10.2.1/rh" CACHE PATH "")
12+
set(GCC_HOME "/usr/tce/packages/gcc/gcc-12.1.1-magic" CACHE PATH "")
1313
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${GCC_HOME}" CACHE STRING "")
1414
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${GCC_HOME}" CACHE STRING "")
1515

‎configs/lc/toss_4_x86_64_ib_cray/amdclang.cmake

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
##############################################################################
2+
# Copyright (c) 2020-24, Lawrence Livermore National Security, LLC and CARE
3+
# project contributors. See the CARE LICENSE file for details.
4+
#
5+
# SPDX-License-Identifier: BSD-3-Clause
6+
##############################################################################
7+
8+
set(COMPILER_BASE "/usr/tce/packages/rocmcc/rocmcc-6.1.0-magic" CACHE PATH "")
9+
set(CMAKE_C_COMPILER "${COMPILER_BASE}/bin/amdclang" CACHE PATH "")
10+
set(CMAKE_CXX_COMPILER "${COMPILER_BASE}/bin/amdclang++" CACHE PATH "")
11+
12+
set(ENABLE_HIP ON CACHE BOOL "Enable Hip")
13+
set(ROCM_PATH "/usr/tce/packages/rocmcc/rocmcc-6.1.0-magic" CACHE PATH "")
14+
set(CMAKE_HIP_ARCHITECTURES "gfx942:xnack+" CACHE STRING "")
15+
set(AMDGPU_TARGETS "gfx942:xnack+" CACHE STRING "")
16+
17+
set(CARE_ENABLE_IMPLICIT_CONVERSIONS OFF CACHE BOOL "Enable implicit conversions")

‎docs/sphinx/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
# built documents.
5656
#
5757
# The short X.Y version.
58-
version = '0.12'
58+
version = '0.13'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '0.12.0'
60+
release = '0.13.0'
6161

6262
# The language for content autogenerated by Sphinx. Refer to documentation
6363
# for a list of supported languages.

‎examples/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,12 @@ blt_add_executable(NAME ScanLoopExample
3434
target_include_directories(ScanLoopExample PRIVATE ${PROJECT_SOURCE_DIR}/src)
3535
target_include_directories(ScanLoopExample PRIVATE ${PROJECT_BINARY_DIR}/include)
3636

37+
blt_add_executable(NAME RaceConditionsExample
38+
SOURCES RaceConditions.cpp
39+
DEPENDS_ON ${care_depends})
40+
41+
target_include_directories(RaceConditionsExample PRIVATE ${PROJECT_SOURCE_DIR}/src)
42+
target_include_directories(RaceConditionsExample PRIVATE ${PROJECT_BINARY_DIR}/include)
43+
44+
target_compile_options(RaceConditionsExample PRIVATE -fsanitize=thread -g)
45+
target_link_options(RaceConditionsExample PRIVATE -fsanitize=thread)

0 commit comments

Comments
 (0)