Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build_tools/build_python_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,9 @@ def run(args: argparse.Namespace):
# TODO: The base package is shoving CMake redirects into lib.
excludes=[
"**/cmake/**",
# profiler binaries
"bin/rocprof-*",
# profiler binaries (rocprof-attach from rocprofiler-sdk stays in core)
"bin/rocprof-compute*",
"bin/rocprof-sys-*",
# rocprofiler-systems payload
"include/rocprofiler-systems/**",
"lib/librocprof-sys*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def import_dist_info():
"rocpd2pftrace=rocm_sdk_core._cli:rocpd2pftrace",
"rocpd2summary=rocm_sdk_core._cli:rocpd2summary",
"rocprofv3=rocm_sdk_core._cli:rocprofv3",
"rocprofv3-attach=rocm_sdk_core._cli:rocprofv3_attach",
"rocprof-attach=rocm_sdk_core._cli:rocprof_attach",
"rocprofv3-avail=rocm_sdk_core._cli:rocprofv3_avail",
]
if platform.system() != "Windows"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ def rocprofv3():
_exec("bin/rocprofv3")


def rocprofv3_attach():
_exec("bin/rocprofv3-attach")
def rocprof_attach():
_exec("bin/rocprof-attach")


def rocprofv3_avail():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@
("rocminfo", [], "", True),
("rocm-smi", [], "Management", True),
("hipify-perl", ["--help"], "USAGE:", True),
("rocpd", ["--help"], "Aggregate", True),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you help me understand how this relates to #9535 "Fix ROCpd dependencies in Python wheels" ? The tool can run its --help but it has additional python requirements for full functionality?

Adding this test coverage is great, then I think we'll need to be careful about how to enable and test the rest if there are other python deps needed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the tool can run it's --help, but some sub-modules need additional python packages to fully use some features. The tool will instruct the user to install it by showing the instructions:

ImportError: pandas module not found. Please install it using 'pip install pandas' to export to other formats

I believe the author of #9535 is trying to solve that problem, to have the additional packages pre-installed.

("rocpd2csv", ["--help"], "Convert", True),
("rocpd2otf2", ["--help"], "Convert", True),
("rocpd2pftrace", ["--help"], "Convert", True),
("rocpd2summary", ["--help"], "Generate summary", True),
("rocprofv3", ["--help"], "ROCProfilerV3", True),
("rocprof-attach", ["--help"], "attachment", True),
("rocprofv3-avail", ["--help"], "query tool", True),
]

WINDOWS_CONSOLE_SCRIPT_TESTS = [
Expand Down
Loading