Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dgl
Commits
66c04855
Unverified
Commit
66c04855
authored
Jun 15, 2023
by
Rhett Ying
Committed by
GitHub
Jun 15, 2023
Browse files
[DistDGL] remove tensorpipe from third_party and no build (#5876)
parent
9c525082
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
35 deletions
+6
-35
.gitmodules
.gitmodules
+0
-3
CMakeLists.txt
CMakeLists.txt
+5
-30
src/rpc/net_type.h
src/rpc/net_type.h
+1
-1
third_party/tensorpipe
third_party/tensorpipe
+0
-1
No files found.
.gitmodules
View file @
66c04855
...
@@ -19,9 +19,6 @@
...
@@ -19,9 +19,6 @@
[submodule "third_party/libxsmm"]
[submodule "third_party/libxsmm"]
path = third_party/libxsmm
path = third_party/libxsmm
url = https://github.com/hfp/libxsmm.git
url = https://github.com/hfp/libxsmm.git
[submodule "third_party/tensorpipe"]
path = third_party/tensorpipe
url = https://github.com/pytorch/tensorpipe
[submodule "third_party/thrust"]
[submodule "third_party/thrust"]
path = third_party/thrust
path = third_party/thrust
url = https://github.com/NVIDIA/thrust.git
url = https://github.com/NVIDIA/thrust.git
...
...
CMakeLists.txt
View file @
66c04855
...
@@ -31,7 +31,6 @@ dgl_option(USE_S3 "Build with S3 support" OFF)
...
@@ -31,7 +31,6 @@ dgl_option(USE_S3 "Build with S3 support" OFF)
dgl_option
(
USE_HDFS
"Build with HDFS support"
OFF
)
# Set env HADOOP_HDFS_HOME if needed
dgl_option
(
USE_HDFS
"Build with HDFS support"
OFF
)
# Set env HADOOP_HDFS_HOME if needed
dgl_option
(
REBUILD_LIBXSMM
"Clean LIBXSMM build cache at every build"
OFF
)
# Set env HADOOP_HDFS_HOME if needed
dgl_option
(
REBUILD_LIBXSMM
"Clean LIBXSMM build cache at every build"
OFF
)
# Set env HADOOP_HDFS_HOME if needed
dgl_option
(
USE_EPOLL
"Build with epoll for socket communicator"
ON
)
dgl_option
(
USE_EPOLL
"Build with epoll for socket communicator"
ON
)
dgl_option
(
TP_BUILD_LIBUV
"Build libuv together with tensorpipe (only impacts Linux)"
ON
)
dgl_option
(
BUILD_TORCH
"Build the PyTorch plugin"
OFF
)
dgl_option
(
BUILD_TORCH
"Build the PyTorch plugin"
OFF
)
dgl_option
(
BUILD_SPARSE
"Build DGL sparse library"
ON
)
dgl_option
(
BUILD_SPARSE
"Build DGL sparse library"
ON
)
dgl_option
(
BUILD_GRAPHBOLT
"Build Graphbolt library"
OFF
)
dgl_option
(
BUILD_GRAPHBOLT
"Build Graphbolt library"
OFF
)
...
@@ -85,8 +84,6 @@ if(MSVC)
...
@@ -85,8 +84,6 @@ if(MSVC)
endif
()
endif
()
else
(
MSVC
)
else
(
MSVC
)
include
(
CheckCXXCompilerFlag
)
include
(
CheckCXXCompilerFlag
)
# tensorpipe's dependencies require C++14
check_cxx_compiler_flag
(
"-std=c++14"
SUPPORT_CXX14
)
set
(
CMAKE_C_FLAGS
"-O2 -Wall -fPIC
${
CMAKE_C_FLAGS
}
"
)
set
(
CMAKE_C_FLAGS
"-O2 -Wall -fPIC
${
CMAKE_C_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"-O2 -Wall -fPIC -std=c++14
${
CMAKE_CXX_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"-O2 -Wall -fPIC -std=c++14
${
CMAKE_CXX_FLAGS
}
"
)
if
(
NOT APPLE
)
if
(
NOT APPLE
)
...
@@ -223,33 +220,11 @@ if((NOT MSVC) AND USE_LIBXSMM)
...
@@ -223,33 +220,11 @@ if((NOT MSVC) AND USE_LIBXSMM)
list
(
APPEND DGL_LINKER_LIBS -L
${
CMAKE_SOURCE_DIR
}
/third_party/libxsmm/lib/ xsmm.a
)
list
(
APPEND DGL_LINKER_LIBS -L
${
CMAKE_SOURCE_DIR
}
/third_party/libxsmm/lib/ xsmm.a
)
endif
((
NOT MSVC
)
AND USE_LIBXSMM
)
endif
((
NOT MSVC
)
AND USE_LIBXSMM
)
if
(
NOT MSVC
)
# Avoid exposing third-party symbols when using DGL as a library.
# Only build tensorpipe on linux
if
((
NOT MSVC
)
AND
(
NOT
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Darwin"
))
string
(
REPLACE
"-pedantic"
""
CMAKE_C_FLAGS
${
CMAKE_C_FLAGS
}
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wl,--exclude-libs,ALL"
)
# Disable -Wall for third-party tensorpipe due to too many warnings
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wl,--exclude-libs,ALL"
)
string
(
REPLACE
"-Wall"
""
CMAKE_C_FLAGS
${
CMAKE_C_FLAGS
}
)
endif
()
string
(
REPLACE
"-Wall"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
set
(
WNOERROR_FLAGS
"-Wno-error=sign-compare"
)
if
(
CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0
)
set
(
WNOERROR_FLAGS
"
${
WNOERROR_FLAGS
}
-Wno-error=dangling-pointer"
)
endif
()
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
WNOERROR_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
WNOERROR_FLAGS
}
"
)
set
(
TP_STATIC_OR_SHARED STATIC
)
add_subdirectory
(
third_party/tensorpipe
)
list
(
APPEND DGL_LINKER_LIBS tensorpipe
)
target_include_directories
(
dgl PRIVATE third_party/tensorpipe
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wall"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall"
)
string
(
REPLACE
"
${
WNOERROR_FLAGS
}
"
""
CMAKE_C_FLAGS
${
CMAKE_C_FLAGS
}
)
string
(
REPLACE
"
${
WNOERROR_FLAGS
}
"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
# Avoid exposing third-party symbols when using DGL as a library.
if
(
NOT
${
CMAKE_SYSTEM_NAME
}
MATCHES
"Darwin"
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wl,--exclude-libs,ALL"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wl,--exclude-libs,ALL"
)
endif
()
endif
(
NOT MSVC
)
# support PARALLEL_ALGORITHMS
# support PARALLEL_ALGORITHMS
if
(
LIBCXX_ENABLE_PARALLEL_ALGORITHMS
)
if
(
LIBCXX_ENABLE_PARALLEL_ALGORITHMS
)
...
...
src/rpc/net_type.h
View file @
66c04855
...
@@ -22,7 +22,7 @@ struct RPCBase {
...
@@ -22,7 +22,7 @@ struct RPCBase {
virtual
void
Finalize
()
=
0
;
virtual
void
Finalize
()
=
0
;
/**
/**
* @brief Communicator type
:
'socket'
, 'tensorpipe', etc
* @brief Communicator type
such as
'socket'
.
*/
*/
virtual
const
std
::
string
&
NetType
()
const
=
0
;
virtual
const
std
::
string
&
NetType
()
const
=
0
;
};
};
...
...
tensorpipe
@
6042f1a4
Compare
6042f1a4
...
6042f1a4
Subproject commit 6042f1a4cbce8eef997f11ed0012de137b317361
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment