modifications to keep code format consistent

microsoft · Jan 2, 2025 · cdb1a25 · cdb1a25
1 parent 501c02d
commit cdb1a25
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (c) Microsoft Corporation.
+# Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
 # Licensed under the MIT license.
 
 set(MSCCLPP_MAJOR "0")
@@ -20,7 +21,7 @@ option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
 option(BUILD_APPS_NCCL "Build NCCL interfaces" ON)
 option(USE_CUDA "Use NVIDIA/CUDA." OFF)
 option(USE_ROCM "Use AMD/ROCm." OFF)
-option(${NPKIT_FLAGS} "Enable NPKIT" OFF)
+option(MSCCLPP_NPKIT_FLAGS "Enable NPKIT" OFF)
 option(BYPASS_GPU_CHECK "Bypass GPU check." OFF)
 
 if(BYPASS_GPU_CHECK)
@@ -124,8 +125,8 @@ endif()
 if(ENABLE_TRACE)
     target_compile_definitions(mscclpp_obj PRIVATE ENABLE_TRACE)
 endif()
-if(NPKIT_FLAGS)
-    target_compile_definitions(mscclpp_obj PRIVATE ${NPKIT_FLAGS})
+if(MSCCLPP_NPKIT_FLAGS)
+    target_compile_definitions(mscclpp_obj PRIVATE ${MSCCLPP_NPKIT_FLAGS})
 endif()
 
 # libmscclpp

diff --git a/apps/nccl/CMakeLists.txt b/apps/nccl/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (c) Microsoft Corporation.
+# Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
 # Licensed under the MIT license.
 
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*)
@@ -19,8 +20,8 @@ if(USE_CUDA)
 elseif(USE_ROCM)
     target_compile_definitions(mscclpp_nccl_obj PRIVATE USE_ROCM)
 endif()
-if(NPKIT_FLAGS)
-    target_compile_definitions(mscclpp_nccl_obj PRIVATE ${NPKIT_FLAGS})
+if(MSCCLPP_NPKIT_FLAGS)
+    target_compile_definitions(mscclpp_nccl_obj PRIVATE ${MSCCLPP_NPKIT_FLAGS})
 endif()
 add_library(mscclpp_nccl SHARED)
 target_link_libraries(mscclpp_nccl PUBLIC mscclpp_obj mscclpp_nccl_obj)

diff --git a/apps/nccl/src/allreduce.hpp b/apps/nccl/src/allreduce.hpp
@@ -1,4 +1,5 @@
 // Copyright (c) Microsoft Corporation.
+// Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
 // Licensed under the MIT license.
 
 #ifndef ALLREDUCE_HPP_

diff --git a/apps/nccl/src/nccl.cu b/apps/nccl/src/nccl.cu
@@ -1,4 +1,5 @@
 // Copyright (c) Microsoft Corporation.
+// Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
 // Licensed under the MIT license.
 
 #include <algorithm>

diff --git a/include/mscclpp/npkit/npkit_event.hpp b/include/mscclpp/npkit/npkit_event.hpp
@@ -1,4 +1,5 @@
 // Copyright (c) Microsoft Corporation.
+// Modifications Copyright (c) Advanced Micro Devices, Inc. All rights reserved.
 // Licensed under the MIT license.
 
 #ifndef NPKIT_EVENT_H_
@@ -12,10 +13,10 @@
 #define NPKIT_EVENT_EXECUTOR_INIT_ENTRY 0x3
 #define NPKIT_EVENT_EXECUTOR_INIT_EXIT 0x4
 
-#define NPKIT_EVENT_EXECUTOR_OP_BASE_ENTRY 0x5
-#define NPKIT_EVENT_EXECUTOR_OP_BASE_EXIT 0x17
+#define NPKIT_EVENT_KERNEL_ALLREDUCE_ENTRY 0x5
+#define NPKIT_EVENT_KERNEL_ALLREDUCE_EXIT 0x6
 
-#define NPKIT_EVENT_KERNEL_ALLREDUCE_ENTRY 0x6
-#define NPKIT_EVENT_KERNEL_ALLREDUCE_EXIT 0x7
+#define NPKIT_EVENT_EXECUTOR_OP_BASE_ENTRY 0x7
+#define NPKIT_EVENT_EXECUTOR_OP_BASE_EXIT 0x19
 
 #endif