Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
urhero
Paddle
提交
338dc3ee
P
Paddle
项目概览
urhero
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
338dc3ee
编写于
12月 28, 2016
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix external denpendencies build order
上级
0b956711
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
27 addition
and
5 deletion
+27
-5
cmake/external/numpy.cmake
cmake/external/numpy.cmake
+2
-0
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+9
-3
cmake/external/python.cmake
cmake/external/python.cmake
+3
-0
cmake/external/swig.cmake
cmake/external/swig.cmake
+6
-1
cmake/external/warpctc.cmake
cmake/external/warpctc.cmake
+7
-1
未找到文件。
cmake/external/numpy.cmake
浏览文件 @
338dc3ee
...
...
@@ -59,6 +59,8 @@ IF(NOT ${NUMPY_FOUND})
DEPENDS python setuptools cython
)
LIST
(
APPEND external_project_dependencies numpy
)
# find numpy include directory
FILE
(
WRITE
${
PROJECT_BINARY_DIR
}
/FindNumpyPath.py
"try: import numpy; print(numpy.get_include())
\n
except:pass
\n
"
)
...
...
cmake/external/protobuf.cmake
浏览文件 @
338dc3ee
...
...
@@ -42,10 +42,16 @@ IF(WIN32)
"
${
PROTOBUF_INSTALL_DIR
}
/lib/libprotoc.lib"
CACHE FILEPATH
"protobuf libraries."
FORCE
)
SET
(
PROTOBUF_PROTOC_EXECUTABLE
"
${
PROTOBUF_INSTALL_DIR
}
/bin/protoc.exe"
CACHE FILEPATH
"protobuf executable."
FORCE
)
ELSE
(
WIN32
)
FIND_PATH
(
PROTOBUF_LIBS_DIR libprotoc.a
PATHS
${
PROTOBUF_INSTALL_DIR
}
/lib64
${
PROTOBUF_INSTALL_DIR
}
/lib
NO_DEFAULT_PATH
)
SET
(
PROTOBUF_LIBRARIES
"
${
PROTOBUF_
INSTALL_DIR
}
/lib
/libprotobuf-lite.a"
"
${
PROTOBUF_
INSTALL_DIR
}
/lib
/libprotobuf.a"
"
${
PROTOBUF_
INSTALL_DIR
}
/lib
/libprotoc.a"
CACHE FILEPATH
"protobuf libraries."
FORCE
)
"
${
PROTOBUF_
LIBS_DIR
}
/libprotobuf-lite.a"
"
${
PROTOBUF_
LIBS_DIR
}
/libprotobuf.a"
"
${
PROTOBUF_
LIBS_DIR
}
/libprotoc.a"
CACHE FILEPATH
"protobuf libraries."
FORCE
)
SET
(
PROTOBUF_PROTOC_EXECUTABLE
"
${
PROTOBUF_INSTALL_DIR
}
/bin/protoc"
CACHE FILEPATH
"protobuf executable."
FORCE
)
ENDIF
(
WIN32
)
...
...
cmake/external/python.cmake
浏览文件 @
338dc3ee
...
...
@@ -87,6 +87,9 @@ IF((NOT ${PYTHONINTERP_FOUND}) OR (NOT ${PYTHONLIBS_FOUND}))
MESSAGE
(
FATAL_ERROR
"Unknown system !"
)
ENDIF
()
LIST
(
APPEND external_project_dependencies python
)
ENDIF
()
INCLUDE_DIRECTORIES
(
${
PYTHON_INCLUDE_DIR
}
)
cmake/external/swig.cmake
浏览文件 @
338dc3ee
...
...
@@ -70,6 +70,9 @@ IF(NOT ${SWIG_FOUND})
set
(
SWIG_DIR
${
SWIG_INSTALL_DIR
}
/share/swig/
${
SWIG_TARGET_VERSION
}
CACHE FILEPATH
"SWIG Directory"
FORCE
)
set
(
SWIG_EXECUTABLE
${
SWIG_INSTALL_DIR
}
/bin/swig CACHE FILEPATH
"SWIG Executable"
FORCE
)
ENDIF
(
WIN32
)
LIST
(
APPEND external_project_dependencies swig
)
ENDIF
()
FUNCTION
(
generate_python_api target_name
)
...
...
@@ -80,10 +83,12 @@ FUNCTION(generate_python_api target_name)
&& mv
${
PROJ_ROOT
}
/paddle/swig_paddle.py
${
PROJ_ROOT
}
/paddle/py_paddle/swig_paddle.py
DEPENDS
${
PROJ_ROOT
}
/paddle/api/Paddle.swig
${
PROJ_ROOT
}
/paddle/api/PaddleAPI.h
${
external_project_dependencies
}
WORKING_DIRECTORY
${
PROJ_ROOT
}
/paddle
COMMENT
"Generate Python API from swig"
)
ADD_CUSTOM_TARGET
(
${
target_name
}
ALL DEPENDS
${
PROJ_ROOT
}
/paddle/Paddle_wrap.cxx
${
PROJ_ROOT
}
/paddle/Paddle_wrap.h
${
PROJ_ROOT
}
/paddle/py_paddle/swig_paddle.py
)
${
PROJ_ROOT
}
/paddle/py_paddle/swig_paddle.py
${
external_project_dependencies
}
)
ENDFUNCTION
(
generate_python_api
)
cmake/external/warpctc.cmake
浏览文件 @
338dc3ee
...
...
@@ -40,8 +40,14 @@ IF(WIN32)
SET
(
WARPCTC_LIBRARIES
"
${
WARPCTC_INSTALL_DIR
}
/lib/warpctc.dll"
CACHE FILEPATH
"Warp-ctc Library"
FORCE
)
ELSE
(
WIN32
)
IF
(
APPLE
)
SET
(
_warpctc_SHARED_SUFFIX dylib
)
ELSE
(
APPLE
)
SET
(
_warpctc_SHARED_SUFFIX so
)
ENDIF
(
APPLE
)
SET
(
WARPCTC_LIBRARIES
"
${
WARPCTC_INSTALL_DIR
}
/lib/libwarpctc.
dylib
"
CACHE FILEPATH
"Warp-ctc Library"
FORCE
)
"
${
WARPCTC_INSTALL_DIR
}
/lib/libwarpctc.
${
_warpctc_SHARED_SUFFIX
}
"
CACHE FILEPATH
"Warp-ctc Library"
FORCE
)
ENDIF
(
WIN32
)
LIST
(
APPEND external_project_dependencies warpctc
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录