Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include cstdint #1273

Merged
merged 6 commits into from
Feb 9, 2024
Merged

Include cstdint #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ac980ba
Include cstdint
chapman39 Feb 8, 2024
bc49d83
Merge remote-tracking branch 'origin/develop' into bugfix/chapman39/c…
chapman39 Feb 8, 2024
1d3bec3
add cstdint fix to release notes
chapman39 Feb 8, 2024
f8afc34
style
white238 Feb 8, 2024
5f466d2
turn off all ROCM pre-5.6.0
white238 Feb 8, 2024
81acb47
Merge branch 'develop' into bugfix/chapman39/cstdint_include
white238 Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .gitlab/build_tioga.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
1 change: 1 addition & 0 deletions RELEASE-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
133 changes: 0 additions & 133 deletions host-configs/tioga-toss_4_x86_64_ib_cray-cce@15.0.1_hip.cmake
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions scripts/spack/specs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
1 change: 1 addition & 0 deletions src/axom/core/utilities/nvtx/interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define AXOM_NVTX_INTERFACE_HPP_

#include "axom/core/utilities/nvtx/Macros.hpp"
#include <cstdint> // For uint32_t

namespace axom
{
Expand Down