llnl · white238 · Jun 7, 2023 · Oct 5, 2022 · Nov 18, 2022 · Nov 18, 2022
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and BLT
+# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and BLT
 # project contributors. See the LICENSE file for details.
 ##############################################################################
 
@@ -33,6 +33,7 @@ stages:
 
 # This is where jobs are included
 include:
-  - local: .gitlab/build_quartz.yml
   - local: .gitlab/build_lassen.yml
-  - local: .gitlab/build_tioga.yml
+  - local: .gitlab/build_quartz.yml
+# white238: Turned off while tioga is down for maintenance and is fickle
+#  - local: .gitlab/build_tioga.yml
diff --git a/.gitlab/build_lassen.yml b/.gitlab/build_lassen.yml
@@ -15,7 +15,7 @@
 .with_cuda:
   before_script:
     - module load cmake/3.18.0
-    - module load cuda/11.1.1
+    - module load cuda/11.2.0
 
 ####
 # Template
@@ -28,32 +28,22 @@
 
 ####
 # Build jobs
-lassen-clang_upstream_link_with_nvcc:
+lassen-clang_10.0.1_nvcc_c++14_export_tpls:
   variables:
-    HOST_CONFIG: "clang@upstream_link_with_nvcc.cmake"
+    HOST_CONFIG: "clang@10.0.1_nvcc_c++14_export_tpls.cmake"
   extends: [.build_on_lassen, .with_cuda]
 
-lassen-clang_upstream_nvcc_c++17:
+lassen-clang_10.0.1_nvcc_c++14_xlf:
   variables:
-    HOST_CONFIG: "clang@upstream_nvcc_c++17.cmake"
+    HOST_CONFIG: "clang@10.0.1_nvcc_c++14_xlf.cmake"
   extends: [.build_on_lassen, .with_cuda]
 
-lassen-clang_upstream_nvcc_c++17_no_separable:
+lassen-clang_10.0.1_nvcc_c++17:
   variables:
-    HOST_CONFIG: "clang@upstream_nvcc_c++17_no_separable.cmake"
+    HOST_CONFIG: "clang@10.0.1_nvcc_c++17.cmake"
   extends: [.build_on_lassen, .with_cuda]
 
-lassen-clang_upstream_nvcc_c++14_export_tpls:
+lassen-clang_10.0.1_nvcc_c++17_no_separable:
   variables:
-    HOST_CONFIG: "clang@upstream_nvcc_c++14-export-tpls.cmake"
-  extends: [.build_on_lassen, .with_cuda]
-
-lassen-clang_upstream_nvcc_xlf:
-  variables:
-    HOST_CONFIG: "clang@upstream_nvcc_xlf.cmake"
-  extends: [.build_on_lassen, .with_cuda]
-
-lassen-pgi_20.4_nvcc:
-  variables:
-    HOST_CONFIG: "pgi@20.4_nvcc.cmake"
+    HOST_CONFIG: "clang@10.0.1_nvcc_c++17_no_separable.cmake"
   extends: [.build_on_lassen, .with_cuda]
diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml
@@ -45,37 +45,22 @@ quartz_release:
 
 ####
 # Build jobs
-quartz-clang_4_0_0_libcxx:
+quartz-clang_14_0_6:
   variables:
-    HOST_CONFIG: "clang@4.0.0-libcxx.cmake"
+    HOST_CONFIG: "clang@14.0.6.cmake"
   extends: [.build_on_quartz]
 
-quartz-clang_6_0_0_static_analysis:
+quartz-gcc_10_3_1:
   variables:
-    HOST_CONFIG: "clang@6.0.0-static-analysis.cmake"
+    HOST_CONFIG: "gcc@10.3.1.cmake"
   extends: [.build_on_quartz]
 
-quartz-gcc_8_3_1:
+quartz-gcc_10_3_1-export-tpls:
   variables:
-    HOST_CONFIG: "gcc@8.3.1.cmake"
+    HOST_CONFIG: "gcc@10.3.1-export-tpls.cmake"
   extends: [.build_on_quartz]
 
-quartz-gcc_8_3_1_export_tpls:
+quartz-intel_2022_1_0_cxx17:
   variables:
-    HOST_CONFIG: "gcc@8.3.1-export-tpls.cmake"
-  extends: [.build_on_quartz]
-
-quartz-inteloneapi_2021_3:
-  variables:
-    HOST_CONFIG: "intel-oneapi@2021.3.cmake"
-  extends: [.build_on_quartz]
-
-quartz-inteloneapi_2021_3_cxx17:
-  variables:
-    HOST_CONFIG: "intel-oneapi@2021.3-c++17.cmake"
-  extends: [.build_on_quartz]
-
-quartz-pgi_20_1:
-  variables:
-    HOST_CONFIG: "pgi@20.1.cmake"
+    HOST_CONFIG: "intel@2022.1.0-c++17.cmake"
   extends: [.build_on_quartz]
