From 828491a2d2bcdde1c60b24920a8cfe10d6a1e62e Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Fri, 3 Nov 2017 14:51:57 +0200 Subject: [PATCH 1/3] Upgrade nvidia driver directory nvidia-384 seems to be the latest. --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index 45c2788a5..1f7a95f0f 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -43,7 +43,7 @@ Pre-requisites $ export LD_LIBRARY_PATH=$CUDNN_HOME/lib64:$LD_LIBRARY_PATH # Latest NVIDIA drivers - $ export LD_LIBRARY_PATH=/usr/lib/nvidia-375:$LD_LIBRARY_PATH + $ export LD_LIBRARY_PATH=/usr/lib/nvidia-384:$LD_LIBRARY_PATH If the installer cannot find CUDA it will only install the `CPU version of tensorflow `_ and only **compile multi-threaded CPU operators**. From 970f20c5c6e865638d2e9b51fb17398047ecc398 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Fri, 3 Nov 2017 14:52:26 +0200 Subject: [PATCH 2/3] Depend on tensorflow 1.4.0 --- 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, From 8f3c1f36aba098a9a98db1d5857bdaebdba03af6 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Fri, 3 Nov 2017 14:59:09 +0200 Subject: [PATCH 3/3] Revert "Upgrade nvidia driver directory" This reverts commit 828491a2d2bcdde1c60b24920a8cfe10d6a1e62e. --- docs/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation.rst b/docs/installation.rst index 1f7a95f0f..45c2788a5 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -43,7 +43,7 @@ Pre-requisites $ export LD_LIBRARY_PATH=$CUDNN_HOME/lib64:$LD_LIBRARY_PATH # Latest NVIDIA drivers - $ export LD_LIBRARY_PATH=/usr/lib/nvidia-384:$LD_LIBRARY_PATH + $ export LD_LIBRARY_PATH=/usr/lib/nvidia-375:$LD_LIBRARY_PATH If the installer cannot find CUDA it will only install the `CPU version of tensorflow `_ and only **compile multi-threaded CPU operators**.