Merge pull request #1280 from aarongreig/aaron/hotFixFindRocm

aarongreig · web-flow · commit b66cf9b198c6 · 2024-01-26T09:57:01.000Z
Fix typo in FindRocmAgentEnumerator.cmake
diff --git a/cmake/FindRocmAgentEnumerator.cmake b/cmake/FindRocmAgentEnumerator.cmake
@@ -9,7 +9,7 @@
 #                                  rocm_agent_enumerator is found.
 #
 
-find_program(ROCM_AGENT_ENUMERATOR NAMES not_rocm_agent_enumerator)
+find_program(ROCM_AGENT_ENUMERATOR NAMES rocm_agent_enumerator)
 
 if(ROCM_AGENT_ENUMERATOR)
     set(ROCM_AGENT_ENUMERATOR_FOUND TRUE)
diff --git a/test/conformance/device_code/CMakeLists.txt b/test/conformance/device_code/CMakeLists.txt
@@ -58,6 +58,10 @@ macro(add_device_binary SOURCE_FILE)
             set(AMD_TARGET_BACKEND -Xsycl-target-backend=${TRIPLE})
             set(AMD_OFFLOAD_ARCH  --offload-arch=${AMD_ARCH})
             set(AMD_NOGPULIB -nogpulib)
+        else()
+            set(AMD_TARGET_BACKEND)
+            set(AMD_OFFLOAD_ARCH)
+            set(AMD_NOGPULIB)
         endif()
         # images are not yet supported in sycl on AMD
         if(${TRIPLE} MATCHES "amd" AND ${KERNEL_NAME} MATCHES "image_copy")

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`# rocm_agent_enumerator is found.`
`10`	`10`	`#`
`11`	`11`
`12`		`-find_program(ROCM_AGENT_ENUMERATOR NAMES not_rocm_agent_enumerator)`
	`12`	`+find_program(ROCM_AGENT_ENUMERATOR NAMES rocm_agent_enumerator)`
`13`	`13`
`14`	`14`	`if(ROCM_AGENT_ENUMERATOR)`
`15`	`15`	`set(ROCM_AGENT_ENUMERATOR_FOUND TRUE)`