Upgrade to tensorflow 1.4.0 (#227)

ratt-ru · Nov 3, 2017 · 70c9544 · 70c9544
1 parent 51be45c
commit 70c9544
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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,