From a3b41d04fcdf98eb18ea586067564b68a5b4602b Mon Sep 17 00:00:00 2001
From: Mythreya <mythreyak@proton.me>
Date: Mon, 7 Oct 2024 15:37:19 -0700
Subject: [PATCH] Fix PSDB change (#1120)

Reverts change to `source/include/rocprofiler-sdk/callback_tracing.h`
from commit 9b2ece76c3dbfce61362ec69446c9f5f9ce07013
---
 source/include/rocprofiler-sdk/CMakeLists.txt |  1 +
 .../rocprofiler-sdk/callback_tracing.h        | 22 +------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/source/include/rocprofiler-sdk/CMakeLists.txt b/source/include/rocprofiler-sdk/CMakeLists.txt
index 0289b0f0bb..68b57aab46 100644
--- a/source/include/rocprofiler-sdk/CMakeLists.txt
+++ b/source/include/rocprofiler-sdk/CMakeLists.txt
@@ -29,6 +29,7 @@ set(ROCPROFILER_HEADER_FILES
     pc_sampling.h
     profile_config.h
     registration.h
+    rccl.h
     spm.h
     ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
diff --git a/source/include/rocprofiler-sdk/callback_tracing.h b/source/include/rocprofiler-sdk/callback_tracing.h
index eba9aab878..124207d402 100644
--- a/source/include/rocprofiler-sdk/callback_tracing.h
+++ b/source/include/rocprofiler-sdk/callback_tracing.h
@@ -27,27 +27,7 @@
 #include <rocprofiler-sdk/hip.h>
 #include <rocprofiler-sdk/hsa.h>
 #include <rocprofiler-sdk/marker.h>
-
-#if !defined(ROCPROFILER_SDK_USE_SYSTEM_RCCL)
-#    if defined __has_include
-#        if __has_include(<rccl/amd_detail/api_trace.h>)
-#            define ROCPROFILER_SDK_USE_SYSTEM_RCCL 1
-#        else
-#            define ROCPROFILER_SDK_USE_SYSTEM_RCCL 0
-#        endif
-#    else
-#        define ROCPROFILER_SDK_USE_SYSTEM_RCCL 0
-#    endif
-#endif
-
-#if ROCPROFILER_SDK_USE_SYSTEM_RCCL > 0
-#    include <rccl/amd_detail/api_trace.h>
-#    include <rccl/rccl.h>
-#else
-#    include <rocprofiler-sdk/rccl/api_args.h>
-#    include <rocprofiler-sdk/rccl/details/api_trace.h>
-#    include <rocprofiler-sdk/rccl/details/rccl.h>
-#endif
+#include <rocprofiler-sdk/rccl.h>
 
 #include <hsa/hsa.h>
 #include <hsa/hsa_amd_tool.h>