未验证 提交 5f72d835 编写于 作者: Q Qiao Longfei 提交者: GitHub

Support manylinux build (#165)

* support manylinux build
上级 e4bade74
...@@ -131,7 +131,7 @@ Board also supports the parameters below for remote access: ...@@ -131,7 +131,7 @@ Board also supports the parameters below for remote access:
### How to install ### How to install
``` ```
python setup.py bdist_wheel python setup.py bdist_wheel
pip install --upgrade dist/visualdl-0.0.1-py2-none-any.whl pip install --upgrade dist/visualdl-*.whl
``` ```
### Run a demo from scratch ### Run a demo from scratch
......
...@@ -23,7 +23,7 @@ build_frontend_fake() { ...@@ -23,7 +23,7 @@ build_frontend_fake() {
build_backend() { build_backend() {
cd $BUILD_DIR cd $BUILD_DIR
cmake .. cmake .. ${PYTHON_FLAGS}
make -j2 make -j2
} }
......
...@@ -24,7 +24,7 @@ VisualDL的安装很简单。请按照VisualDL的[官方网站](https://github.c ...@@ -24,7 +24,7 @@ VisualDL的安装很简单。请按照VisualDL的[官方网站](https://github.c
``` ```
python setup.py bdist_wheel python setup.py bdist_wheel
pip install --upgrade dist/visualdl-0.0.1-py2-none-any.whl pip install --upgrade dist/visualdl-*.whl
``` ```
## 开始编写训练MNIST的程序 ## 开始编写训练MNIST的程序
......
...@@ -6,7 +6,7 @@ from distutils.spawn import find_executable ...@@ -6,7 +6,7 @@ from distutils.spawn import find_executable
from distutils import sysconfig, dep_util, log from distutils import sysconfig, dep_util, log
import setuptools.command.build_py import setuptools.command.build_py
import setuptools import setuptools
from setuptools import setup, find_packages from setuptools import setup, find_packages, Distribution, Extension
import subprocess import subprocess
TOP_DIR = os.path.realpath(os.path.dirname(__file__)) TOP_DIR = os.path.realpath(os.path.dirname(__file__))
...@@ -79,22 +79,25 @@ datas = [] ...@@ -79,22 +79,25 @@ datas = []
data_root = os.path.join(TOP_DIR, 'visualdl/server/dist') data_root = os.path.join(TOP_DIR, 'visualdl/server/dist')
for root, dirs, files in os.walk(data_root): for root, dirs, files in os.walk(data_root):
for filename in files: for filename in files:
path = 'dist/'+os.path.join(root, filename)[len(data_root)+1:] path = 'dist/' + os.path.join(root, filename)[len(data_root) + 1:]
datas.append(path) datas.append(path)
print datas print datas
setup( setup(
name="visualdl", name="visualdl",
version=VERSION_NUMBER, version=VERSION_NUMBER,
author="PaddlePaddle and Echarts team.", author="PaddlePaddle and Echarts team",
description="Visualize Deep Learning.", description="Visualize Deep Learning",
license=LICENSE, license=LICENSE,
keywords="visualization deeplearning", keywords="visualization deeplearning",
long_description=read('README.md'), long_description=read('README.md'),
install_requires=install_requires, install_requires=install_requires,
package_data={'visualdl.server': datas, package_data={
'visualdl':['core.so'], 'visualdl.server': datas,
'visualdl.python':['core.so', 'dog.jpg']}, 'visualdl': ['core.so'],
'visualdl.python': ['core.so', 'dog.jpg']
},
packages=packages, packages=packages,
ext_modules=[Extension('_foo', ['stub.cc'])],
scripts=['visualdl/server/visualDL', 'demo/vdl_scratch.py'], scripts=['visualdl/server/visualDL', 'demo/vdl_scratch.py'],
cmdclass=cmdclass) cmdclass=cmdclass)
...@@ -6,6 +6,7 @@ readonly TOP_DIR=$(pwd) ...@@ -6,6 +6,7 @@ readonly TOP_DIR=$(pwd)
readonly core_path=$TOP_DIR/build/visualdl/logic readonly core_path=$TOP_DIR/build/visualdl/logic
readonly python_path=$TOP_DIR/visualdl/python readonly python_path=$TOP_DIR/visualdl/python
readonly max_file_size=1000000 # 1MB readonly max_file_size=1000000 # 1MB
readonly version_number=`cat VERSION_NUMBER`
sudo="sudo" sudo="sudo"
...@@ -41,7 +42,7 @@ package() { ...@@ -41,7 +42,7 @@ package() {
cd $TOP_DIR cd $TOP_DIR
python setup.py bdist_wheel python setup.py bdist_wheel
$sudo pip install dist/visualdl-0.0.1-py2-none-any.whl $sudo pip install dist/visualdl-${version_number}-*.whl
} }
backend_test() { backend_test() {
......
...@@ -18,12 +18,19 @@ add_dependencies(im storage_proto) ...@@ -18,12 +18,19 @@ add_dependencies(im storage_proto)
add_dependencies(sdk entry storage storage_proto eigen3) add_dependencies(sdk entry storage storage_proto eigen3)
## pybind ## pybind
set(OPTIONAL_LINK_FLAGS)
if(NOT APPLE)
set(OPTIONAL_LINK_FLAGS "rt")
endif()
add_library(core SHARED ${PROJECT_SOURCE_DIR}/visualdl/logic/pybind.cc) add_library(core SHARED ${PROJECT_SOURCE_DIR}/visualdl/logic/pybind.cc)
if (NOT ON_RELEASE) if (NOT ON_RELEASE)
add_dependencies(core pybind python im entry tablet storage sdk protobuf glog eigen3) add_dependencies(core pybind python im entry tablet storage sdk protobuf glog eigen3)
target_link_libraries(core PRIVATE pybind entry python im tablet storage sdk protobuf glog) target_link_libraries(core PRIVATE pybind entry python im tablet storage sdk protobuf glog ${OPTIONAL_LINK_FLAGS})
else() else()
add_dependencies(core pybind python im entry tablet storage sdk protobuf eigen3) add_dependencies(core pybind python im entry tablet storage sdk protobuf eigen3)
target_link_libraries(core PRIVATE pybind entry python im tablet storage sdk protobuf) target_link_libraries(core PRIVATE pybind entry python im tablet storage sdk protobuf ${OPTIONAL_LINK_FLAGS})
endif() endif()
set_target_properties(core PROPERTIES PREFIX "" SUFFIX ".so") set_target_properties(core PROPERTIES PREFIX "" SUFFIX ".so")
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册