Skip to content

Commit 7e432a1

Browse files
committed
Merge branch 'add_python_version' into 'master'
add python version See merge request deep-learning/tensornet!10
2 parents bed96d2 + 3f31100 commit 7e432a1

File tree

7 files changed

+17
-4
lines changed

7 files changed

+17
-4
lines changed

Diff for: .bazelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build:macos --host_cxxopt=-std=c++14
55
build:windows --cxxopt=/std:c++14
66
build:windows --host_cxxopt=/std:c++14
77

8-
build --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=1"
8+
build --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0"
99
build --cxxopt=-std=c++14
1010

1111
build --apple_platform_type=macos

Diff for: .github/workflows/python.yml

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
- name: Create setup dist
3737
run: |
3838
./manager create_dist
39-
twine check dist/*
4039
shell: micromamba-shell {0}
4140

4241
- name: Store wheels

Diff for: core/BUILD

+6
Original file line numberDiff line numberDiff line change
@@ -145,5 +145,11 @@ cc_binary(
145145
"@boost//:random",
146146
"@boost//:iostreams",
147147
],
148+
linkopts = [
149+
"-Wl,-rpath,$$ORIGIN/../libs",
150+
"-Wl,-rpath,$$ORIGIN/../../../../../lib",
151+
"-Wl,-rpath,$$ORIGIN/../../tensorflow",
152+
"-Wl,-rpath,$$ORIGIN/../../tensorflow/python"
153+
],
148154
linkshared = 1,
149155
)

Diff for: manager

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ start_create_dist(){
107107
[[ $# > 0 ]] && export TN_VERSION=$1
108108
PY_VERSION=$(python -c "import sys; print('cp' + ''.join(map(str, sys.version_info[:2])))")
109109
python setup.py bdist_wheel --plat-name manylinux2010_x86_64 --python-tag ${PY_VERSION}
110+
twine check dist/*
110111
}
111112

112113
start_upload(){

Diff for: setup.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import os
22
from setuptools import setup, find_packages
3+
from importlib.machinery import SourceFileLoader
4+
5+
# use importlib to avoid import so file
6+
_version = SourceFileLoader('version', 'tensornet/version.py').load_module()
7+
version = _version.VERSION
38

4-
version = os.environ.get('TN_VERSION', '0.1.2')
59

610
setup(
711
name='qihoo-tensornet',

Diff for: tensornet/__init__.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@
2222
from . import model
2323
from . import data
2424

25-
version = "0.1.0"
25+
from . import version as _version
26+
27+
__version__ = _version.VERSION

Diff for: tensornet/version.py

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VERSION = "0.13.0.dev1"

0 commit comments

Comments
 (0)