From 3a9daabe86826008f29254cbbcd6fd577094b361 Mon Sep 17 00:00:00 2001
From: geomin12 <geomin12@amd.com>
Date: Thu, 31 Jul 2025 12:07:47 -0700
Subject: [PATCH 1/5] Adding monorepo check for ck

---
 ml-libs/CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ml-libs/CMakeLists.txt b/ml-libs/CMakeLists.txt
index 80bb639c449..be391d00d8c 100644
--- a/ml-libs/CMakeLists.txt
+++ b/ml-libs/CMakeLists.txt
@@ -11,8 +11,15 @@ if(THEROCK_ENABLE_COMPOSABLE_KERNEL)
   ##############################################################################
   # TODO: Move this to math-libs
 
+  if(THEROCK_USE_EXTERNAL_ROCM_LIBRARIES)
+    set(_composablekernel_source_dir "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR}/projects/composablekernel")
+  else()
+    set(_composablekernel_source_dir "composable_kernel")
+  endif()
+
   therock_cmake_subproject_declare(composable_kernel
-    EXTERNAL_SOURCE_DIR "composable_kernel"
+    EXTERNAL_SOURCE_DIR "${_composablekernel_source_dir}"
+    BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/composable_kernel"
     BACKGROUND_BUILD
     CMAKE_ARGS
       -DHIP_PLATFORM=amd

From c6e3ad961f66ad8072ca3a757a4b238d08de8bf3 Mon Sep 17 00:00:00 2001
From: geomin12 <geomin12@amd.com>
Date: Thu, 31 Jul 2025 13:55:54 -0700
Subject: [PATCH 2/5] Adding mxdatagenerator for monorepo

---
 math-libs/support/CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/math-libs/support/CMakeLists.txt b/math-libs/support/CMakeLists.txt
index c812019ecf8..b82dabf08f9 100644
--- a/math-libs/support/CMakeLists.txt
+++ b/math-libs/support/CMakeLists.txt
@@ -2,8 +2,15 @@
 # mxDataGenerator
 ################################################################################
 
+if(THEROCK_USE_EXTERNAL_ROCM_LIBRARIES)
+  set(_mxdatagenerator_source_dir "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR}/shared/mxdatagenerator")
+else()
+  set(_mxdatagenerator_source_dir "mxDataGenerator")
+endif()
+
 therock_cmake_subproject_declare(mxDataGenerator
-  EXTERNAL_SOURCE_DIR "mxDataGenerator"
+  EXTERNAL_SOURCE_DIR "${_mxdatagenerator_source_dir}"
+  BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/mxDataGenerator"
   BACKGROUND_BUILD
   CMAKE_ARGS
     # TODO: Enable tests once there is install support

From 3698ec6408e47af372beae433e4c2ca551fe59ed Mon Sep 17 00:00:00 2001
From: geomin12 <geomin12@amd.com>
Date: Thu, 31 Jul 2025 14:23:47 -0700
Subject: [PATCH 3/5] adding blas common

---
 math-libs/BLAS/CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt
index 69223b363b1..8e29c877937 100644
--- a/math-libs/BLAS/CMakeLists.txt
+++ b/math-libs/BLAS/CMakeLists.txt
@@ -18,8 +18,15 @@ endif()
 ##############################################################################
 set(_blas_subproject_names)
 
+if(THEROCK_USE_EXTERNAL_ROCM_LIBRARIES)
+  set(_hipblas_common_source_dir "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR}/projects/hipblas-common")
+else()
+  set(_hipblas_common_source_dir "hipBLAS-common")
+endif()
+
 therock_cmake_subproject_declare(hipBLAS-common
-EXTERNAL_SOURCE_DIR "hipBLAS-common"
+EXTERNAL_SOURCE_DIR "${_hipblas_common_source_dir}"
+BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/hipBLAS-common"
 BACKGROUND_BUILD
 COMPILER_TOOLCHAIN
   amd-hip

From e2402989f8c6c21190dd8ae619cf547b447aa127 Mon Sep 17 00:00:00 2001
From: geomin12 <geomin12@amd.com>
Date: Thu, 31 Jul 2025 14:57:33 -0700
Subject: [PATCH 4/5] Adding rocroller

---
 math-libs/BLAS/CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt
index 8e29c877937..a2305fa2200 100644
--- a/math-libs/BLAS/CMakeLists.txt
+++ b/math-libs/BLAS/CMakeLists.txt
@@ -54,9 +54,16 @@ else()
   set(_enable_rocRoller "ON")
 endif()
 
+if(THEROCK_USE_EXTERNAL_ROCM_LIBRARIES)
+  set(_rocroller_source_dir "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR}/shared/rocroller")
+else()
+  set(_rocroller_source_dir "rocRoller")
+endif()
+
 if(_enable_rocRoller)
   therock_cmake_subproject_declare(rocRoller
-    EXTERNAL_SOURCE_DIR "rocRoller"
+    EXTERNAL_SOURCE_DIR "${_rocroller_source_dir}"
+    BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/rocRoller"
     BACKGROUND_BUILD
     CMAKE_ARGS
       -DHIP_PLATFORM=amd

From d7af9e5c34cede37e66f986982200ceb4b395112 Mon Sep 17 00:00:00 2001
From: geomin12 <geomin12@amd.com>
Date: Fri, 1 Aug 2025 10:39:13 -0700
Subject: [PATCH 5/5] revert rocroller update

---
 math-libs/BLAS/CMakeLists.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/math-libs/BLAS/CMakeLists.txt b/math-libs/BLAS/CMakeLists.txt
index e860d6d0ca2..523ab05d920 100644
--- a/math-libs/BLAS/CMakeLists.txt
+++ b/math-libs/BLAS/CMakeLists.txt
@@ -60,12 +60,6 @@ else()
   set(_enable_rocRoller "ON")
 endif()
 
-if(THEROCK_USE_EXTERNAL_ROCM_LIBRARIES)
-  set(_rocroller_source_dir "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR}/shared/rocroller")
-else()
-  set(_rocroller_source_dir "rocRoller")
-endif()
-
 if(_enable_rocRoller)
   therock_cmake_subproject_declare(rocRoller
     EXTERNAL_SOURCE_DIR "${_rocroller_source_dir}"