Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions flow-python/gen_whl.sh
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
# build py36~38 version
CONDA_BASE=$(conda info --base)
source $CONDA_BASE/etc/profile.d/conda.sh
conda activate py36
cargo build --example run_with_plugins --release
cp ../target/release/examples/run_with_plugins ./pyflow/
ldd pyflow/run_with_plugins
cp ../target/release/examples/run_with_plugins ./pyflow/run_with_plugins_inner
rm -rf ./build
python3 whl-py36-setup.py bdist_wheel -p linux-x86_64 -d py36_dist --python-tag py36
py='py36' python3 setup.py bdist_wheel -p linux-x86_64 -d py36_dist

conda activate py37
cargo build --example run_with_plugins --release
cp ../target/release/examples/run_with_plugins ./pyflow/
ldd pyflow/run_with_plugins
cp ../target/release/examples/run_with_plugins ./pyflow/run_with_plugins_inner
rm -rf ./build
python3 whl-py37-setup.py bdist_wheel -p linux-x86_64 -d py37_dist --python-tag py37
py='py37' python3 setup.py bdist_wheel -p linux-x86_64 -d py37_dist

conda activate py38
cargo build --example run_with_plugins --release
cp ../target/release/examples/run_with_plugins ./pyflow/
ldd pyflow/run_with_plugins
cp ../target/release/examples/run_with_plugins ./pyflow/run_with_plugins_inner
rm -rf ./build
python3 whl-py38-setup.py bdist_wheel -p linux-x86_64 -d py38_dist --python-tag py38
py='py38' python3 setup.py bdist_wheel -p linux-x86_64 -d py38_dist


rm -rf dist
mkdir dist
cp py36_dist/pyflow-0.1.0-py36-none-linux_x86_64.whl dist/
cp py37_dist/pyflow-0.1.0-py37-none-linux_x86_64.whl dist/
cp py38_dist/pyflow-0.1.0-py38-none-linux_x86_64.whl dist/
rm -rf py36_dist py37_dist py38_dist
48 changes: 42 additions & 6 deletions flow-python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,47 @@

#!/usr/bin/env python
# coding=utf-8
from setuptools import setup
from setuptools import setup, find_packages
import sys
import os

setup(
name="pyflow",
version="0.1.0",
packages=["pyflow"],
)
if __name__ == '__main__':
py = os.getenv('py')
if py is None:
py = 'py{}{}'.format(sys.version_info[0], sys.version_info[1])
assert py.startswith('py3')
minor = int(py[-1])
setup(
options={'bdist_wheel':{'python_tag': py}},
name="pyflow",
version="0.1.0",
packages=["pyflow"],
author="Megvii IPU-SDK Team",
author_email="megengine@megvii.com",
url="https://github.com/MegEngine/MegFlow",
include_package_data=True,
classifiers=[
'Development Status :: 3 - Alpha',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Natural Language :: English',
'Operating System :: POSIX :: Linux',
'Programming Language :: Rust',
'Programming Language :: Python :: 3.{}'.format(minor),
'Topic :: Software Development :: Libraries :: Application Frameworks',
'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Mathematics',
'Topic :: Scientific/Engineering :: Artificial Intelligence',
'Topic :: Software Development',
'Topic :: Software Development :: Libraries',
'Topic :: Software Development :: Libraries :: Python Modules',
],
python_requires='>=3.{},<3.{}'.format(minor, minor+1),
package_data={
"":['run_with_plugins_inner']
},
entry_points={
'console_scripts':['run_with_plugins=pyflow.command_line:main'],
},
)

48 changes: 0 additions & 48 deletions flow-python/whl-py36-setup.py

This file was deleted.

48 changes: 0 additions & 48 deletions flow-python/whl-py37-setup.py

This file was deleted.

48 changes: 0 additions & 48 deletions flow-python/whl-py38-setup.py

This file was deleted.

6 changes: 3 additions & 3 deletions flow-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ serde = { version = "1.0", features = ["derive"] }
toml = "0.5.8"
lazy_static = "1.4.0"
ctor = "0.1"
pyo3 = "0.14.1"
pyo3 = "0.14"
dyn-clone = "1.0.4"
async-std = { version = "1.9.0", features = ["unstable", "attributes", "tokio1"] }
stackful = { git = "https://github.com/nbdd0121/stackful.git", rev = "4789e26" }
futures-util = "0.3"
futures-core = "0.3.15"
concurrent-queue = "1.2.2"
event-listener = "2.4.0"
numpy = "0.14.1"
numpy = "0.14"
ctrlc = "3.1.9"
log = "0.4.14"
oneshot = "0.1.2"
warp = "0.3"
serde_json = "1.0"
libc = "0.2.100"

[dev-dependencies]
clap = "3.0.0-beta.2"
flow-plugins = {path="../flow-plugins"}
rand = "0.8.4"
libc = "0.2"