Skip to content

Commit 5a792c1

Browse files
white238white238
authored
Merge pull request #640 from LLNL/v0.5.3-rc
Release Candidate v0.5.3
2 parents 84fe0d1 + 2602f7c commit 5a792c1

File tree

673 files changed

+51650
-46794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

673 files changed

+51650
-46794
lines changed

‎.gitlab-ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##############################################################################
2-
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and BLT
2+
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and BLT
33
# project contributors. See the LICENSE file for details.
44
##############################################################################
55

@@ -33,6 +33,7 @@ stages:
3333

3434
# This is where jobs are included
3535
include:
36-
- local: .gitlab/build_quartz.yml
3736
- local: .gitlab/build_lassen.yml
38-
- local: .gitlab/build_tioga.yml
37+
- local: .gitlab/build_quartz.yml
38+
# white238: Turned off while tioga is down for maintenance and is fickle
39+
# - local: .gitlab/build_tioga.yml

‎.gitlab/build_lassen.yml

+9-19
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
.with_cuda:
1616
before_script:
1717
- module load cmake/3.18.0
18-
- module load cuda/11.1.1
18+
- module load cuda/11.2.0
1919

2020
####
2121
# Template
@@ -28,32 +28,22 @@
2828

2929
####
3030
# Build jobs
31-
lassen-clang_upstream_link_with_nvcc:
31+
lassen-clang_10.0.1_nvcc_c++14_export_tpls:
3232
variables:
33-
HOST_CONFIG: "clang@upstream_link_with_nvcc.cmake"
33+
HOST_CONFIG: "clang@10.0.1_nvcc_c++14_export_tpls.cmake"
3434
extends: [.build_on_lassen, .with_cuda]
3535

36-
lassen-clang_upstream_nvcc_c++17:
36+
lassen-clang_10.0.1_nvcc_c++14_xlf:
3737
variables:
38-
HOST_CONFIG: "clang@upstream_nvcc_c++17.cmake"
38+
HOST_CONFIG: "clang@10.0.1_nvcc_c++14_xlf.cmake"
3939
extends: [.build_on_lassen, .with_cuda]
4040

41-
lassen-clang_upstream_nvcc_c++17_no_separable:
41+
lassen-clang_10.0.1_nvcc_c++17:
4242
variables:
43-
HOST_CONFIG: "clang@upstream_nvcc_c++17_no_separable.cmake"
43+
HOST_CONFIG: "clang@10.0.1_nvcc_c++17.cmake"
4444
extends: [.build_on_lassen, .with_cuda]
4545

46-
lassen-clang_upstream_nvcc_c++14_export_tpls:
46+
lassen-clang_10.0.1_nvcc_c++17_no_separable:
4747
variables:
48-
HOST_CONFIG: "clang@upstream_nvcc_c++14-export-tpls.cmake"
49-
extends: [.build_on_lassen, .with_cuda]
50-
51-
lassen-clang_upstream_nvcc_xlf:
52-
variables:
53-
HOST_CONFIG: "clang@upstream_nvcc_xlf.cmake"
54-
extends: [.build_on_lassen, .with_cuda]
55-
56-
lassen-pgi_20.4_nvcc:
57-
variables:
58-
HOST_CONFIG: "[email protected]_nvcc.cmake"
48+
HOST_CONFIG: "[email protected]_nvcc_c++17_no_separable.cmake"
5949
extends: [.build_on_lassen, .with_cuda]

‎.gitlab/build_quartz.yml

+8-23
Original file line numberDiff line numberDiff line change
@@ -45,37 +45,22 @@ quartz_release:
4545

4646
####
4747
# Build jobs
48-
quartz-clang_4_0_0_libcxx:
48+
quartz-clang_14_0_6:
4949
variables:
50-
HOST_CONFIG: "clang@4.0.0-libcxx.cmake"
50+
HOST_CONFIG: "clang@14.0.6.cmake"
5151
extends: [.build_on_quartz]
5252

53-
quartz-clang_6_0_0_static_analysis:
53+
quartz-gcc_10_3_1:
5454
variables:
55-
HOST_CONFIG: "[email protected].cmake"
55+
HOST_CONFIG: "[email protected].cmake"
5656
extends: [.build_on_quartz]
5757

58-
quartz-gcc_8_3_1:
58+
quartz-gcc_10_3_1-export-tpls:
5959
variables:
60-
HOST_CONFIG: "gcc@8.3.1.cmake"
60+
HOST_CONFIG: "gcc@10.3.1-export-tpls.cmake"
6161
extends: [.build_on_quartz]
6262

63-
quartz-gcc_8_3_1_export_tpls:
63+
quartz-intel_2022_1_0_cxx17:
6464
variables:
65-
HOST_CONFIG: "[email protected]"
66-
extends: [.build_on_quartz]
67-
68-
quartz-inteloneapi_2021_3:
69-
variables:
70-
HOST_CONFIG: "[email protected]"
71-
extends: [.build_on_quartz]
72-
73-
quartz-inteloneapi_2021_3_cxx17:
74-
variables:
75-
HOST_CONFIG: "[email protected]++17.cmake"
76-
extends: [.build_on_quartz]
77-
78-
quartz-pgi_20_1:
79-
variables:
80-
HOST_CONFIG: "[email protected]"
65+
HOST_CONFIG: "[email protected]++17.cmake"
8166
extends: [.build_on_quartz]

