Merge pull request #1291 from LLNL/feature/kweiss/add-caliper-adiak-d…

…ependency Add support for caliper and adiak dependencies
LLNL · Mar 26, 2024 · 7c7b7d1 · 7c7b7d1
2 parents 5743116 + cfb469b
commit 7c7b7d1
Show file tree

Hide file tree

Showing 49 changed files with 783 additions and 780 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -19,6 +19,11 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 
 ## [Unreleased] - Release date yyyy-mm-dd
 
+### Added
+- Adds prelimiary support for the optional `caliper` and `adiak` dependencies to axom.
+  These dependencies are added through axom's `spack` package via the new `+profiling` variant,
+  and are enabled in axom's build system via the `CALIPER_DIR` and `ADIAK_DIR` configuration paths.
+
 ### Changed
 - Upgrades `vcpkg` usage for axom's automated Windows builds to its
   [2024.03.19 release](https://github.com/microsoft/vcpkg/releases/tag/2024.03.19).

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -9,8 +9,8 @@ variables:
   DO_BUILD: 'yes'
   DO_TEST: 'yes'
   DO_CLEAN: 'no'
-  CLANG10_IMAGENAME: 'axom/tpls:clang-10_03-07-24_19h-20m'
-  GCC11_IMAGENAME: 'axom/tpls:gcc-11_03-07-24_19h-20m'
+  CLANG10_IMAGENAME: 'axom/tpls:clang-10_03-17-24_21h-01m'
+  GCC11_IMAGENAME: 'axom/tpls:gcc-11_03-17-24_21h-01m'
   system.debug: false
 
 jobs:

diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake
diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake
diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake
diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake
diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake
diff --git a/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake b/host-configs/lassen-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake
diff --git a/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/quartz-toss_4_x86_64_ib-clang@14.0.6.cmake
diff --git a/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/quartz-toss_4_x86_64_ib-gcc@10.3.1.cmake
diff --git a/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/quartz-toss_4_x86_64_ib-intel@2022.1.0.cmake
diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.1.cmake
diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-clang@10.0.1.2_cuda.cmake
diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.1.cmake
diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-gcc@8.3.1.2_cuda.cmake
diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.1.cmake
diff --git a/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake b/host-configs/rzansel-blueos_3_ppc64le_ib_p9-xl@16.1.1.2_cuda.cmake
diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-clang@14.0.6.cmake
diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-gcc@10.3.1.cmake
diff --git a/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake b/host-configs/rzgenie-toss_4_x86_64_ib-intel@2022.1.0.cmake