From c8f4dedfd19ee6c0ff72a40893faabb11321bfb4 Mon Sep 17 00:00:00 2001
From: corey-derochie-amd
 <161367113+corey-derochie-amd@users.noreply.github.com>
Date: Wed, 11 Sep 2024 16:54:26 -0600
Subject: [PATCH] Added nlohmann/json:v3.11.3 as a submodule in ext-src and
 passed its path into the mscclpp build to avoid downloading the package at
 build time. (#1330)

[ROCm/rccl commit: b3b0ffdbf351b4538774582a23288fea289c9a97]
---
 projects/rccl/.gitmodules         | 4 ++++
 projects/rccl/cmake/MSCCLPP.cmake | 2 +-
 projects/rccl/ext-src/json        | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 160000 projects/rccl/ext-src/json

diff --git a/projects/rccl/.gitmodules b/projects/rccl/.gitmodules
index 7d2c7eff3b..43f5bd06a7 100644
--- a/projects/rccl/.gitmodules
+++ b/projects/rccl/.gitmodules
@@ -2,3 +2,7 @@
 	path = ext-src/mscclpp
 	url = https://github.com/microsoft/mscclpp.git
 	ignore = dirty
+[submodule "ext-src/json"]
+	path = ext-src/json
+	url = https://github.com/nlohmann/json.git
+	ignore = dirty
diff --git a/projects/rccl/cmake/MSCCLPP.cmake b/projects/rccl/cmake/MSCCLPP.cmake
index 2aeb821132..f0d60a3e87 100644
--- a/projects/rccl/cmake/MSCCLPP.cmake
+++ b/projects/rccl/cmake/MSCCLPP.cmake
@@ -76,7 +76,7 @@ if(ENABLE_MSCCLPP)
                          # GIT_REPOSITORY      https://github.com/microsoft/mscclpp.git
                          # GIT_TAG             1e82dd444fc1ed8b7add354eebaab8a94e67d5fc
                          INSTALL_DIR         ${MSCCLPP_ROOT}
-                         CMAKE_ARGS          -DGPU_TARGETS=gfx942 -DBYPASS_GPU_CHECK=ON -DUSE_ROCM=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_APPS_NCCL=ON -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> "${CMAKE_PREFIX_PATH_ARG}" "${CMAKE_SHARED_LINKER_FLAGS_INIT_ARG}" "${CMAKE_EXE_LINKER_FLAGS_INIT_ARG}" -DCMAKE_VERBOSE_MAKEFILE=1 "${CMAKE_INSTALL_RPATH_USE_LINK_PATH_ARG}" "${HIP_COMPILER_ARG}"
+                         CMAKE_ARGS          -DGPU_TARGETS=gfx942 -DBYPASS_GPU_CHECK=ON -DUSE_ROCM=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_APPS_NCCL=ON -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> "${CMAKE_PREFIX_PATH_ARG}" "${CMAKE_SHARED_LINKER_FLAGS_INIT_ARG}" "${CMAKE_EXE_LINKER_FLAGS_INIT_ARG}" -DCMAKE_VERBOSE_MAKEFILE=1 "${CMAKE_INSTALL_RPATH_USE_LINK_PATH_ARG}" "${HIP_COMPILER_ARG}" -DFETCHCONTENT_SOURCE_DIR_JSON=${CMAKE_CURRENT_SOURCE_DIR}/ext-src/json
                          LOG_DOWNLOAD        FALSE
                          LOG_CONFIGURE       FALSE
                          LOG_BUILD           FALSE
diff --git a/projects/rccl/ext-src/json b/projects/rccl/ext-src/json
new file mode 160000
index 0000000000..9cca280a4d
--- /dev/null
+++ b/projects/rccl/ext-src/json
@@ -0,0 +1 @@
+Subproject commit 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03