Merge pull request #1273 from LLNL/bugfix/chapman39/cstdint_include

Include cstdint
LLNL · Feb 9, 2024 · 386b021 · 386b021
2 parents d5e4a5f + 81acb47
commit 386b021
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 150 deletions.
diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml
@@ -40,12 +40,6 @@ tioga-clang_16_0_0_hip_5_6_0-src:
     HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake"
   extends: .src_build_on_tioga
 
-tioga-cce_15_0_1_hip_5_4_3-src:
-  variables:
-    COMPILER: "cce@15.0.1_hip"
-    HOST_CONFIG: "tioga-toss_4_x86_64_ib_cray-${COMPILER}.cmake"
-  extends: .src_build_on_tioga
-
 ####
 # Full Build jobs
 tioga-clang_16_0_0_hip_5_6_0-full:
@@ -54,10 +48,3 @@ tioga-clang_16_0_0_hip_5_6_0-full:
     SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c"
     EXTRASPEC: "amdgpu_target=gfx90a ^hip@5.6.0 ^hsa-rocr-dev@5.6.0 ^llvm-amdgpu@5.6.0 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion"
   extends: .full_build_on_tioga
-
-tioga-cce_15_0_1_hip_5_4_3-full:
-  variables:
-    COMPILER: "cce@15.0.1_hip"
-    SPEC: "%${COMPILER}~openmp+rocm+mfem+c2c"
-    EXTRASPEC: "amdgpu_target=gfx90a ^hip@5.4.3 ^hsa-rocr-dev@5.4.3 ^llvm-amdgpu@5.4.3 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion"
-  extends: .full_build_on_tioga
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -61,6 +61,7 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 - Fixed a bug in the bounds checks for `primal::clip(Triangle, BoundingBox)`
 - Fixed a bug when loading Sidre groups with attributes that already exist
 - Fixed `std::locale` error when when compiling `src/axom/core/utilities/System.cpp` using nvcc
+- Include `cstdint` for higher gcc version support (e.g. gcc-13)
 
 ## [Version 0.8.1] - Release date 2023-08-16
 

diff --git a/host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake b/host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake
diff --git a/scripts/spack/specs.json b/scripts/spack/specs.json
@@ -28,10 +28,7 @@
     "__comment__":"# Use amdgpu_target=gfx90a for tioga/rzvernal; and gfx908 for rznevada",
     "__comment__":"# -Wno-int-conversion flag needed for building HDF5",
     "toss_4_x86_64_ib_cray":
-    [ "clang@14.0.0~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.2.3 ^rocprim@5.2.3 ^hsa-rocr-dev@5.2.3 ^llvm-amdgpu@5.2.3  ^raja~openmp+rocm ^umpire~openmp+rocm",
-      "clang@15.0.0~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.4.3 ^hsa-rocr-dev@5.4.3 ^llvm-amdgpu@5.4.3 ^rocprim@5.4.3 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion",
-      "cce@15.0.1~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.4.3 ^hsa-rocr-dev@5.4.3 ^llvm-amdgpu@5.4.3 ^rocprim@5.4.3 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion",
-      "clang@16.0.0~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.6.0 ^hsa-rocr-dev@5.6.0 ^llvm-amdgpu@5.6.0 ^rocprim@5.6.0 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion" ],
+    [ "clang@16.0.0~openmp+rocm+mfem+c2c amdgpu_target=gfx90a ^hip@5.6.0 ^hsa-rocr-dev@5.6.0 ^llvm-amdgpu@5.6.0 ^rocprim@5.6.0 ^raja~openmp+rocm ^umpire~openmp+rocm ^hdf5 cflags=-Wno-int-conversion" ],
 
     "__comment__":"# Note: clang-ibm + raja+openmp causes runtime failures, turning it off until there is an alternative",
     "blueos_3_ppc64le_ib_p9":

diff --git a/src/axom/core/utilities/nvtx/interface.hpp b/src/axom/core/utilities/nvtx/interface.hpp
@@ -7,6 +7,7 @@
 #define AXOM_NVTX_INTERFACE_HPP_
 
 #include "axom/core/utilities/nvtx/Macros.hpp"
+#include <cstdint>  // For uint32_t
 
 namespace axom
 {