Move composable_kernel to deps.txt (microsoft#17245)

intel · Aug 24, 2023 · 87bef1f · 87bef1f
1 parent 33c87f6
commit 87bef1f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json
@@ -377,6 +377,16 @@
         },
         "comments": "extensions"
       }
+    },
+    {
+      "component": {
+        "type": "git",
+        "git": {
+          "commitHash": "d52ec01652b7d620386251db92455968d8d90bdc",
+          "repositoryUrl": "https://github.com/ROCmSoftwarePlatform/composable_kernel.git"
+        },
+        "comments": "composable_kernel"
+      }
     }
   ]
 }
diff --git a/cmake/deps.txt b/cmake/deps.txt
@@ -43,3 +43,4 @@ tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2
 cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.0.0.zip;0f95b3c1fc1bd1175c4a90b2c9e39074d1bccefd
 extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d8391c9791ec71c38336436319a2d4ac7a0.zip;4365ac5140338b4cb75a39944a4be276e3829b3c
 eigen;https://gitlab.com/libeigen/eigen/-/archive/3.4/eigen-3.4.zip;ee201b07085203ea7bd8eb97cbcb31b07cfa3efb
+composable_kernel;https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/d52ec01652b7d620386251db92455968d8d90bdc.zip;6b5ce8edf3625f8817086c194fbf94b664e1b0e0
diff --git a/cmake/external/composable_kernel.cmake b/cmake/external/composable_kernel.cmake
@@ -1,13 +1,10 @@
-set(composable_kernel_URL https://github.com/ROCmSoftwarePlatform/composable_kernel.git)
-set(composable_kernel_TAG d52ec01652b7d620386251db92455968d8d90bdc) # 2023-08-18 11:14:59 +0800
-
 set(PATCH ${PROJECT_SOURCE_DIR}/patches/composable_kernel/Fix_Clang_Build.patch)
 
 include(FetchContent)
 FetchContent_Declare(composable_kernel
-  GIT_REPOSITORY ${composable_kernel_URL}
-  GIT_TAG        ${composable_kernel_TAG}
-  PATCH_COMMAND  git apply --reverse --check ${PATCH} || git apply --ignore-space-change --ignore-whitespace ${PATCH}
+  URL ${DEP_URL_composable_kernel}
+  URL_HASH SHA1=${DEP_SHA1_composable_kernel}
+  PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PATCH}
 )
 
 FetchContent_GetProperties(composable_kernel)

diff --git a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml
@@ -11,7 +11,7 @@ steps:
       packageType: upack
       feed: '/7424c8e4-5c62-490e-95c4-79446f31017c'
       definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0'
-      version: 1.0.77
+      version: 1.0.78
       downloadPath: $(Build.BinariesDirectory)/deps
 
 # The private ADO project
@@ -22,7 +22,7 @@ steps:
       packageType: upack
       feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325'
       definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a'
-      version: 1.0.77
+      version: 1.0.78
       downloadPath: $(Build.BinariesDirectory)/deps
 
 # You can add more ADO accounts at here.