From 1e5c78eca7d99c2e9c298b38a415d37180f4664e Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Fri, 15 Dec 2023 12:34:34 -0500 Subject: [PATCH 1/2] remove esum.H include (#1410) --- screening/screen_data.H | 2 ++ util/microphysics_math.H | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/screening/screen_data.H b/screening/screen_data.H index f217fec44b..d95cb090f5 100644 --- a/screening/screen_data.H +++ b/screening/screen_data.H @@ -7,6 +7,8 @@ #include #include +using namespace amrex; + namespace scrn { class screen_factors_t { diff --git a/util/microphysics_math.H b/util/microphysics_math.H index 9540e3f9c4..606981baea 100644 --- a/util/microphysics_math.H +++ b/util/microphysics_math.H @@ -3,7 +3,6 @@ #include #include -#include // Override definitions of constants in GCEM to work around lack of support // on Power9 for long double. We don't use arithmetic > 64 bit anyway. From 96f4c7efb1adbc6e653ed6966580b6e947735f1a Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sun, 17 Dec 2023 20:29:39 -0500 Subject: [PATCH 2/2] update hip install for ROCm 6.0 (#1413) --- .../workflows/dependencies/dependencies_hip.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependencies/dependencies_hip.sh b/.github/workflows/dependencies/dependencies_hip.sh index e5fb425b67..36df2f384b 100755 --- a/.github/workflows/dependencies/dependencies_hip.sh +++ b/.github/workflows/dependencies/dependencies_hip.sh @@ -1,17 +1,26 @@ #!/usr/bin/env bash # -# Copyright 2020-2022 The AMReX Community +# Copyright 2020 The AMReX Community # # License: BSD-3-Clause-LBNL # Authors: Axel Huebl +# search recursive inside a folder if a file contains tabs +# +# @result 0 if no files are found, else 1 +# + set -eu -o pipefail +# `man apt.conf`: +# Number of retries to perform. If this is non-zero APT will retry +# failed files the given number of times. +echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries # Ref.: https://rocmdocs.amd.com/en/latest/Installation_Guide/Installation-Guide.html#ubuntu curl -O https://repo.radeon.com/rocm/rocm.gpg.key sudo apt-key add rocm.gpg.key -echo 'deb [arch=amd64] https://repo.radeon.com/rocm/apt/debian/ ubuntu main' \ +echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${1-debian}/ ubuntu main" \ | sudo tee /etc/apt/sources.list.d/rocm.list echo 'export PATH=/opt/rocm/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin:$PATH' \ | sudo tee -a /etc/profile.d/rocm.sh @@ -34,12 +43,14 @@ sudo apt-get install -y --no-install-recommends \ roctracer-dev \ rocprofiler-dev \ rocrand-dev \ - rocprim-dev + rocprim-dev \ + hiprand-dev # activate # source /etc/profile.d/rocm.sh hipcc --version +hipconfig --full which clang which clang++ which flang