Merge pull request #47 from wenkaidu/move_header_file

move rccl.h to inc folder to be consistent with other ROCm libs
ROCm · Nov 9, 2018 · 9c7b2e3 · 9c7b2e3
2 parents 2560190 + 80413e2
commit 9c7b2e3
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,7 +39,7 @@ include(ROCMInstallSymlinks)
 include(ROCMCreatePackage)
 
 rocm_setup_version(
-    VERSION 0.7.0
+    VERSION 0.7.1
 )
 
 list(APPEND CMAKE_PREFIX_PATH /opt/rocm /opt/rocm/hip /opt/rocm/hcc)
@@ -51,7 +51,7 @@ link_libraries(-amdgpu-target=gfx803 -amdgpu-target=gfx900 -amdgpu-target=gfx906
 option( BUILD_SHARED_LIBS "Build as a shared library" ON )
 
 # configure a header file to pass the CMake version settings to the source, and package the header files in the output archive
-configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/inc/rccl/rccl-version.h.in" "${PROJECT_BINARY_DIR}/inc/rccl/rccl-version.h" )
+configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/inc/rccl-version.h.in" "${PROJECT_BINARY_DIR}/inc/rccl-version.h" )
 
 add_library( rccl
     src/rccl.cpp

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ export LD_LIBRARY_PATH=/opt/rocm/rccl/lib:$LD_LIBRARY_PATH
 
 ## Usage
 ```cpp
-#include <rccl/rccl.h>
+#include <rccl.h>
 #include <vector>
 
 int main() {

diff --git a/inc/rccl/rccl-version.h.in → inc/rccl-version.h.in b/inc/rccl/rccl-version.h.in → inc/rccl-version.h.in
diff --git a/inc/rccl/rccl.h → inc/rccl.h b/inc/rccl/rccl.h → inc/rccl.h
diff --git a/src/Makefile b/src/Makefile
@@ -8,7 +8,7 @@ SRC=rccl.cpp rcclAllReduce.cpp rcclBcast.cpp rcclReduce.cpp rcclTracker.cpp rccl
 
 all: lib
 
-../inc/rccl/rccl-version.h: ../inc/rccl/rccl-version.h.in
+../inc/rccl-version.h: ../inc/rccl-version.h.in
 	gitver=`git log -1 --pretty='%h'`; \
 	string=`cat ../CMakeLists.txt`; \
 	re='    VERSION.([0-9]*)\.([0-9]*)\.([0-9]*).'; \
@@ -20,21 +20,20 @@ all: lib
             $< > $@; \
 	fi
 
-lib: ../inc/rccl/rccl-version.h
+lib: ../inc/rccl-version.h
 	${HCC_DIR}/bin/hcc -I../inc ${TARGETS} -I${HIP_DIR}/include -I${HSA_DIR}/include/ `${HCC_DIR}/bin/hcc-config --shared --cxxflags --ldflags` -L${HIP_DIR}/lib -lhip_hcc $(SRC) -o librccl.so
 
 install:
 	mkdir -p $(RCCL_INSTALL_DIR)
 	mkdir -p $(RCCL_INSTALL_DIR)/include
-	mkdir -p $(RCCL_INSTALL_DIR)/include/rccl
 	mkdir -p $(RCCL_INSTALL_DIR)/lib
 	cp librccl.so $(RCCL_INSTALL_DIR)/lib
-	cp ../inc/rccl/rccl.h $(RCCL_INSTALL_DIR)/include/rccl
-	cp ../inc/rccl/rccl-version.h $(RCCL_INSTALL_DIR)/include/rccl
+	cp ../inc/rccl.h $(RCCL_INSTALL_DIR)/include
+	cp ../inc/rccl-version.h $(RCCL_INSTALL_DIR)/include
 
 clean:
 	rm -rf librccl.so
-	rm ../inc/rccl/rccl-version.h
+	rm ../inc/rccl-version.h
 
 uninstall:
 	rm -rf $(RCCL_INSTALL_DIR)
diff --git a/src/rccl.cpp b/src/rccl.cpp
@@ -15,7 +15,7 @@ All rights reserved.
 
 #include "rcclHelper.h"
 #include "rcclTracker.h"
-#include "rccl/rccl-version.h"
+#include "rccl-version.h"
 
 #include <string>
 #include <unordered_map>

diff --git a/src/rcclCheck.h b/src/rcclCheck.h
@@ -15,7 +15,7 @@ All rights reserved.
 #pragma once
 
 #include <iostream>
-#include "rccl/rccl.h"
+#include "rccl.h"
 
 #define HIPCHECK(status)                                             \
     if (status != hipSuccess) {                                      \

diff --git a/tests/common.h b/tests/common.h
@@ -8,7 +8,7 @@ All rights reserved.
 #include <unordered_map>
 #include <vector>
 
-#include "rccl/rccl.h"
+#include "rccl.h"
 
 #define HIPCHECK(status)                                             \
     if (status != hipSuccess) {                                      \

diff --git a/tests/conformance/rcclCommInitAll.cpp b/tests/conformance/rcclCommInitAll.cpp
@@ -5,7 +5,7 @@ All rights reserved.
 
 #include <hip/hip_runtime_api.h>
 #include <hip/hip_runtime.h>
-#include "rccl/rccl.h"
+#include "rccl.h"
 #include "common.h"
 
 int main() {

diff --git a/tests/performance/rcclAllGather.cpp b/tests/performance/rcclAllGather.cpp
@@ -10,7 +10,7 @@ All rights reserved.
 #include <vector>
 #include "common.h"
 #include "performance/performance.h"
-#include "rccl/rccl.h"
+#include "rccl.h"
 
 void CallAllGather(signed char* psrc_buff, signed char* pdst_buff,
                    size_t buff_len, rcclComm_t comm, hipStream_t stream) {

diff --git a/tests/performance/rcclAllReduce.cpp b/tests/performance/rcclAllReduce.cpp
@@ -10,7 +10,7 @@ All rights reserved.
 #include <vector>
 #include "common.h"
 #include "performance/performance.h"
-#include "rccl/rccl.h"
+#include "rccl.h"
 
 void CallAllReduce(signed char* psrc_buff, signed char* pdst_buff,
                    size_t buff_len, rcclRedOp_t op, rcclComm_t comm,

diff --git a/tests/performance/rcclBcast.cpp b/tests/performance/rcclBcast.cpp
@@ -10,7 +10,7 @@ All rights reserved.
 #include <vector>
 #include "common.h"
 #include "performance/performance.h"
-#include "rccl/rccl.h"
+#include "rccl.h"
 
 void CallBcast(signed char* psrc_buff, size_t buff_len, int root,
                rcclComm_t comm, hipStream_t stream) {

diff --git a/tests/performance/rcclReduce.cpp b/tests/performance/rcclReduce.cpp
@@ -10,7 +10,7 @@ All rights reserved.
 #include <vector>
 #include "common.h"
 #include "performance/performance.h"
-#include "rccl/rccl.h"
+#include "rccl.h"
 
 void CallReduce(signed char* psrc_buff, signed char* pdst_buff, size_t buff_len,
                 rcclRedOp_t op, int root, rcclComm_t comm, hipStream_t stream) {

diff --git a/tests/stress/rcclReduce.cpp b/tests/stress/rcclReduce.cpp
@@ -3,7 +3,7 @@ Copyright (c) 2017 - Present Advanced Micro Devices, Inc.
 All rights reserved.
 */
 
-#include "rccl/rccl.h"
+#include "rccl.h"
 #include "validation/validate.h"
 #include <iostream>
 #include <vector>

diff --git a/tests/unit/rcclCommInitRank.cpp b/tests/unit/rcclCommInitRank.cpp
@@ -1,4 +1,4 @@
-#include <rccl/rccl.h>
+#include <rccl.h>
 #include "gtest/gtest.h"
 
 TEST(CommInitRankTest, T01) {

diff --git a/tests/unit/rcclUniqueId.cpp b/tests/unit/rcclUniqueId.cpp
@@ -1,4 +1,4 @@
-#include <rccl/rccl.h>
+#include <rccl.h>
 #include <limits.h>
 #include "gtest/gtest.h"
 

diff --git a/tests/validation/rcclAllGather.cpp b/tests/validation/rcclAllGather.cpp
@@ -3,7 +3,7 @@ Copyright (c) 2017 - Present Advanced Micro Devices, Inc.
 All rights reserved.
 */
 
-#include "rccl/rccl.h"
+#include "rccl.h"
 //#include "rcclCheck.h"
 #include <algorithm>
 #include <iostream>

diff --git a/tests/validation/rcclAllReduce.cpp b/tests/validation/rcclAllReduce.cpp
@@ -3,7 +3,7 @@ Copyright (c) 2017 - Present Advanced Micro Devices, Inc.
 All rights reserved.
 */
 
-#include "rccl/rccl.h"
+#include "rccl.h"
 #include <algorithm>
 #include <iostream>
 #include <list>

diff --git a/tests/validation/rcclBcast.cpp b/tests/validation/rcclBcast.cpp
@@ -3,7 +3,7 @@ Copyright (c) 2017 - Present Advanced Micro Devices, Inc.
 All rights reserved.
 */
 
-#include "rccl/rccl.h"
+#include "rccl.h"
 //#include "rcclCheck.h"
 #include <algorithm>
 #include <iostream>

diff --git a/tests/validation/rcclCommBcast.cpp b/tests/validation/rcclCommBcast.cpp
@@ -5,7 +5,7 @@ All rights reserved.
 
 #include <iostream>
 #include <vector>
-#include "rccl/rccl.h"
+#include "rccl.h"
 #include "common.h"
 #include "validate.h"
 

diff --git a/tests/validation/rcclMultiStream.cpp b/tests/validation/rcclMultiStream.cpp
@@ -3,7 +3,7 @@ Copyright (c) 2017 - Present Advanced Micro Devices, Inc.
 All rights reserved.
 */
 
-#include "rccl/rccl.h"
+#include "rccl.h"
 #include <algorithm>
 #include <iostream>
 #include <list>

diff --git a/tests/validation/rcclReduce.cpp b/tests/validation/rcclReduce.cpp
@@ -9,7 +9,7 @@ All rights reserved.
 #include <typeinfo>
 #include <vector>
 #include "common.h"
-#include "rccl/rccl.h"
+#include "rccl.h"
 #include "validation/validate.h"
 
 void CallReduce(signed char* psrc_buff, signed char* pdst_buff, size_t buff_len,