Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support tf version >= 1.4 #120

Merged
merged 1 commit into from
Jul 7, 2018
Merged

Support tf version >= 1.4 #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 26 additions & 3 deletions tensorflow_binding/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import setuptools
import sys
import unittest
import warnings
from setuptools.command.build_ext import build_ext as orig_build_ext

# We need to import tensorflow to find where its include directory is.
Expand Down Expand Up @@ -56,10 +57,31 @@
warp_ctc_includes = [os.path.join(root_path, '../include')]
include_dirs = tf_includes + warp_ctc_includes

extra_compile_args = ['-std=c++11', '-fPIC']
if tf.__version__ >= '1.4':
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it should be a string comparison. It doesn't work for version >= 1.10

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for that, I fixed the problem here #135

Copy link

@yetiancn yetiancn Apr 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! Thank you!

include_dirs += [tf_include + '/../../external/nsync/public']

if os.getenv("TF_CXX11_ABI") is not None:
TF_CXX11_ABI = os.getenv("TF_CXX11_ABI")
else:
warnings.warn("Assuming tensorflow was compiled without C++11 ABI. "
"It is generally true if you are using binary pip package. "
"If you compiled tensorflow from source with gcc >= 5 and didn't set "
"-D_GLIBCXX_USE_CXX11_ABI=0 during compilation, you need to set "
"environment variable TF_CXX11_ABI=1 when compiling this bindings. "
"Also be sure to touch some files in src to trigger recompilation. "
"Also, you need to set (or unsed) this environment variable if getting "
"undefined symbol: _ZN10tensorflow... errors")
TF_CXX11_ABI = "0"

extra_compile_args = ['-std=c++11', '-fPIC', '-D_GLIBCXX_USE_CXX11_ABI=' + TF_CXX11_ABI]
# current tensorflow code triggers return type errors, silence those for now
extra_compile_args += ['-Wno-return-type']

extra_link_args = []
if tf.__version__ >= '1.4':
if os.path.exists(os.path.join(tf_src_dir, 'libtensorflow_framework.so')):
extra_link_args = ['-L' + tf.sysconfig.get_lib(), '-ltensorflow_framework']

if (enable_gpu):
extra_compile_args += ['-DWARPCTC_ENABLE_GPU']
include_dirs += [os.path.join(os.environ["CUDA_HOME"], 'include')]
Expand Down Expand Up @@ -91,8 +113,9 @@
include_dirs = include_dirs,
library_dirs = [warp_ctc_path],
runtime_library_dirs = [os.path.realpath(warp_ctc_path)],
libraries = ['warpctc'],
extra_compile_args = extra_compile_args)
libraries = ['warpctc', 'tensorflow_framework'],
extra_compile_args = extra_compile_args,
extra_link_args = extra_link_args)

class build_tf_ext(orig_build_ext):
def build_extensions(self):
Expand Down