File miopen-fix-build.patch of Package miopen

Overview Repositories Revisions Requests Users Attributes Meta

File miopen-fix-build.patch of Package miopen

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0ffaf98..7c97d1c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,7 @@ if(NOT WIN32)
     check_cxx_linker_flag(stdc++fs HAS_LIB_STD_FILESYSTEM)
 endif()
 
-list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_PREFIX}/llvm ${CMAKE_INSTALL_PREFIX}/hip /opt/rocm /opt/rocm/llvm /opt/rocm/hip)
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_PREFIX}/rocm ${CMAKE_INSTALL_PREFIX}/hip)
 
 option(ENABLE_HIP_WORKAROUNDS Off)
 set(MIOPEN_INSTALL_CXX_HEADERS Off CACHE BOOL "Install MIOpen's C++ header interface")
@@ -309,11 +309,10 @@ if( MIOPEN_BACKEND STREQUAL "HIP" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN_B
     endif()
     set(MIOPEN_BACKEND_HIP 1)
 
-    find_program(HIP_OC_COMPILER NAMES amdclang clang
+    find_program(HIP_OC_COMPILER NAMES clang-rocm
         PATH_SUFFIXES bin
         PATHS
-            /opt/rocm
-            ${CMAKE_INSTALL_PREFIX}
+            /usr
         ENV HIP_PATH
     )
     if(HIP_OC_COMPILER)
@@ -347,11 +346,10 @@ message( STATUS "${MIOPEN_BACKEND} backend selected." )
 
 # look for and register clang-offload-bundler
 if(MIOPEN_HIP_COMPILER MATCHES ".*clang\\+\\+.*")
-    find_program(MIOPEN_OFFLOADBUNDLER_BIN clang-offload-bundler
+    find_program(MIOPEN_OFFLOADBUNDLER_BIN
+        NAMES         clang-offload-bundler-rocm
         PATH_SUFFIXES bin
-        PATHS
-            /opt/rocm/llvm
-            ${CMAKE_INSTALL_PREFIX}/llvm
+        PATHS         /usr
     )
 endif()
 if(MIOPEN_OFFLOADBUNDLER_BIN)
@@ -402,17 +400,9 @@ set(MIOPEN_PACKAGE_REQS "${DEPENDS_HIP_RUNTIME}")
 
 # Online assembler
 find_program(MIOPEN_AMDGCN_ASSEMBLER
-    NAMES clang
-    PATHS
-        ${MIOPEN_AMDGCN_ASSEMBLER_PATH}
-        /opt/rocm
-        /opt/rocm/llvm
-        ${CMAKE_INSTALL_PREFIX}
-        ${CMAKE_INSTALL_PREFIX}/llvm
-    PATH_SUFFIXES
-        /opencl/bin/x86_64
-        /opencl/bin
-        /bin
+    NAMES         clang-rocm
+    PATH_SUFFIXES bin
+    PATHS         /usr
 )
 message(STATUS "AMDGCN assembler: ${MIOPEN_AMDGCN_ASSEMBLER}")
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 49c6bb2b..13593f42 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -761,9 +761,10 @@ rocm_set_soversion(MIOpen ${MIOpen_SOVERSION})
 
 clang_tidy_check(MIOpen)
 
-find_package(zstd)
+find_package(Zstd REQUIRED)
 if(zstd_FOUND)
-    target_link_libraries(MIOpen PRIVATE $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
+    target_include_directories(MIOpen PRIVATE ${ZSTD_INCLUDE_DIR})
+    target_link_libraries(MIOpen PRIVATE ${ZSTD_LIBRARY})
 endif()
 
 function(target_internal_library TARGET)

Places

File miopen-fix-build.patch of Package miopen

Places