Skip to content

Commit

Permalink
fixup! fixup! composable-kernel: Update to v6.2.4
Browse files Browse the repository at this point in the history
Signed-off-by: Gavin Zhao <[email protected]>
  • Loading branch information
GZGavinZhao committed Dec 5, 2024
1 parent fde1ece commit 8ceae09
Show file tree
Hide file tree
Showing 5 changed files with 103 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b5b20e472e7511be93773fb763f5f09e10884a89 Mon Sep 17 00:00:00 2001
From: Gavin Zhao <[email protected]>
Date: Thu, 28 Nov 2024 11:44:00 -0500
Subject: [PATCH 1/3] Add ck_ prefix to library names to prevent conflicts
Subject: [PATCH 1/4] Add ck_ prefix to library names to prevent conflicts

Signed-off-by: Gavin Zhao <[email protected]>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From babae171c02af602fee06f396139e30ffed25985 Mon Sep 17 00:00:00 2001
From: Gavin Zhao <[email protected]>
Date: Thu, 28 Nov 2024 11:56:12 -0500
Subject: [PATCH 2/3] Allow compilation for RDNA1 (__gfx101__)
Subject: [PATCH 2/4] Allow compilation for RDNA1 (__gfx101__)

Signed-off-by: Gavin Zhao <[email protected]>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e42461b32936c76e171d57b28cea034085850367 Mon Sep 17 00:00:00 2001
From: Gavin Zhao <[email protected]>
Date: Thu, 28 Nov 2024 11:58:37 -0500
Subject: [PATCH 3/3] Allow building as shared libs
Subject: [PATCH 3/4] Allow building as shared libs

Signed-off-by: Gavin Zhao <[email protected]>
---
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
From 1e84a973b5df0d055547e99c37d78dc72c2be9f2 Mon Sep 17 00:00:00 2001
From: Gavin Zhao <[email protected]>
Date: Wed, 4 Dec 2024 22:56:54 -0500
Subject: [PATCH 4/4] Add SOVERSION to libraries

Signed-off-by: Gavin Zhao <[email protected]>
---
.../gpu/CMakeLists.txt | 24 +++++++++++++++++++
library/src/utility/CMakeLists.txt | 4 ++++
2 files changed, 28 insertions(+)

diff --git a/library/src/tensor_operation_instance/gpu/CMakeLists.txt b/library/src/tensor_operation_instance/gpu/CMakeLists.txt
index e1c26d12e..919cc8dc3 100644
--- a/library/src/tensor_operation_instance/gpu/CMakeLists.txt
+++ b/library/src/tensor_operation_instance/gpu/CMakeLists.txt
@@ -223,6 +223,10 @@ if(CK_DEVICE_OTHER_INSTANCES)
add_library(composablekernels::device_other_operations ALIAS device_other_operations)
set_target_properties(device_other_operations PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(device_other_operations PROPERTIES OUTPUT_NAME ck_device_other_operations)
+ set_target_properties(device_other_operations
+ PROPERTIES
+ VERSION ${CMAKE_PROJECT_VERSION}
+ SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR})
target_include_directories(device_other_operations PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/utility>
@@ -256,6 +260,10 @@ if(CK_DEVICE_GEMM_INSTANCES)
target_compile_features(device_gemm_operations PUBLIC)
set_target_properties(device_gemm_operations PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(device_gemm_operations PROPERTIES OUTPUT_NAME ck_device_gemm_operations)
+ set_target_properties(device_gemm_operations
+ PROPERTIES
+ VERSION ${CMAKE_PROJECT_VERSION}
+ SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR})
target_include_directories(device_gemm_operations PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/library/tensor_operation_instance/gpu>
)
@@ -273,6 +281,10 @@ if(CK_DEVICE_CONV_INSTANCES)
target_compile_features(device_conv_operations PUBLIC)
set_target_properties(device_conv_operations PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(device_conv_operations PROPERTIES OUTPUT_NAME ck_device_conv_operations)
+ set_target_properties(device_conv_operations
+ PROPERTIES
+ VERSION ${CMAKE_PROJECT_VERSION}
+ SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR})
target_include_directories(device_conv_operations PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/library/tensor_operation_instance/gpu>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/library/tensor_operation_instance/gpu/conv_tensor_rearrange>
@@ -294,6 +306,10 @@ if(CK_DEVICE_MHA_INSTANCES)
target_compile_features(device_mha_operations PUBLIC)
set_target_properties(device_mha_operations PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(device_mha_operations PROPERTIES OUTPUT_NAME ck_device_mha_operations)
+ set_target_properties(device_mha_operations
+ PROPERTIES
+ VERSION ${CMAKE_PROJECT_VERSION}
+ SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR})
target_include_directories(device_mha_operations PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/library/tensor_operation_instance/gpu/mha>
)
@@ -311,6 +327,10 @@ if(CK_DEVICE_CONTRACTION_INSTANCES)
target_compile_features(device_contraction_operations PUBLIC)
set_target_properties(device_contraction_operations PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(device_contraction_operations PROPERTIES OUTPUT_NAME ck_device_contraction_operations)
+ set_target_properties(device_contraction_operations
+ PROPERTIES
+ VERSION ${CMAKE_PROJECT_VERSION}
+ SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR})
target_include_directories(device_contraction_operations PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/library/tensor_operation_instance/gpu>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/library/tensor_operation_instance/gpu/contraction>
@@ -329,6 +349,10 @@ if(CK_DEVICE_REDUCTION_INSTANCES)
target_compile_features(device_reduction_operations PUBLIC)
set_target_properties(device_reduction_operations PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(device_reduction_operations PROPERTIES OUTPUT_NAME ck_device_reduction_operations)
+ set_target_properties(device_reduction_operations
+ PROPERTIES
+ VERSION ${CMAKE_PROJECT_VERSION}
+ SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR})
target_include_directories(device_reduction_operations PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/library/tensor_operation_instance/gpu/reduce>
)
diff --git a/library/src/utility/CMakeLists.txt b/library/src/utility/CMakeLists.txt
index 62fe1d224..5f87b44e3 100644
--- a/library/src/utility/CMakeLists.txt
+++ b/library/src/utility/CMakeLists.txt
@@ -6,6 +6,10 @@ add_library(utility

add_library(composable_kernel::utility ALIAS utility)
set_target_properties(utility PROPERTIES POSITION_INDEPENDENT_CODE ON)
+set_target_properties(utility
+ PROPERTIES
+ VERSION ${CMAKE_PROJECT_VERSION}
+ SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR})
target_compile_options(utility PRIVATE ${CMAKE_COMPILER_WARNINGS})
target_include_directories(utility PUBLIC
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck>"
--
2.47.0

1 change: 1 addition & 0 deletions packages/c/composable-kernel/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ setup : |
%patch -p1 -i $pkgfiles/0001-Add-ck_-prefix-to-library-names-to-prevent-conflicts.patch
%patch -p1 -i $pkgfiles/0002-Allow-compilation-for-RDNA1-__gfx101__.patch
%patch -p1 -i $pkgfiles/0003-Allow-building-as-shared-libs.patch
%patch -p1 -i $pkgfiles/0004-Add-SOVERSION-to-libraries.patch
%cmake_ninja -L \
-DCMAKE_BUILD_TYPE=Release \
Expand Down

0 comments on commit 8ceae09

Please sign in to comment.