From d2dacc307ead15cb6351940b34c5de35a7125f85 Mon Sep 17 00:00:00 2001 From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com> Date: Fri, 8 Jul 2022 13:36:41 +0530 Subject: [PATCH] SWDEV-332251 - packaging in windows and multiple arch in catchInfo.txt (#2779) Change-Id: I627662b59de002e9042f8218478404de0aa73ea5 [ROCm/hip commit: a2313ade4c81071a38cb51817ad0606ff3590634] --- projects/hip/tests/catch/CMakeLists.txt | 3 +++ projects/hip/tests/catch/packaging/hip-tests.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/hip/tests/catch/CMakeLists.txt b/projects/hip/tests/catch/CMakeLists.txt index ff12be86e3..a8a488002d 100644 --- a/projects/hip/tests/catch/CMakeLists.txt +++ b/projects/hip/tests/catch/CMakeLists.txt @@ -41,6 +41,7 @@ if(NOT DEFINED ROCM_PATH) endif() endif() endif() +file(TO_CMAKE_PATH "${ROCM_PATH}" ROCM_PATH) message(STATUS "ROCM Path: ${ROCM_PATH}") @@ -179,6 +180,8 @@ if(NOT DEFINED OFFLOAD_ARCH_STR else() message(STATUS "ROCm Agent Enumurator found no valid architectures") endif() +elseif(DEFINED OFFLOAD_ARCH_STR) + string(REPLACE "--offload-arch=" "" HIP_GPU_ARCH_LIST ${OFFLOAD_ARCH_STR}) endif() if(DEFINED OFFLOAD_ARCH_STR) diff --git a/projects/hip/tests/catch/packaging/hip-tests.txt b/projects/hip/tests/catch/packaging/hip-tests.txt index bbf3ec0ade..77b3a0e46c 100644 --- a/projects/hip/tests/catch/packaging/hip-tests.txt +++ b/projects/hip/tests/catch/packaging/hip-tests.txt @@ -30,7 +30,7 @@ install(FILES @PROJECT_BINARY_DIR@/CTestTestfile.cmake # Packaging steps ############################# set(CPACK_SET_DESTDIR TRUE) -set(CPACK_INSTALL_PREFIX @ROCM_PATH@/test/hip/) +set(CPACK_INSTALL_PREFIX "@ROCM_PATH@/test/hip/") set(PKG_NAME catch-@HIP_PLATFORM@) set(CPACK_PACKAGE_NAME ${PKG_NAME}) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "HIP: Heterogenous-computing Interface for Portability [CATCH TESTS]")