From 7f5e4d980a78448b0215e74563e0c03d442e8310 Mon Sep 17 00:00:00 2001 From: Tulebaev Date: Wed, 18 Mar 2026 17:40:26 +0100 Subject: [PATCH] Fixes a CMake warning 'unhashable type: list' --- projects/miopen/CMakeLists.txt | 27 +++++++++---------- .../miopen/test/gtest/test_categories.yaml | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/projects/miopen/CMakeLists.txt b/projects/miopen/CMakeLists.txt index 989cb438e040..c09049a5e420 100644 --- a/projects/miopen/CMakeLists.txt +++ b/projects/miopen/CMakeLists.txt @@ -48,7 +48,9 @@ else() endif() # Default installation path -if(NOT WIN32) +if(WIN32) + set(CMAKE_INSTALL_PREFIX $ENV{HIP_PATH}) +else() set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "") endif() @@ -142,7 +144,7 @@ if(NOT WIN32) check_cxx_linker_flag(-lstdc++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}/llvm ${CMAKE_INSTALL_PREFIX}/hip) option(ENABLE_HIP_WORKAROUNDS Off) set(MIOPEN_INSTALL_CXX_HEADERS Off CACHE BOOL "Install MIOpen's C++ header interface") @@ -182,17 +184,15 @@ if(MIOPEN_EMBED_BUILD) endif() endif() -set( MIOPEN_BACKEND ${MIOPEN_DEFAULT_BACKEND} CACHE STRING - "Which of MIOpens's backends to use?" ) -set_property( CACHE MIOPEN_BACKEND PROPERTY STRINGS - OpenCL HIP HIPOC HIPNOGPU) +set( MIOPEN_BACKEND ${MIOPEN_DEFAULT_BACKEND} CACHE STRING "Which of MIOpens's backends to use?" ) +set_property( CACHE MIOPEN_BACKEND PROPERTY STRINGS OpenCL HIP HIPOC HIPNOGPU ) set_var_to_condition(MIOPEN_BUILD_DRIVER_DEFAULT (NOT MIOPEN_EMBED_BUILD) AND (NOT (MIOPEN_BACKEND STREQUAL "HIPNOGPU"))) option(MIOPEN_BUILD_DRIVER "Build MIOpenDriver (and use it in tests)" ${MIOPEN_BUILD_DRIVER_DEFAULT}) message(STATUS "MIOPEN_BUILD_DRIVER: ${MIOPEN_BUILD_DRIVER}" ) # OpenCL 1.2 -if( MIOPEN_BACKEND STREQUAL "OpenCL") +if(MIOPEN_BACKEND STREQUAL "OpenCL") set(MIOPEN_BACKEND_OPENCL 1) find_package( OpenCL REQUIRED ) find_program(MIOPEN_HIP_COMPILER clang++ @@ -314,12 +314,11 @@ message(STATUS "Hip compiler flags: ${HIP_COMPILER_FLAGS}") add_compile_definitions($<$:HIP_COMPILER_FLAGS=${HIP_COMPILER_FLAGS}>) # HIP -if( MIOPEN_BACKEND STREQUAL "HIP" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN_BACKEND STREQUAL "HIPNOGPU") +if(MIOPEN_BACKEND MATCHES "^HIP") # "HIP","HIPOC","HIPNOGPU" if(MIOPEN_USE_COMPOSABLEKERNEL) if(MIOPEN_BUILD_CK) include(cmake/Dependencies.cmake) - - execute_process ( + execute_process( COMMAND bash -c "grep -P -o '^[ \t]*(?