‎.mailmap

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1+
Alan Dayton <[email protected]> Alan Dayton <[email protected]>
2+
Alex Tyler Chapman <[email protected]> Alex Tyler Chapman <[email protected]>
13
Alfredo Metere <[email protected]> Alfredo Metere <[email protected]>
24
Alfredo Metere <[email protected]> metere1llnl <[email protected]>
35
Benjamin Curtice Corbett <[email protected]> Ben Corbett <[email protected]>
6+
Brian Manh Hien Han <[email protected]> Brian Han <[email protected]>
47
Burl M. Hall <[email protected]> BurlMHall <[email protected]>
58
Daniel Taller <[email protected]> Danny Taller <[email protected]>
69
Geoffrey Oxberry <[email protected]> Geoffrey M Oxberry <[email protected]>
710
Geoffrey Oxberry <[email protected]> Geoffrey M. Oxberry <[email protected]>
811
George Zagaris <[email protected]> George Zagaris <[email protected]>
912
Jason Burmark <[email protected]> Jason Burmark <[email protected]>
13+
Johann Dahm <[email protected]> Johann Dahm <[email protected]>
1014
Josh Essman <[email protected]> Josh Essman <[email protected]>
1115
Keith Healy <[email protected]> keithhealy <[email protected]>
1216
Kenneth Weiss <[email protected]> Kenny Weiss <[email protected]>
@@ -21,4 +25,5 @@ Peter B. Robinson <[email protected]> robinspb <[email protected]
2125
Randolph R. Settgast <[email protected]> Randolph Settgast <[email protected]>
2226
Randolph R. Settgast <[email protected]> Randolph R. Settgast <[email protected]>
2327
Randolph R. Settgast <[email protected]> Randolph Settgast <[email protected]>
24-
Johann Dahm <[email protected]> Johann Dahm <[email protected]>
28+
Steve Abbott <[email protected]> Steve Abbott <[email protected]>
29+

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC.
1+
Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

‎RELEASE-NOTES.md

