Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
60cb0b97
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
60cb0b97
编写于
2月 20, 2019
作者:
T
Tao Luo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove legacy $external_project_dependencies variable
test=develop
上级
c797a1f0
变更
25
隐藏空白更改
内联
并排
Showing
25 changed file
with
3 addition
and
56 deletion
+3
-56
cmake/external/anakin.cmake
cmake/external/anakin.cmake
+0
-2
cmake/external/boost.cmake
cmake/external/boost.cmake
+0
-1
cmake/external/brpc.cmake
cmake/external/brpc.cmake
+0
-2
cmake/external/cub.cmake
cmake/external/cub.cmake
+0
-2
cmake/external/dlpack.cmake
cmake/external/dlpack.cmake
+0
-2
cmake/external/eigen.cmake
cmake/external/eigen.cmake
+0
-2
cmake/external/gflags.cmake
cmake/external/gflags.cmake
+0
-2
cmake/external/glog.cmake
cmake/external/glog.cmake
+0
-2
cmake/external/gtest.cmake
cmake/external/gtest.cmake
+0
-1
cmake/external/leveldb.cmake
cmake/external/leveldb.cmake
+0
-3
cmake/external/libmct.cmake
cmake/external/libmct.cmake
+0
-3
cmake/external/libxsmm.cmake
cmake/external/libxsmm.cmake
+0
-2
cmake/external/mkldnn.cmake
cmake/external/mkldnn.cmake
+0
-1
cmake/external/mklml.cmake
cmake/external/mklml.cmake
+0
-1
cmake/external/ngraph.cmake
cmake/external/ngraph.cmake
+0
-1
cmake/external/openblas.cmake
cmake/external/openblas.cmake
+0
-1
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+0
-1
cmake/external/pslib.cmake
cmake/external/pslib.cmake
+0
-1
cmake/external/pslib_brpc.cmake
cmake/external/pslib_brpc.cmake
+0
-1
cmake/external/threadpool.cmake
cmake/external/threadpool.cmake
+0
-2
cmake/external/warpctc.cmake
cmake/external/warpctc.cmake
+0
-2
cmake/external/xbyak.cmake
cmake/external/xbyak.cmake
+0
-1
cmake/external/xxhash.cmake
cmake/external/xxhash.cmake
+0
-2
cmake/external/zlib.cmake
cmake/external/zlib.cmake
+0
-2
python/CMakeLists.txt
python/CMakeLists.txt
+3
-16
未找到文件。
cmake/external/anakin.cmake
浏览文件 @
60cb0b97
...
...
@@ -74,5 +74,3 @@ add_dependencies(anakin_shared extern_anakin)
add_library
(
anakin_saber SHARED IMPORTED GLOBAL
)
set_property
(
TARGET anakin_saber PROPERTY IMPORTED_LOCATION
${
ANAKIN_SABER_LIB
}
)
add_dependencies
(
anakin_saber extern_anakin
)
list
(
APPEND external_project_dependencies anakin_shared anakin_saber
)
cmake/external/boost.cmake
浏览文件 @
60cb0b97
...
...
@@ -57,5 +57,4 @@ else()
endif
()
add_dependencies
(
boost
${
BOOST_PROJECT
}
)
list
(
APPEND external_project_dependencies boost
)
set
(
Boost_INCLUDE_DIR
${
BOOST_INCLUDE_DIR
}
)
cmake/external/brpc.cmake
浏览文件 @
60cb0b97
...
...
@@ -69,5 +69,3 @@ SET_PROPERTY(TARGET brpc PROPERTY IMPORTED_LOCATION ${BRPC_LIBRARIES})
ADD_DEPENDENCIES
(
brpc extern_brpc
)
add_definitions
(
-DBRPC_WITH_GLOG
)
LIST
(
APPEND external_project_dependencies brpc
)
cmake/external/cub.cmake
浏览文件 @
60cb0b97
...
...
@@ -31,5 +31,3 @@ else()
endif
()
add_dependencies
(
cub extern_cub
)
LIST
(
APPEND external_project_dependencies cub
)
cmake/external/dlpack.cmake
浏览文件 @
60cb0b97
...
...
@@ -27,5 +27,3 @@ else()
endif
()
add_dependencies
(
dlpack extern_dlpack
)
LIST
(
APPEND external_project_dependencies dlpack
)
cmake/external/eigen.cmake
浏览文件 @
60cb0b97
...
...
@@ -52,5 +52,3 @@ else()
endif
()
add_dependencies
(
eigen3 extern_eigen3
)
LIST
(
APPEND external_project_dependencies eigen3
)
cmake/external/gflags.cmake
浏览文件 @
60cb0b97
...
...
@@ -61,8 +61,6 @@ ADD_LIBRARY(gflags STATIC IMPORTED GLOBAL)
SET_PROPERTY
(
TARGET gflags PROPERTY IMPORTED_LOCATION
${
GFLAGS_LIBRARIES
}
)
ADD_DEPENDENCIES
(
gflags extern_gflags
)
LIST
(
APPEND external_project_dependencies gflags
)
# On Windows (including MinGW), the Shlwapi library is used by gflags if available.
if
(
WIN32
)
include
(
CheckIncludeFileCXX
)
...
...
cmake/external/glog.cmake
浏览文件 @
60cb0b97
...
...
@@ -72,5 +72,3 @@ ADD_LIBRARY(glog STATIC IMPORTED GLOBAL)
SET_PROPERTY
(
TARGET glog PROPERTY IMPORTED_LOCATION
${
GLOG_LIBRARIES
}
)
ADD_DEPENDENCIES
(
glog extern_glog gflags
)
LINK_LIBRARIES
(
glog gflags
)
LIST
(
APPEND external_project_dependencies glog
)
cmake/external/gtest.cmake
浏览文件 @
60cb0b97
...
...
@@ -79,5 +79,4 @@ IF(WITH_TESTING OR (WITH_DISTRIBUTE AND NOT WITH_GRPC))
SET_PROPERTY
(
TARGET gtest_main PROPERTY IMPORTED_LOCATION
${
GTEST_MAIN_LIBRARIES
}
)
ADD_DEPENDENCIES
(
gtest_main extern_gtest
)
LIST
(
APPEND external_project_dependencies gtest gtest_main
)
ENDIF
(
WITH_TESTING
OR
(
WITH_DISTRIBUTE AND NOT WITH_GRPC
))
cmake/external/leveldb.cmake
浏览文件 @
60cb0b97
...
...
@@ -39,6 +39,3 @@ ADD_DEPENDENCIES(extern_leveldb snappy)
ADD_LIBRARY
(
leveldb STATIC IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET leveldb PROPERTY IMPORTED_LOCATION
${
LEVELDB_LIBRARIES
}
)
ADD_DEPENDENCIES
(
leveldb extern_leveldb
)
LIST
(
APPEND external_project_dependencies leveldb
)
cmake/external/libmct.cmake
浏览文件 @
60cb0b97
...
...
@@ -72,7 +72,4 @@ else()
add_library
(
libmct INTERFACE
)
endif
()
#ADD_LIBRARY(libmct SHARED IMPORTED GLOBAL)
ADD_DEPENDENCIES
(
libmct
${
LIBMCT_PROJECT
}
)
LIST
(
APPEND external_project_dependencies libmct
)
cmake/external/libxsmm.cmake
浏览文件 @
60cb0b97
...
...
@@ -53,5 +53,3 @@ MESSAGE(STATUS "Libxsmm library: ${LIBXSMM_LIBS}")
include_directories
(
${
LIBXSMM_INCLUDE_DIR
}
)
ADD_DEFINITIONS
(
-DPADDLE_WITH_LIBXSMM
)
ADD_DEPENDENCIES
(
libxsmm extern_libxsmm
)
LIST
(
APPEND external_project_dependencies libxsmm
)
cmake/external/mkldnn.cmake
浏览文件 @
60cb0b97
...
...
@@ -89,7 +89,6 @@ SET_PROPERTY(TARGET shared_mkldnn PROPERTY IMPORTED_LOCATION ${MKLDNN_LIB})
ADD_DEPENDENCIES
(
shared_mkldnn
${
MKLDNN_PROJECT
}
)
MESSAGE
(
STATUS
"MKLDNN library:
${
MKLDNN_LIB
}
"
)
add_definitions
(
-DPADDLE_WITH_MKLDNN
)
LIST
(
APPEND external_project_dependencies shared_mkldnn
)
# generate a static dummy target to track mkldnn dependencies
# for cc_library(xxx SRCS xxx.c DEPS mkldnn)
...
...
cmake/external/mklml.cmake
浏览文件 @
60cb0b97
...
...
@@ -73,4 +73,3 @@ INCLUDE_DIRECTORIES(${MKLML_INC_DIR})
ADD_LIBRARY
(
mklml SHARED IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET mklml PROPERTY IMPORTED_LOCATION
${
MKLML_LIB
}
)
ADD_DEPENDENCIES
(
mklml
${
MKLML_PROJECT
}
)
LIST
(
APPEND external_project_dependencies mklml
)
cmake/external/ngraph.cmake
浏览文件 @
60cb0b97
...
...
@@ -77,4 +77,3 @@ add_dependencies(ngraph ${NGRAPH_PROJECT})
target_compile_definitions
(
ngraph INTERFACE -DPADDLE_WITH_NGRAPH
)
target_include_directories
(
ngraph INTERFACE
${
NGRAPH_INC_DIR
}
)
target_link_libraries
(
ngraph INTERFACE
${
NGRAPH_SHARED_LIB
}
)
LIST
(
APPEND external_project_dependencies ngraph
)
cmake/external/openblas.cmake
浏览文件 @
60cb0b97
...
...
@@ -91,7 +91,6 @@ ENDIF()
IF
(
NOT
${
CBLAS_FOUND
}
)
ADD_DEPENDENCIES
(
cblas extern_openblas
)
LIST
(
APPEND external_project_dependencies cblas
)
ELSE
()
IF
(
"
${
CBLAS_PROVIDER
}
"
STREQUAL
"MKLML"
)
ADD_DEPENDENCIES
(
cblas mklml
)
...
...
cmake/external/protobuf.cmake
浏览文件 @
60cb0b97
...
...
@@ -129,7 +129,6 @@ macro(PROMPT_PROTOBUF_LIB)
ADD_DEPENDENCIES
(
protoc
${
dep
}
)
ENDFOREACH
()
LIST
(
APPEND external_project_dependencies protobuf
)
RETURN
()
endmacro
()
macro
(
SET_PROTOBUF_VERSION
)
...
...
cmake/external/pslib.cmake
浏览文件 @
60cb0b97
...
...
@@ -70,4 +70,3 @@ ExternalProject_Add(
ADD_LIBRARY
(
pslib SHARED IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET pslib PROPERTY IMPORTED_LOCATION
${
PSLIB_LIB
}
)
ADD_DEPENDENCIES
(
pslib
${
PSLIB_PROJECT
}
)
LIST
(
APPEND external_project_dependencies pslib
)
cmake/external/pslib_brpc.cmake
浏览文件 @
60cb0b97
...
...
@@ -70,4 +70,3 @@ ExternalProject_Add(
ADD_LIBRARY
(
pslib_brpc SHARED IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET pslib_brpc PROPERTY IMPORTED_LOCATION
${
PSLIB_BRPC_LIB
}
)
ADD_DEPENDENCIES
(
pslib_brpc
${
PSLIB_BRPC_PROJECT
}
)
LIST
(
APPEND external_project_dependencies pslib_brpc
)
cmake/external/threadpool.cmake
浏览文件 @
60cb0b97
...
...
@@ -26,5 +26,3 @@ else()
endif
()
add_dependencies
(
simple_threadpool extern_threadpool
)
LIST
(
APPEND external_project_dependencies simple_threadpool
)
cmake/external/warpctc.cmake
浏览文件 @
60cb0b97
...
...
@@ -83,5 +83,3 @@ INCLUDE_DIRECTORIES(${THIRD_PARTY_PATH}/install) # For Paddle code to include wa
ADD_LIBRARY
(
warpctc SHARED IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET warpctc PROPERTY IMPORTED_LOCATION
${
WARPCTC_LIBRARIES
}
)
ADD_DEPENDENCIES
(
warpctc extern_warpctc
)
LIST
(
APPEND external_project_dependencies warpctc
)
cmake/external/xbyak.cmake
浏览文件 @
60cb0b97
...
...
@@ -55,4 +55,3 @@ else()
endif
()
add_dependencies
(
xbyak
${
XBYAK_PROJECT
}
)
list
(
APPEND external_project_dependencies xbyak
)
cmake/external/xxhash.cmake
浏览文件 @
60cb0b97
...
...
@@ -71,5 +71,3 @@ add_library(xxhash STATIC IMPORTED GLOBAL)
set_property
(
TARGET xxhash PROPERTY IMPORTED_LOCATION
${
XXHASH_LIBRARIES
}
)
include_directories
(
${
XXHASH_INCLUDE_DIR
}
)
add_dependencies
(
xxhash extern_xxhash
)
LIST
(
APPEND external_project_dependencies xxhash
)
cmake/external/zlib.cmake
浏览文件 @
60cb0b97
...
...
@@ -57,5 +57,3 @@ ENDIF(WIN32)
ADD_LIBRARY
(
zlib STATIC IMPORTED GLOBAL
)
SET_PROPERTY
(
TARGET zlib PROPERTY IMPORTED_LOCATION
${
ZLIB_LIBRARIES
}
)
ADD_DEPENDENCIES
(
zlib extern_zlib
)
LIST
(
APPEND external_project_dependencies zlib
)
python/CMakeLists.txt
浏览文件 @
60cb0b97
...
...
@@ -4,18 +4,6 @@ set(PY_FILES paddle/__init__.py
${
UTILS_PY_FILES
}
${
FLUID_PY_FILES
}
)
set
(
MKL_SHARED_LIBS
""
)
set
(
MKL_DEPENDS
""
)
if
(
WITH_MKLML
)
list
(
APPEND MKL_SHARED_LIBS
${
MKLML_LIB
}
${
MKLML_IOMP_LIB
}
)
list
(
APPEND MKL_DEPENDS mklml
)
endif
()
if
(
WITH_MKLDNN
)
list
(
APPEND MKL_SHARED_LIBS
"
${
MKLDNN_SHARED_LIB
}
"
)
list
(
APPEND MKL_DEPENDS mkldnn mkldnn_shared_lib
)
endif
()
if
(
WITH_GPU
)
SET
(
PACKAGE_NAME
"paddlepaddle-gpu"
)
else
()
...
...
@@ -42,7 +30,7 @@ IF(WIN32)
COMMAND
${
CMAKE_COMMAND
}
-E env
${
py_env
}
${
PYTHON_EXECUTABLE
}
setup.py bdist_wheel
COMMAND
${
CMAKE_COMMAND
}
-E touch
${
PADDLE_PYTHON_BUILD_DIR
}
/.timestamp
COMMAND
${
CMAKE_COMMAND
}
-E remove_directory
${
PADDLE_PYTHON_BUILD_DIR
}
/lib-python
DEPENDS copy_paddle_pybind
${
FLUID_CORE
}
framework_py_proto profiler_py_proto
${
PY_FILES
}
${
external_project_dependencies
}
${
COPY_PADDLE_MASTER
}
)
DEPENDS copy_paddle_pybind
${
FLUID_CORE
}
framework_py_proto profiler_py_proto
${
PY_FILES
}
)
ELSE
(
WIN32
)
add_custom_command
(
OUTPUT
${
PADDLE_PYTHON_BUILD_DIR
}
/.timestamp
COMMAND touch stub.cc
...
...
@@ -51,11 +39,10 @@ ELSE(WIN32)
COMMAND
${
CMAKE_COMMAND
}
-E touch
${
PADDLE_PYTHON_BUILD_DIR
}
/.timestamp
COMMAND
${
CMAKE_COMMAND
}
-E remove_directory
${
PADDLE_PYTHON_BUILD_DIR
}
/lib-python
COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
${
PADDLE_PYTHON_BUILD_DIR
}
/lib*
${
PADDLE_PYTHON_BUILD_DIR
}
/lib-python
DEPENDS copy_paddle_pybind
${
FLUID_CORE
}
framework_py_proto profiler_py_proto
${
PY_FILES
}
${
external_project_dependencies
}
${
COPY_PADDLE_MASTER
}
)
DEPENDS copy_paddle_pybind
${
FLUID_CORE
}
framework_py_proto profiler_py_proto
${
PY_FILES
}
)
ENDIF
()
set
(
paddle_python_deps
${
PADDLE_PYTHON_BUILD_DIR
}
/.timestamp
${
MKL_DEPENDS
}
${
external_project_dependencies
}
)
add_custom_target
(
paddle_python ALL DEPENDS
${
paddle_python_deps
}
)
add_custom_target
(
paddle_python ALL DEPENDS
${
PADDLE_PYTHON_BUILD_DIR
}
/.timestamp
)
set
(
PADDLE_PYTHON_PACKAGE_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
/dist/
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录