AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Misc] fix the agent_id field (#297)

Browse Source 
* fix the agent_id field

* Fix shebang

---------

Co-authored-by: Jonathan R. Madsen <jonathanrmadsen@gmail.com>

[ROCm/rocprofiler-sdk commit: 35069a9d06]
This commit is contained in:
Nagaraj, Sriraksha
2025-04-27 19:56:45 -05:00
committed by GitHub
parent d10a9d855a
commit a83ee16d51
7 changed files with 127 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocprofiler-sdk/tests/conversion-script/CMakeLists.txt
+53 -20
View File
@@ -51,26 +51,59 @@ set_tests_properties(
PROPERTIES TIMEOUT 45 LABELS "integration-tests" ENVIRONMENT "${cc-env-pmc}"
FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
add_test(
NAME test-conversion-script-convert
COMMAND
${Python3_EXECUTABLE}
$<TARGET_FILE:rocprofiler-sdk::convert-counters-collection-format> --input
${CMAKE_CURRENT_BINARY_DIR}/out_conversion_script --output
${CMAKE_CURRENT_BINARY_DIR}/out_conversion_script/converted.csv)
set(convert_tests test-conversion-script-convert-no-agent-prefix
test-conversion-script-convert-agent-prefix)
set_tests_properties(
test-conversion-script-convert
PROPERTIES TIMEOUT 45 LABELS "integration-tests" DEPENDS
test-conversion-script-execute FAIL_REGULAR_EXPRESSION
"${ROCPROFILER_DEFAULT_FAIL_REGEX}")
set(validate_tests test-conversion-script-validate-no-agent-prefix
test-conversion-script-validate-agent-prefix)
add_test(NAME test-conversion-script-validate
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py --input
${CMAKE_CURRENT_BINARY_DIR}/out_conversion_script/converted.csv)
set(output_dir ${CMAKE_CURRENT_BINARY_DIR}/out_conversion_script_no_agent_prefix
${CMAKE_CURRENT_BINARY_DIR}/out_conversion_script_agent_prefix)
set_tests_properties(
test-conversion-script-validate
PROPERTIES TIMEOUT 45 LABELS "integration-tests" DEPENDS
test-conversion-script-convert FAIL_REGULAR_EXPRESSION
"${ROCPROFILER_DEFAULT_FAIL_REGEX}")
set(agent_index_flag false true)
list(LENGTH convert_tests convert_test_length)
foreach(i RANGE 0 ${convert_test_length})
if(${i} EQUAL ${convert_test_length})
break()
endif()
list(GET convert_tests ${i} test_name)
list(GET output_dir ${i} output)
list(GET agent_index_flag ${i} flag)
list(GET validate_tests ${i} validate_test_name)
if(${flag})
add_test(
NAME ${test_name}
COMMAND
${Python3_EXECUTABLE}
$<TARGET_FILE:rocprofiler-sdk::convert-counters-collection-format>
--input ${CMAKE_CURRENT_BINARY_DIR}/out_conversion_script --output
${output} --retain-agent-prefix)
add_test(NAME ${validate_test_name}
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py
--input ${output} --retain-agent-prefix true)
else()
add_test(
NAME ${test_name}
COMMAND
${Python3_EXECUTABLE}
$<TARGET_FILE:rocprofiler-sdk::convert-counters-collection-format>
--input ${CMAKE_CURRENT_BINARY_DIR}/out_conversion_script --output
${output})
add_test(NAME ${validate_test_name}
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py
--input ${output} --retain-agent-prefix false)
endif()
set_tests_properties(
${test_name}
PROPERTIES TIMEOUT 45 LABELS "integration-tests" DEPENDS
test-conversion-script-execute FAIL_REGULAR_EXPRESSION
"${ROCPROFILER_DEFAULT_FAIL_REGEX}")
set_tests_properties(
${validate_test_name}
PROPERTIES TIMEOUT 45 LABELS "integration-tests" DEPENDS ${test_name}
FAIL_REGULAR_EXPRESSION "${ROCPROFILER_DEFAULT_FAIL_REGEX}")
endforeach()
projects/rocprofiler-sdk/tests/conversion-script/conftest.py
+8
View File
@@ -29,6 +29,9 @@ import pandas as pd
def pytest_addoption(parser):
parser.addoption("--input", action="store", help="Path to csv file.")
parser.addoption(
"--retain-agent-prefix", action="store", help="retain agent prefix flag."
)
@pytest.fixture
@@ -36,3 +39,8 @@ def input_data(request):
filename = request.config.getoption("--input")
with open(filename, "r") as inp:
return pd.read_csv(inp)
@pytest.fixture
def retain_agent_prefix_flag(request):
return request.config.getoption("--retain-agent-prefix")
projects/rocprofiler-sdk/tests/conversion-script/validate.py
+8 -3
View File
@@ -35,11 +35,16 @@ kernel_list = sorted(
counters_list = ["SQ_WAVES", "GRBM_GUI_ACTIVE"]
def test_validate_counter_collection_pmc1(input_data: pd.DataFrame):
def test_validate_counter_collection_pmc1(
input_data: pd.DataFrame, retain_agent_prefix_flag
):
df = input_data
assert not df.empty
df_agent_id = df["Agent_Id"].str.split(" ").str[-1]
assert (df_agent_id.astype(int).values >= 0).all()
if retain_agent_prefix_flag == "true":
df_agent_id = df["Agent_Id"].str.split(" ").str[-1]
assert (df_agent_id.astype(int).values >= 0).all()
else:
assert (df["Agent_Id"].astype(int).values > 0).all()
assert (df["Queue_Id"].astype(int).values > 0).all()
assert len(df["Kernel_Name"]) > 0