diff --git a/.mailmap b/.mailmap
@@ -1,12 +1,16 @@
+Alan Dayton <dayton8@llnl.gov>                  Alan Dayton <6393677+adayton1@users.noreply.github.com>
+Alex Tyler Chapman <chapman39@llnl.gov>         Alex Tyler Chapman <100869159+chapman39@users.noreply.github.com>
 Alfredo Metere <metal@berkeley.edu>             Alfredo Metere <metere1@llnl.gov>
 Alfredo Metere <metal@berkeley.edu>             metere1llnl <51676123+metere1llnl@users.noreply.github.com>
 Benjamin Curtice Corbett <corbett5@llnl.gov>    Ben Corbett <32752943+corbett5@users.noreply.github.com>
+Brian Manh Hien Han <han12@llnl.gov>            Brian Han <han12@llnl.gov>
 Burl M. Hall <hall53@llnl.gov>                  BurlMHall <47543546+BurlMHall@users.noreply.github.com>
 Daniel Taller <taller1@llnl.gov>                Danny Taller <66029857+dtaller@users.noreply.github.com>
 Geoffrey Oxberry <oxberry1@llnl.gov>            Geoffrey M Oxberry <goxberry@gmail.com>
 Geoffrey Oxberry <oxberry1@llnl.gov>            Geoffrey M. Oxberry <oxberry1@llnl.gov>
 George Zagaris <zagaris2@llnl.gov>              George Zagaris <george.zagaris@gmail.com>
 Jason Burmark <burmark1@llnl.gov>               Jason Burmark <mr.burmark@gmail.com>
+Johann Dahm <johann.dahm@gmail.com>             Johann Dahm <johann.dahm@ibm.com>
 Josh Essman <essman1@llnl.gov>                  Josh Essman <68349992+joshessman-llnl@users.noreply.github.com>
 Keith Healy <healy22@llnl.gov>                  keithhealy <50376825+keithhealy@users.noreply.github.com>
 Kenneth Weiss <kweiss@llnl.gov>                 Kenny Weiss <kennyweiss@users.noreply.github.com>
@@ -21,4 +25,5 @@ Peter B. Robinson <robinson96@llnl.gov>         robinspb <manbearkitty@gmail.com
 Randolph R. Settgast <settgast1@llnl.gov>       Randolph Settgast <rrsettgast@gmail.com>
 Randolph R. Settgast <settgast1@llnl.gov>       Randolph R. Settgast <rrsettgast@gmail.com>
 Randolph R. Settgast <settgast1@llnl.gov>       Randolph Settgast <settgast1@llnl.gov>
