From 95503cde212d433a3ce65024b44068e03d5808e0 Mon Sep 17 00:00:00 2001 From: Aleksandar Djordjevic Date: Thu, 27 Mar 2025 16:02:17 +0100 Subject: [PATCH] Disable RCCL, load libamdhip64.so (#150) Disable RCCL and load libamdhip64.so as a fix for sw509497. [ROCm/rocprofiler-systems commit: 2bad0e941bfb52e7ced1f3bb723343ecd0a7b419] --- projects/rocprofiler-systems/CMakeLists.txt | 3 +-- .../source/lib/rocprof-sys/library.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/projects/rocprofiler-systems/CMakeLists.txt b/projects/rocprofiler-systems/CMakeLists.txt index a19be6ac22..06b19046d9 100644 --- a/projects/rocprofiler-systems/CMakeLists.txt +++ b/projects/rocprofiler-systems/CMakeLists.txt @@ -179,8 +179,7 @@ rocprofiler_systems_add_option(ROCPROFSYS_USE_MPI "Enable MPI support" OFF) rocprofiler_systems_add_option(ROCPROFSYS_USE_ROCM "Enable ROCm support" ON) rocprofiler_systems_add_option(ROCPROFSYS_USE_PAPI "Enable HW counter support via PAPI" ON) -rocprofiler_systems_add_option(ROCPROFSYS_USE_RCCL "Enable RCCL support" - ${ROCPROFSYS_USE_ROCM}) +rocprofiler_systems_add_option(ROCPROFSYS_USE_RCCL "Enable RCCL support" OFF) rocprofiler_systems_add_option( ROCPROFSYS_USE_MPI_HEADERS "Enable wrapping MPI functions w/o enabling MPI dependency" ON) diff --git a/projects/rocprofiler-systems/source/lib/rocprof-sys/library.cpp b/projects/rocprofiler-systems/source/lib/rocprof-sys/library.cpp index 10391aefcc..2328a5f46c 100644 --- a/projects/rocprofiler-systems/source/lib/rocprof-sys/library.cpp +++ b/projects/rocprofiler-systems/source/lib/rocprof-sys/library.cpp @@ -34,6 +34,7 @@ #include "core/constraint.hpp" #include "core/debug.hpp" #include "core/defines.hpp" +#include "core/dynamic_library.hpp" #include "core/gpu.hpp" #include "core/locking.hpp" #include "core/perfetto_fwd.hpp" @@ -442,6 +443,13 @@ rocprofsys_init_tooling_hidden(bool postinit) return false; } +#if ROCPROFSYS_USE_ROCM > 0 + dynamic_library _amdhip64{ "ROCPROFSYS_ROCTRACER_LIBAMDHIP64", + find_library_path("libamdhip64.so", + { "ROCPROFSYS_ROCM_PATH", "ROCM_PATH" }, + { ROCPROFSYS_DEFAULT_ROCM_PATH }) }; +#endif + static bool _once = false; static auto _debug_init = get_debug_init();