+22-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,26 @@ The project release numbers follow [Semantic Versioning](http://semver.org/spec/
99

1010
## [Unreleased] - Release date yyyy-mm-dd
1111

12+
## [Version 0.5.3] - Release date 2023-06-05
13+
14+
### Changed
15+
- Updated Googletest to main from 04/13/2023.
16+
Commit: [12a5852e451baabc79c63a86c634912c563d57bc](https://github.com/google/googletest/commit/12a5852e451baabc79c63a86c634912c563d57bc).
17+
Note: this version of Googletest requires C++14, and PGI is not supported. If you are using PGI, set ENABLE_GTEST OFF.
18+
- Updated GoogleBenchmark to 1.8
19+
20+
### Added
21+
- Added `blt_print_variables` macro to print variables in current scope, with regex filtering on variable names and values
22+
- Added `DEPENDS_ON` optional parameter to `blt_check_code_compiles` macro to allow for checking if a feature is available in a third-party imported target.
23+
- Added `CONFIGURATIONS` and `OMP_NUM_THREADS` options to `blt_add_benchmark`
24+
25+
### Fixed
26+
- Guard HIP compiler flag ``--rocm-path=/path/to/rocm`` against Crayftn compiler earlier than 15.0.0.
27+
- Fix doubling of `INTERFACE_INCLUDE_DIRECTORIES` in `blt_patch_target(... TREAT_INCLUDES_AS_SYSTEM true)`.
28+
29+
### Removed
30+
- Removed tracking all sources in a project via ``${PROJECT_NAME}_ALL_SOURCES``.
31+
1232
## [Version 0.5.2] - Release date 2022-10-05
1333

1434
### Added
@@ -268,7 +288,8 @@ The project release numbers follow [Semantic Versioning](http://semver.org/spec/
268288

269289

270290

271-
[Unreleased]: https://github.com/LLNL/blt/compare/v0.5.2...develop
291+
[Unreleased]: https://github.com/LLNL/blt/compare/v0.5.3...develop
292+
[Version 0.5.3]: https://github.com/LLNL/blt/compare/v0.5.2...v0.5.3
272293
[Version 0.5.2]: https://github.com/LLNL/blt/compare/v0.5.1...v0.5.2
273294
[Version 0.5.1]: https://github.com/LLNL/blt/compare/v0.5.0...v0.5.1
274295
[Version 0.5.0]: https://github.com/LLNL/blt/compare/v0.4.1...v0.5.0

‎SetupBLT.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
22
# other BLT Project Developers. See the top-level LICENSE file for details
33
#
44
# SPDX-License-Identifier: (BSD-3-Clause)
55

66
if (NOT BLT_LOADED)
7-
set(BLT_VERSION "0.5.2" CACHE STRING "")
7+
set(BLT_VERSION "0.5.3" CACHE STRING "")
88
mark_as_advanced(BLT_VERSION)
99
message(STATUS "BLT Version: ${BLT_VERSION}")
1010

‎azure-pipelines.yml

+10-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
22
# other BLT Project Developers. See the top-level LICENSE file for details
33
#
44
# SPDX-License-Identifier: (BSD-3-Clause)
@@ -7,44 +7,36 @@ variables:
77
DOCKER_FLAGS: "--user='root' -v `pwd`:/blt -w /blt/build $(Compiler_ImageName)"
88
C_COMPILERS: "-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER)"
99
MPI_FLAGS: '-DENABLE_MPI=ON -DMPI_C_COMPILER=$(MPI_DIR)/bin/mpicc -DMPI_CXX_COMPILER=$(MPI_DIR)/bin/mpicxx -DMPIEXEC=$(MPI_DIR)/bin/mpiexec -DMPIEXEC_NUMPROC_FLAG=-n'
10+
# Use the 'axom/tpls' images because they contain mpi and fortran
11+
GCC11_IMAGENAME: 'axom/tpls:gcc-11_02-02-23_01h-47m'
12+
CLANG10_IMAGENAME: 'axom/tpls:clang-10_02-02-23_01h-47m'
13+
VM_ImageName: 'ubuntu-20.04'
1014

1115
strategy:
1216
matrix:
13-
linux_gcc8:
14-
VM_ImageName: 'ubuntu-20.04'
15-
Compiler_ImageName: 'axom/tpls:gcc-8_10-21-21_21h-28m'
16-
C_COMPILER: '/usr/bin/gcc'
17-
CXX_COMPILER: '/usr/bin/g++'
18-
CMAKE_BIN_DIR: '/usr/bin'
19-
MPI_DIR: '/usr'
20-
CMAKE_FLAGS: '$(C_COMPILERS) $(MPI_FLAGS) -DENABLE_GTEST_DEATH_TESTS=OFF -DENABLE_OPENMP=ON'
2117
linux_gcc11:
22-
VM_ImageName: 'ubuntu-20.04'
23-
Compiler_ImageName: 'axom/tpls:gcc-11_01-27-22_05h-56m'
18+
Compiler_ImageName: '$(GCC11_IMAGENAME)'
2419
C_COMPILER: '/usr/bin/gcc'
2520
CXX_COMPILER: '/usr/bin/g++'
2621
CMAKE_BIN_DIR: '/usr/bin'
2722
MPI_DIR: '/usr'
2823
CMAKE_FLAGS: '$(C_COMPILERS) $(MPI_FLAGS) -DENABLE_GTEST_DEATH_TESTS=OFF -DENABLE_OPENMP=ON'
2924
linux_gcc11_benchmarks:
30-
VM_ImageName: 'ubuntu-20.04'
31-
Compiler_ImageName: 'axom/tpls:gcc-11_01-27-22_05h-56m'
25+
Compiler_ImageName: '$(GCC11_IMAGENAME)'
3226
C_COMPILER: '/usr/bin/gcc'
3327
CXX_COMPILER: '/usr/bin/g++'
3428
CMAKE_BIN_DIR: '/usr/bin'
3529
MPI_DIR: '/usr'
3630
CMAKE_FLAGS: '$(C_COMPILERS) $(MPI_FLAGS) -DENABLE_GTEST_DEATH_TESTS=OFF -DENABLE_OPENMP=ON -DENABLE_BENCHMARKS=ON'
3731
linux_gcc11_gmock:
38-
VM_ImageName: 'ubuntu-20.04'
39-
Compiler_ImageName: 'axom/tpls:gcc-11_01-27-22_05h-56m'
32+
Compiler_ImageName: '$(GCC11_IMAGENAME)'
4033
C_COMPILER: '/usr/bin/gcc'
4134
CXX_COMPILER: '/usr/bin/g++'
4235
CMAKE_BIN_DIR: '/usr/bin'
4336
MPI_DIR: '/usr'
4437
CMAKE_FLAGS: '$(C_COMPILERS) $(MPI_FLAGS) -DENABLE_GTEST_DEATH_TESTS=OFF -DENABLE_OPENMP=ON -DENABLE_GMOCK=ON'
4538
linux_clang10:
46-
VM_ImageName: 'ubuntu-18.04'
47-
Compiler_ImageName: 'axom/tpls:clang-10_10-21-21_21h-28m'
39+
Compiler_ImageName: '$(CLANG10_IMAGENAME)'
4840
C_COMPILER: '/usr/bin/clang'
4941
CXX_COMPILER: '/usr/bin/clang++'
5042
CMAKE_BIN_DIR: '/usr/bin'
@@ -54,7 +46,7 @@ strategy:
5446
VM_ImageName: 'macos-12'
5547
CMAKE_FLAGS: ''
5648
windows:
57-
VM_ImageName: 'windows-2019'
49+
VM_ImageName: 'windows-2022'
5850
CMAKE_FLAGS: ''
5951

6052
pool:

‎cmake/BLTGitMacros.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
1+
# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
22
# other BLT Project Developers. See the top-level LICENSE file for details
33
#
44
# SPDX-License-Identifier: (BSD-3-Clause)

0 commit comments

Comments
 (0)