Skip to content

Commit

Permalink
Fixing installed pacakge tests in CI (#1119)
Browse files Browse the repository at this point in the history
* Fixing installed pacakge tests in CI

* Formatted rocprofv3.py with black formatter
  • Loading branch information
bgopesh authored Oct 7, 2024
1 parent f2f267b commit 9b2ece7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion source/bin/rocprofv3.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def add_parser_bool_argument(gparser, *args, **kwargs):
add_parser_bool_argument(
basic_tracing_options,
"--hsa-trace",
help="For collecting --hsa-core-trace, --hsa-amd-trace,--hsa-image-trace and --hsa-finalizer-trace. This option only enables the tracing of the HSA API. Unlike previous iterations of rocprof, this does not enable kernel tracing, memory copy tracing, etc"
help="For collecting --hsa-core-trace, --hsa-amd-trace,--hsa-image-trace and --hsa-finalizer-trace. This option only enables the tracing of the HSA API. Unlike previous iterations of rocprof, this does not enable kernel tracing, memory copy tracing, etc",
)
add_parser_bool_argument(
basic_tracing_options,
Expand Down
22 changes: 21 additions & 1 deletion source/include/rocprofiler-sdk/callback_tracing.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,27 @@
#include <rocprofiler-sdk/hip.h>
#include <rocprofiler-sdk/hsa.h>
#include <rocprofiler-sdk/marker.h>
#include <rocprofiler-sdk/rccl.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 <hsa/hsa.h>
#include <hsa/hsa_amd_tool.h>
Expand Down

0 comments on commit 9b2ece7

Please sign in to comment.