Skip to content
Draft
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
30 changes: 29 additions & 1 deletion core/CMakeLists.txt
Copy link
Member

Choose a reason for hiding this comment

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

Nice, thanks for taking this on! Since this isn't marked as a draft PR, I'll leave some review comments.

Please fill in the PR description and tag #1354 .

Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
##############################################################################
set(HIP_CLR_CMAKE_ARGS)
set(HIP_CLR_RUNTIME_DEPS)
set(_hip_subproject_names)

if(WIN32)
# Windows CLR options
set(_compute_pal_dir "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/shared/amdgpu-windows-interop")
Expand Down Expand Up @@ -133,6 +135,31 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
therock_cmake_subproject_provide_package(hip-clr hip-lang lib/cmake/hip-lang)
therock_cmake_subproject_provide_package(hip-clr hiprtc lib/cmake/hiprtc)
therock_cmake_subproject_activate(hip-clr)
list(APPEND _hip_subproject_names hip-clr)

if(THEROCK_BUILD_TESTING)
therock_cmake_subproject_declare(hip-tests
USE_DIST_AMDGPU_TARGETS
EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/hip-tests"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/hip-tests"
CMAKE_LISTS_RELPATH "catch"
LOGICAL_TARGET_NAME build_tests
BACKGROUND_BUILD
CMAKE_ARGS
"-DHIP_PLATFORM=amd"
"-DROCM_PATH="
COMPILER_TOOLCHAIN
amd-hip
BUILD_DEPS
rocm-cmake
therock-catch2
RUNTIME_DEPS
hip-clr
)
therock_cmake_subproject_glob_c_sources(hip-tests SUBDIRS .)
therock_cmake_subproject_activate(hip-tests)
list(APPEND _hip_subproject_names hip-tests)
endif(THEROCK_BUILD_TESTING)

therock_provide_artifact(core-hip
TARGET_NEUTRAL
Expand All @@ -144,7 +171,7 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
lib
run
SUBPROJECT_DEPS
hip-clr
${_hip_subproject_names}
)

therock_test_validate_shared_lib(
Expand All @@ -154,6 +181,7 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
libhiprtc-builtins.so
libhiprtc.so
)

if(WIN32)
##############################################################################
# hipInfo (from hip-tests)
Expand Down
9 changes: 9 additions & 0 deletions core/artifact-core-hip.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,12 @@ include = [
include = [
"bin/**",
]

# hip-tests
[components.doc."core/hip-tests/stage"]
optional = true
[components.test."core/hip-tests/stage"]
include = [
"share/hip/**",
]
Comment on lines +18 to +21
Copy link
Member

Choose a reason for hiding this comment

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

Are there no binaries that should be included or are these located at share/hip?

Copy link
Contributor

Choose a reason for hiding this comment

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

From build logs in the Azure CI system that builds hip-tests, the produced files seem to only be in share/hip: https://dev.azure.com/ROCm-CI/ROCm-CI/_build/results?buildId=56010&view=logs&j=82fb555c-110a-59d3-1c2a-ac6df3710f95&t=f7e7b015-7ae0-53a0-6899-73e18ee6a991

optional = true
Loading