From 70c95446fdec7ed2137552786c2be3167d1ffb9b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Fri, 3 Nov 2017 15:00:23 +0200 Subject: [PATCH] Upgrade to tensorflow 1.4.0 (#227) --- install/tensorflow_ops_ext.py | 7 ++++--- setup.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/install/tensorflow_ops_ext.py b/install/tensorflow_ops_ext.py index e8db07963..b766f6477 100644 --- a/install/tensorflow_ops_ext.py +++ b/install/tensorflow_ops_ext.py @@ -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 diff --git a/setup.py b/setup.py index 82d92135b..480a2faac 100644 --- a/setup.py +++ b/setup.py @@ -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,