From 10b026817f713fc18b93a0e50b2d1c8f75ce8694 Mon Sep 17 00:00:00 2001 From: Tapasya Patki Date: Wed, 29 Oct 2025 17:06:23 -0700 Subject: [PATCH] Update docs and add a new hostfile with rocm/7.0 and clang-20 on tuolumne --- docs/BuildingPerfFlowAspect.rst | 4 ++-- docs/CaliperIntegration.rst | 4 ++-- src/c/README.md | 4 ++-- ....0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake | 17 ----------------- ....0-x86_64-rocm@6.2.1-amdclang@18.0.0.cmake | 19 ------------------- ....0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake | 19 ------------------- ...0-x86_64-rocm@7.0.0-amdclang@20.0.0.cmake} | 0 7 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 src/c/host-configs/tioga-4.18.0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake delete mode 100644 src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@6.2.1-amdclang@18.0.0.cmake delete mode 100644 src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake rename src/c/host-configs/{tuo-main.cmake => tuolumne-4.18.0-x86_64-rocm@7.0.0-amdclang@20.0.0.cmake} (100%) diff --git a/docs/BuildingPerfFlowAspect.rst b/docs/BuildingPerfFlowAspect.rst index 2f5d19ca..baf2f23f 100644 --- a/docs/BuildingPerfFlowAspect.rst +++ b/docs/BuildingPerfFlowAspect.rst @@ -58,9 +58,9 @@ Build Dependencies and Versions +----------------+----------------+-----------+ | redhat | ubuntu | version | +================+================+===========+ - | clang | clang | == 18.0 | + | clang | clang | == 20.0 | +----------------+----------------+-----------+ - | llvm-devel | llvm-dev | == 18.0 | + | llvm-devel | llvm-dev | == 20.0 | +----------------+----------------+-----------+ | jansson-devel | libjansson-dev | >= 2.6 | +----------------+----------------+-----------+ diff --git a/docs/CaliperIntegration.rst b/docs/CaliperIntegration.rst index 52607ce2..eb36b84d 100644 --- a/docs/CaliperIntegration.rst +++ b/docs/CaliperIntegration.rst @@ -32,8 +32,8 @@ PerfFlowAspect. These can be specified with the `-DCMAKE_C_COMPILER` and .. code:: bash - cmake -DCMAKE_C_COMPILER= \ - -DCMAKE_C_COMPILER= \ + cmake -DCMAKE_C_COMPILER= \ + -DCMAKE_C_COMPILER= \ -DWITH_PYTHON_BINDINGS=On \ -Dcaliper_DIR=/share/lib/caliper ../ diff --git a/src/c/README.md b/src/c/README.md index 1672d148..6695c53a 100644 --- a/src/c/README.md +++ b/src/c/README.md @@ -36,8 +36,8 @@ different Linux distributions. **redhat** | **ubuntu** | **version** ---------- | ---------- | ----------- -clang | clang | == 18.0 -llvm-devel | llvm-dev | == 18.0 +clang | clang | == 20.0 +llvm-devel | llvm-dev | == 20.0 jansson-devel | libjansson-dev | >= 2.6 openssl-devel | libssl-dev | >= 1.0.2 cmake | cmake | >= 3.10 diff --git a/src/c/host-configs/tioga-4.18.0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake b/src/c/host-configs/tioga-4.18.0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake deleted file mode 100644 index 33fca384..00000000 --- a/src/c/host-configs/tioga-4.18.0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake +++ /dev/null @@ -1,17 +0,0 @@ -############################################################## -# Copyright 2021 Lawrence Livermore National Security, LLC -# (c.f. AUTHORS, NOTICE.LLNS, COPYING) -# -# This file is part of the Flux resource manager framework. -# For details, see https://github.com/flux-framework. -# -# SPDX-License-Identifier: LGPL-3.0 -############################################################## - -set(CMAKE_C_COMPILER "/opt/rocm-6.3.1/lib/llvm/bin/amdclang" CACHE PATH "") -set(CMAKE_CXX_COMPILER "/opt/rocm-6.3.1/lib/llvm/bin/amdclang++" CACHE PATH "") - -# To enable fine-grained profiling with Caliper, utilize the below options. -# Caliper should be built with the same compilers as the PerfFlowAspect. -# set(PERFFLOWASPECT_WITH_CALIPER ON CACHE BOOL "") -# set(caliper_DIR "path-to-caliper-install-directory" CACHE PATH "") diff --git a/src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@6.2.1-amdclang@18.0.0.cmake b/src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@6.2.1-amdclang@18.0.0.cmake deleted file mode 100644 index 2580e1de..00000000 --- a/src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@6.2.1-amdclang@18.0.0.cmake +++ /dev/null @@ -1,19 +0,0 @@ -############################################################## -# Copyright 2021 Lawrence Livermore National Security, LLC -# (c.f. AUTHORS, NOTICE.LLNS, COPYING) -# -# This file is part of the Flux resource manager framework. -# For details, see https://github.com/flux-framework. -# -# SPDX-License-Identifier: LGPL-3.0 -############################################################## - -set(CMAKE_C_COMPILER "/opt/rocm-6.2.1/lib/llvm/bin/amdclang" CACHE PATH "") -set(CMAKE_CXX_COMPILER "/opt/rocm-6.2.1/lib/llvm/bin/amdclang++" CACHE PATH "") - -set(PERFFLOWASPECT_WITH_CUDA "OFF" CACHE BOOL "") - -# To enable fine-grained profiling with Caliper, utilize the below options. -# Caliper should be built with the same compilers as the PerfFlowAspect. -# set(PERFFLOWASPECT_WITH_CALIPER ON CACHE BOOL "") -# set(caliper_DIR "path-to-caliper-install-directory" CACHE PATH "") diff --git a/src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake b/src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake deleted file mode 100644 index 7e47dfec..00000000 --- a/src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@6.3.1-amdclang@18.0.0.cmake +++ /dev/null @@ -1,19 +0,0 @@ -############################################################## -# Copyright 2021 Lawrence Livermore National Security, LLC -# (c.f. AUTHORS, NOTICE.LLNS, COPYING) -# -# This file is part of the Flux resource manager framework. -# For details, see https://github.com/flux-framework. -# -# SPDX-License-Identifier: LGPL-3.0 -############################################################## - -set(CMAKE_C_COMPILER "/opt/rocm-6.4.2/lib/llvm/bin/amdclang" CACHE PATH "") -set(CMAKE_CXX_COMPILER "/opt/rocm-6.4.2/lib/llvm/bin/amdclang++" CACHE PATH "") - -set(PERFFLOWASPECT_WITH_CUDA "OFF" CACHE BOOL "") - -# To enable fine-grained profiling with Caliper, utilize the below options. -# Caliper should be built with the same compilers as the PerfFlowAspect. -# set(PERFFLOWASPECT_WITH_CALIPER ON CACHE BOOL "") -# set(caliper_DIR "path-to-caliper-install-directory" CACHE PATH "") diff --git a/src/c/host-configs/tuo-main.cmake b/src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@7.0.0-amdclang@20.0.0.cmake similarity index 100% rename from src/c/host-configs/tuo-main.cmake rename to src/c/host-configs/tuolumne-4.18.0-x86_64-rocm@7.0.0-amdclang@20.0.0.cmake