Removing unnecessary device collective source files.

[ROCm/rccl commit: 3a61907182]

projects/rccl/CMakeLists.txt

@@ -111,20 +111,11 @@ foreach(filename ${CU_SOURCES})
   list(APPEND CPP_SOURCES ${cpp_filename})
 endforeach(filename)
 
-list(APPEND CPP_SOURCES src/collectives/device/all_gather_0.cpp)
+list(APPEND CPP_SOURCES src/collectives/device/all_gather_dev.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/all_reduce_0.cpp)
+list(APPEND CPP_SOURCES src/collectives/device/all_reduce_dev.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/all_reduce_1.cpp)
+list(APPEND CPP_SOURCES src/collectives/device/broadcast_dev.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/all_reduce_2.cpp)
+list(APPEND CPP_SOURCES src/collectives/device/reduce_dev.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/all_reduce_3.cpp)
+list(APPEND CPP_SOURCES src/collectives/device/reduce_scatter_dev.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/broadcast_0.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/reduce_0.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/reduce_1.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/reduce_2.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/reduce_3.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/reduce_scatter_0.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/reduce_scatter_1.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/reduce_scatter_2.cpp)
-list(APPEND CPP_SOURCES src/collectives/device/reduce_scatter_3.cpp)
 
 add_library(rccl ${CPP_SOURCES})
 

projects/rccl/src/collectives/device/all_gather_0.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 0
-#include "device/all_gather.cu"

projects/rccl/src/collectives/device/all_gather_dev.cpp

@@ -1,5 +1,6 @@
 /*************************************************************************
  * Copyright (c) 2015-2018, NVIDIA CORPORATION. All rights reserved.
+ * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
  *
  * See LICENSE.txt for license information
  ************************************************************************/
@@ -10,6 +11,4 @@
 
 #define UNROLL 4
 
-#if NCCL_OP == 0
 IMPL_COLL3(ncclAllGather, copy, FuncSum, i8, int8_t, ncclCollAllGather, ncclSum, ncclInt8);
-#endif

projects/rccl/src/collectives/device/all_reduce_0.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 0
-#include "device/all_reduce.cu"

projects/rccl/src/collectives/device/all_reduce_1.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 1
-#include "device/all_reduce.cu"

projects/rccl/src/collectives/device/all_reduce_2.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 2
-#include "device/all_reduce.cu"

projects/rccl/src/collectives/device/all_reduce_3.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 3
-#include "device/all_reduce.cu"

projects/rccl/src/collectives/device/all_reduce_dev.cpp

@@ -1,5 +1,6 @@
 /*************************************************************************
  * Copyright (c) 2015-2018, NVIDIA CORPORATION. All rights reserved.
+ * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
  *
  * See LICENSE.txt for license information
  ************************************************************************/
@@ -10,12 +11,7 @@
 
 #define UNROLL 4
 
-#if NCCL_OP == 0
 IMPL_COLL2(ncclAllReduce, sum,  FuncSum,  ncclCollAllReduce, ncclSum);
-#elif NCCL_OP == 1
 IMPL_COLL2(ncclAllReduce, prod, FuncProd, ncclCollAllReduce, ncclProd);
-#elif NCCL_OP == 2
 IMPL_COLL2(ncclAllReduce, min,  FuncMin,  ncclCollAllReduce, ncclMin);
-#elif NCCL_OP == 3
 IMPL_COLL2(ncclAllReduce, max,  FuncMax,  ncclCollAllReduce, ncclMax);
-#endif

projects/rccl/src/collectives/device/broadcast_0.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 0
-#include "device/broadcast.cu"

projects/rccl/src/collectives/device/broadcast_dev.cpp

@@ -1,5 +1,6 @@
 /*************************************************************************
  * Copyright (c) 2015-2018, NVIDIA CORPORATION. All rights reserved.
+ * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
  *
  * See LICENSE.txt for license information
  ************************************************************************/
@@ -10,6 +11,4 @@
 
 #define UNROLL 4
 
-#if NCCL_OP == 0
 IMPL_COLL3(ncclBroadcast, copy, FuncSum, i8, int8_t, ncclCollBroadcast, ncclSum, ncclInt8);
-#endif

projects/rccl/src/collectives/device/reduce_0.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 0
-#include "device/reduce.cu"

projects/rccl/src/collectives/device/reduce_1.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 1
-#include "device/reduce.cu"

projects/rccl/src/collectives/device/reduce_2.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 2
-#include "device/reduce.cu"

projects/rccl/src/collectives/device/reduce_3.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 3
-#include "device/reduce.cu"

projects/rccl/src/collectives/device/reduce_dev.cpp

@@ -1,5 +1,6 @@
 /*************************************************************************
  * Copyright (c) 2015-2018, NVIDIA CORPORATION. All rights reserved.
+ * Modifications Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
  *
  * See LICENSE.txt for license information
  ************************************************************************/
@@ -10,12 +11,7 @@
 
 #define UNROLL 4
 
-#if NCCL_OP == 0
 IMPL_COLL2(ncclReduce, sum,  FuncSum,  ncclCollReduce, ncclSum);
-#elif NCCL_OP == 1
 IMPL_COLL2(ncclReduce, prod, FuncProd, ncclCollReduce, ncclProd);
-#elif NCCL_OP == 2
 IMPL_COLL2(ncclReduce, min,  FuncMin,  ncclCollReduce, ncclMin);
-#elif NCCL_OP == 3
 IMPL_COLL2(ncclReduce, max,  FuncMax,  ncclCollReduce, ncclMax);
-#endif

projects/rccl/src/collectives/device/reduce_scatter_0.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 0
-#include "device/reduce_scatter.cu"

projects/rccl/src/collectives/device/reduce_scatter_1.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 1
-#include "device/reduce_scatter.cu"

projects/rccl/src/collectives/device/reduce_scatter_2.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 2
-#include "device/reduce_scatter.cu"

projects/rccl/src/collectives/device/reduce_scatter_3.cpp

@@ -1,8 +0,0 @@
-/*************************************************************************
- * Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
- *
- * See LICENSE.txt for license information
- ************************************************************************/
-
-#define NCCL_OP 3
-#include "device/reduce_scatter.cu"

projects/rccl/src/collectives/device/reduce_scatter_dev.cpp

@@ -11,12 +11,7 @@
 
 #define UNROLL 4
 
-#if NCCL_OP == 0
 IMPL_COLL2(ncclReduceScatter, sum,  FuncSum,  ncclCollReduceScatter, ncclSum);
-#elif NCCL_OP == 1
 IMPL_COLL2(ncclReduceScatter, prod, FuncProd, ncclCollReduceScatter, ncclProd);
-#elif NCCL_OP == 2
 IMPL_COLL2(ncclReduceScatter, min,  FuncMin,  ncclCollReduceScatter, ncclMin);
-#elif NCCL_OP == 3
 IMPL_COLL2(ncclReduceScatter, max,  FuncMax,  ncclCollReduceScatter, ncclMax);
-#endif