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

Upgrade to tensorflow 1.4.0 #227

Merged
merged 3 commits into from
Nov 3, 2017
Merged

Upgrade to tensorflow 1.4.0 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
828491a
Upgrade nvidia driver directory
sjperkins Nov 3, 2017
970f20c
Depend on tensorflow 1.4.0
sjperkins Nov 3, 2017
8f3c1f3
Revert "Upgrade nvidia driver directory"
sjperkins Nov 3, 2017
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
7 changes: 4 additions & 3 deletions install/tensorflow_ops_ext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,13 @@ def create_tensorflow_extension(nvcc_settings, device_info):
depends = glob.glob(os.path.join(source_path, '*.h'))

# Include directories
tf_inc = tf.sysconfig.get_include()
include_dirs = [os.path.join('montblanc', 'include'), source_path]
include_dirs += [tf.sysconfig.get_include()]
include_dirs += [tf_inc, os.path.join(tf_inc, "external", "nsync", "public")]

# Libraries
library_dirs = []
libraries = []
library_dirs = [tf.sysconfig.get_lib()]
libraries = ['tensorflow_framework']
extra_link_args = ['-fPIC', '-fopenmp', '-g0']

# Macros
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def include_pkg_dirs():
'numexpr >= 2.6.1',
'python-casacore >= 2.1.2',
'ruamel.yaml >= 0.15.22',
"{} >= 1.3.0".format(tensorflow_package),
"{} == 1.4.0".format(tensorflow_package),
]

from install.tensorflow_ops_ext import (BuildCommand,
Expand Down