-Johann Dahm <johann.dahm@gmail.com>             Johann Dahm <johann.dahm@ibm.com>
+Steve Abbott <stephen.abbott@hpe.com>           Steve Abbott <steve.abt@gmail.com>
+
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC.
+Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -9,6 +9,26 @@ The project release numbers follow [Semantic Versioning](http://semver.org/spec/
 
 ## [Unreleased] - Release date yyyy-mm-dd
 
+## [Version 0.5.3] - Release date 2023-06-05
+
+### Changed
+- Updated Googletest to main from 04/13/2023.
+  Commit: [12a5852e451baabc79c63a86c634912c563d57bc](https://github.com/google/googletest/commit/12a5852e451baabc79c63a86c634912c563d57bc).
+  Note: this version of Googletest requires C++14, and PGI is not supported. If you are using PGI, set ENABLE_GTEST OFF.
+- Updated GoogleBenchmark to 1.8
+
+### Added
+- Added `blt_print_variables` macro to print variables in current scope, with regex filtering on variable names and values
+- 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.
+- Added `CONFIGURATIONS` and `OMP_NUM_THREADS` options to `blt_add_benchmark`
+
+### Fixed
+- Guard HIP compiler flag ``--rocm-path=/path/to/rocm`` against Crayftn compiler earlier than 15.0.0.
+- Fix doubling of `INTERFACE_INCLUDE_DIRECTORIES` in `blt_patch_target(... TREAT_INCLUDES_AS_SYSTEM true)`.
+
+### Removed
+- Removed tracking all sources in a project via ``${PROJECT_NAME}_ALL_SOURCES``.
+
 ## [Version 0.5.2] - Release date 2022-10-05
 
 ### Added
@@ -268,7 +288,8 @@ The project release numbers follow [Semantic Versioning](http://semver.org/spec/
 
 
 
-[Unreleased]:    https://github.com/LLNL/blt/compare/v0.5.2...develop
+[Unreleased]:    https://github.com/LLNL/blt/compare/v0.5.3...develop
+[Version 0.5.3]: https://github.com/LLNL/blt/compare/v0.5.2...v0.5.3
 [Version 0.5.2]: https://github.com/LLNL/blt/compare/v0.5.1...v0.5.2
 [Version 0.5.1]: https://github.com/LLNL/blt/compare/v0.5.0...v0.5.1
 [Version 0.5.0]: https://github.com/LLNL/blt/compare/v0.4.1...v0.5.0

diff --git a/SetupBLT.cmake b/SetupBLT.cmake
@@ -1,10 +1,10 @@
-# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
 # other BLT Project Developers. See the top-level LICENSE file for details
 # 
 # SPDX-License-Identifier: (BSD-3-Clause)
 
 if (NOT BLT_LOADED)
-    set(BLT_VERSION "0.5.2" CACHE STRING "")
+    set(BLT_VERSION "0.5.3" CACHE STRING "")
     mark_as_advanced(BLT_VERSION)
     message(STATUS "BLT Version: ${BLT_VERSION}")
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
 # other BLT Project Developers. See the top-level LICENSE file for details
 #
 # SPDX-License-Identifier: (BSD-3-Clause)
@@ -7,44 +7,36 @@ variables:
   DOCKER_FLAGS: "--user='root' -v `pwd`:/blt -w /blt/build $(Compiler_ImageName)"
   C_COMPILERS: "-DCMAKE_C_COMPILER=$(C_COMPILER) -DCMAKE_CXX_COMPILER=$(CXX_COMPILER)"
   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'
+  # Use the 'axom/tpls' images because they contain mpi and fortran
+  GCC11_IMAGENAME: 'axom/tpls:gcc-11_02-02-23_01h-47m'
+  CLANG10_IMAGENAME: 'axom/tpls:clang-10_02-02-23_01h-47m'
+  VM_ImageName: 'ubuntu-20.04'
 
 strategy:
   matrix:
-    linux_gcc8:
-      VM_ImageName: 'ubuntu-20.04'
-      Compiler_ImageName: 'axom/tpls:gcc-8_10-21-21_21h-28m'
-      C_COMPILER: '/usr/bin/gcc'
-      CXX_COMPILER: '/usr/bin/g++'
-      CMAKE_BIN_DIR: '/usr/bin'
-      MPI_DIR: '/usr'
-      CMAKE_FLAGS: '$(C_COMPILERS) $(MPI_FLAGS) -DENABLE_GTEST_DEATH_TESTS=OFF -DENABLE_OPENMP=ON'
     linux_gcc11:
-      VM_ImageName: 'ubuntu-20.04'
-      Compiler_ImageName: 'axom/tpls:gcc-11_01-27-22_05h-56m'
+      Compiler_ImageName: '$(GCC11_IMAGENAME)'
       C_COMPILER: '/usr/bin/gcc'
       CXX_COMPILER: '/usr/bin/g++'
       CMAKE_BIN_DIR: '/usr/bin'
       MPI_DIR: '/usr'
       CMAKE_FLAGS: '$(C_COMPILERS) $(MPI_FLAGS) -DENABLE_GTEST_DEATH_TESTS=OFF -DENABLE_OPENMP=ON'
     linux_gcc11_benchmarks:
-      VM_ImageName: 'ubuntu-20.04'
-      Compiler_ImageName: 'axom/tpls:gcc-11_01-27-22_05h-56m'
+      Compiler_ImageName: '$(GCC11_IMAGENAME)'
       C_COMPILER: '/usr/bin/gcc'
       CXX_COMPILER: '/usr/bin/g++'
       CMAKE_BIN_DIR: '/usr/bin'
       MPI_DIR: '/usr'
       CMAKE_FLAGS: '$(C_COMPILERS) $(MPI_FLAGS) -DENABLE_GTEST_DEATH_TESTS=OFF -DENABLE_OPENMP=ON -DENABLE_BENCHMARKS=ON'
     linux_gcc11_gmock:
-      VM_ImageName: 'ubuntu-20.04'
-      Compiler_ImageName: 'axom/tpls:gcc-11_01-27-22_05h-56m'
+      Compiler_ImageName: '$(GCC11_IMAGENAME)'
       C_COMPILER: '/usr/bin/gcc'
       CXX_COMPILER: '/usr/bin/g++'
       CMAKE_BIN_DIR: '/usr/bin'
       MPI_DIR: '/usr'
       CMAKE_FLAGS: '$(C_COMPILERS) $(MPI_FLAGS) -DENABLE_GTEST_DEATH_TESTS=OFF -DENABLE_OPENMP=ON -DENABLE_GMOCK=ON'
     linux_clang10:
-      VM_ImageName: 'ubuntu-18.04'
-      Compiler_ImageName: 'axom/tpls:clang-10_10-21-21_21h-28m'
+      Compiler_ImageName: '$(CLANG10_IMAGENAME)'
       C_COMPILER: '/usr/bin/clang'
       CXX_COMPILER: '/usr/bin/clang++'
       CMAKE_BIN_DIR: '/usr/bin'
@@ -54,7 +46,7 @@ strategy:
       VM_ImageName: 'macos-12'
       CMAKE_FLAGS: ''
     windows:
-      VM_ImageName: 'windows-2019'
+      VM_ImageName: 'windows-2022'
       CMAKE_FLAGS: ''
 
 pool:

diff --git a/cmake/BLTGitMacros.cmake b/cmake/BLTGitMacros.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2022, Lawrence Livermore National Security, LLC and
+# Copyright (c) 2017-2023, Lawrence Livermore National Security, LLC and
 # other BLT Project Developers. See the top-level LICENSE file for details
 # 
 # SPDX-License-Identifier: (BSD-3-Clause)