Skip to content

Commit f65ab2b

Browse files
committed
fix only the windows AMD_COMPUTE_WIN path
linux is not impacted
1 parent 60263fe commit f65ab2b

1 file changed

Lines changed: 9 additions & 14 deletions

File tree

projects/clr/rocclr/cmake/ROCclrHSA.cmake

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,12 @@ else()
4343
if(UNIX)
4444
find_package(hsa-runtime64 1.11 REQUIRED CONFIG
4545
PATHS
46-
${ROCCLR_SRC_DIR}/../../rocr-runtime
47-
${CMAKE_CURRENT_BINARY_DIR}/../../rocr
4846
${ROCM_PATH}
4947
${ROCM_INSTALL_PATH}
5048
PATH_SUFFIXES
5149
cmake/hsa-runtime64
5250
lib/cmake/hsa-runtime64
53-
lib64/cmake/hsa-runtime64
54-
NO_DEFAULT_PATH)
51+
lib64/cmake/hsa-runtime64)
5552
else()
5653
find_package(hsa-runtime64 1.11 REQUIRED CONFIG
5754
PATHS
@@ -69,21 +66,19 @@ else()
6966

7067
# note: Temporarily for PAL backend build
7168
find_path(AMD_HSA_INCLUDE_DIR hsa.h
72-
PATHS
73-
${ROCCLR_SRC_DIR}/../../rocr-runtime/runtime/hsa-runtime/inc
74-
${ROCCLR_SRC_DIR}/../../rocr-runtime/runtime/hsa-runtime
75-
${CMAKE_CURRENT_BINARY_DIR}/../../rocr/inc
76-
${CMAKE_CURRENT_BINARY_DIR}/../../rocr
77-
${CMAKE_CURRENT_BINARY_DIR}/../..
78-
${CMAKE_CURRENT_BINARY_DIR}/..
79-
${CMAKE_CURRENT_BINARY_DIR}
69+
HINTS
8070
${ROCM_PATH}
8171
${ROCM_INSTALL_PATH}
72+
${CMAKE_CURRENT_BINARY_DIR}
73+
PATHS
74+
${CMAKE_CURRENT_BINARY_DIR}/..
75+
${CMAKE_CURRENT_BINARY_DIR}/../..
76+
${CMAKE_CURRENT_BINARY_DIR}/../../rocr
77+
${ROCCLR_SRC_DIR}/../../rocr-runtime/runtime/hsa-runtime
8278
PATH_SUFFIXES
8379
include
8480
include/hsa
85-
inc
86-
NO_DEFAULT_PATH)
81+
inc)
8782
message("Roc CLR: " ${ROCCLR_SRC_DIR} "; HSA headers:" ${AMD_HSA_INCLUDE_DIR})
8883
target_include_directories(rocclr PUBLIC ${AMD_HSA_INCLUDE_DIR})
8984
target_include_directories(rocclr PUBLIC ${AMD_HSA_INCLUDE_DIR}/..)

0 commit comments

Comments
 (0)