1
1
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
- index 6fc22b18..c2c22925 100644
2
+ index bdeba33e..afe406b3 100644
3
3
--- a/CMakeLists.txt
4
4
+++ b/CMakeLists.txt
5
- @@ -19 ,7 +19 ,7 @@ endif()
5
+ @@ -23 ,7 +23 ,7 @@ endif()
6
6
7
7
set(version 1.1.0)
8
8
# Check support for CUDA/HIP in Cmake
9
- - project(composable_kernel VERSION ${version})
9
+ - project(composable_kernel VERSION ${version} LANGUAGES CXX )
10
10
+ project(composable_kernel VERSION ${version} LANGUAGES CXX HIP)
11
+ include(CTest)
11
12
12
13
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
13
-
14
- @@ -201,27 +201,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
14
+ @@ -206,27 +206,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
15
15
set(CMAKE_CXX_EXTENSIONS OFF)
16
16
message("CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
17
17
@@ -39,16 +39,20 @@ index 6fc22b18..c2c22925 100644
39
39
## HIP
40
40
find_package(HIP REQUIRED)
41
41
# Override HIP version in config.h, if necessary.
42
- @@ -243,8 +222 ,6 @@ if( DEFINED CK_OVERRIDE_HIP_VERSION_PATCH )
42
+ @@ -248,12 +227 ,6 @@ if( DEFINED CK_OVERRIDE_HIP_VERSION_PATCH )
43
43
message(STATUS "CK_HIP_VERSION_PATCH overriden with ${CK_OVERRIDE_HIP_VERSION_PATCH}")
44
44
endif()
45
45
message(STATUS "Build with HIP ${HIP_VERSION}")
46
46
- link_libraries(hip::device)
47
- - add_compile_definitions(__HIP_PLATFORM_HCC__=1)
47
+ - if(CK_hip_VERSION VERSION_GREATER_EQUAL 6.0.23494)
48
+ - add_compile_definitions(__HIP_PLATFORM_AMD__=1)
49
+ - else()
50
+ - add_compile_definitions(__HIP_PLATFORM_HCC__=1)
51
+ - endif()
48
52
49
53
## tidy
50
54
include(EnableCompilerWarnings)
51
- @@ -509 ,11 +486 ,3 @@ rocm_install(FILES
55
+ @@ -520 ,11 +493 ,3 @@ rocm_install(FILES
52
56
53
57
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
54
58
set(CPACK_RPM_PACKAGE_LICENSE "MIT")
@@ -61,10 +65,10 @@ index 6fc22b18..c2c22925 100644
61
65
- HEADER_ONLY
62
66
- )
63
67
diff --git a/library/src/tensor_operation_instance/gpu/CMakeLists.txt b/library/src/tensor_operation_instance/gpu/CMakeLists.txt
64
- index ac01c1b4..27f2a720 100644
68
+ index 0a12e1c4..dcdaaf5a 100644
65
69
--- a/library/src/tensor_operation_instance/gpu/CMakeLists.txt
66
70
+++ b/library/src/tensor_operation_instance/gpu/CMakeLists.txt
67
- @@ -44,8 +44,14 @@ function(add_instance_library INSTANCE_NAME)
71
+ @@ -44,8 +44,13 @@ function(add_instance_library INSTANCE_NAME)
68
72
endforeach()
69
73
#only continue if there are some source files left on the list
70
74
if(ARGN)
@@ -73,13 +77,12 @@ index ac01c1b4..27f2a720 100644
73
77
+ # Always disable debug symbol and C debug assert due to
74
78
+ # - Linker error: ... relocation truncated to fit ..., caused by object files to be linked are too huge.
75
79
+ # - https://github.com/ROCmSoftwarePlatform/composable_kernel/issues/622
76
- + target_compile_options(${INSTANCE_NAME} PRIVATE -g0 -DNDEBUG)
77
80
target_compile_features(${INSTANCE_NAME} PUBLIC)
78
81
+ target_compile_definitions(${INSTANCE_NAME} PRIVATE "__HIP_PLATFORM_AMD__=1" "__HIP_PLATFORM_HCC__=1")
79
82
set_target_properties(${INSTANCE_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
80
83
clang_tidy_check(${INSTANCE_NAME})
81
84
set(result 0)
82
- @@ -281 ,4 +287 ,3 @@ set(DEV_OPS_INC_DIRS
85
+ @@ -280 ,4 +285 ,3 @@ set(DEV_OPS_INC_DIRS
83
86
${PROJECT_SOURCE_DIR}/library/include/ck/
84
87
)
85
88
rocm_install(DIRECTORY ${DEV_OPS_INC_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ck)
0 commit comments