From c4dc88c55418f62ebedd5d000eb586f415dfe18a Mon Sep 17 00:00:00 2001
From: Marty Kandes <mkandes@sdsc.edu>
Date: Fri, 6 Apr 2018 13:37:18 -0700
Subject: [PATCH] naked-singularity-v0.2.8 :: updated tensorflow-cpu.def,
tensorflow-gpu.def, keras-tensorflow-cpu.def, and keras-tensorflow-gpu.def
for comet to TensorFlow v1.7
---
README | 4 ++--
.../sdsc/comet/keras/keras-tensorflow-cpu.def | 16 ++++++-------
.../sdsc/comet/keras/keras-tensorflow-gpu.def | 22 ++++++++++-------
.../sdsc/comet/tensorflow/tensorflow-cpu.def | 14 +++++------
.../sdsc/comet/tensorflow/tensorflow-gpu.def | 24 ++++++++++++-------
5 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/README b/README
index 6db9401..d07fe63 100644
--- a/README
+++ b/README
@@ -29,8 +29,8 @@ AUTHOR
VERSION
- 0.2.7
+ 0.2.8
LAST UPDATED
- Friday, March 30th, 2018
+ Friday, April 6th, 2018
diff --git a/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-cpu.def b/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-cpu.def
index 50bc3c6..ee9823a 100644
--- a/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-cpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-cpu.def
@@ -7,12 +7,12 @@ OSVersion: xenial
AUTHOR_NAME Marty Kandes
AUTHOR_EMAIL mkandes@sdsc.edu
APPLICATION_NAME keras + tensorflow
- APPLICATION_VERSION 2.1.5 + 1.6
+ APPLICATION_VERSION 2.1.5 + 1.7
APPLICATION_URL https://keras.io/
SYSTEM_NAME comet
SYSTEM_SINGULARITY_VERSION 2.3.2
SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
- LAST_UPDATED 20180321
+ LAST_UPDATED 20180404
%setup
@@ -81,8 +81,8 @@ OSVersion: xenial
# Install Bazel from Debian Package
apt-get -y install openjdk-8-jdk
apt-get -y install zlib1g-dev
- wget https://github.com/bazelbuild/bazel/releases/download/0.8.1/bazel_0.8.1-linux-x86_64.deb
- dpkg -i bazel_0.8.1-linux-x86_64.deb
+ wget https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel_0.11.1-linux-x86_64.deb
+ dpkg -i bazel_0.11.1-linux-x86_64.deb
# Install TensorFlow python(2) dependencies
apt-get -y install python-numpy
@@ -94,7 +94,7 @@ OSVersion: xenial
cd /opt
git clone https://github.com/tensorflow/tensorflow
cd tensorflow
- git checkout r1.6
+ git checkout r1.7
# Build and install TensorFlow for python(2)
echo '#!/usr/bin/expect -f' > install-tensorflow-python.exp
@@ -137,7 +137,7 @@ OSVersion: xenial
bazel build --config=opt //tensorflow/tools/pip_package:build_pip_package
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg
- pip install tensorflow_pkg/tensorflow-1.6.0-cp27-cp27mu-linux_x86_64.whl
+ pip install tensorflow_pkg/tensorflow-1.7.0-cp27-cp27mu-linux_x86_64.whl
# Install TensorFlow python3 dependencies
apt-get -y install python3-numpy
@@ -186,7 +186,7 @@ OSVersion: xenial
bazel build --config=opt //tensorflow/tools/pip_package:build_pip_package
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg
- pip3 install tensorflow_pkg/tensorflow-1.6.0-cp35-cp35m-linux_x86_64.whl
+ pip3 install tensorflow_pkg/tensorflow-1.7.0-cp35-cp35m-linux_x86_64.whl
# Install common python packages for data science and machine learning applications
apt-get -y install python-scipy
@@ -217,7 +217,7 @@ OSVersion: xenial
# Install Keras dependencies for python(2) and python3
apt-get -y install python-yaml
apt-get -y install python3-yaml
-
+
# Download, build, and install Keras
cd /opt
wget https://github.com/keras-team/keras/archive/2.1.5.tar.gz
diff --git a/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-gpu.def b/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-gpu.def
index 0e6f7cc..9480098 100644
--- a/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-gpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/keras/keras-tensorflow-gpu.def
@@ -7,12 +7,12 @@ OSVersion: xenial
AUTHOR_NAME Marty Kandes
AUTHOR_EMAIL mkandes@sdsc.edu
APPLICATION_NAME keras + tensorflow
- APPLICATION_VERSION 2.1.5 + 1.6
+ APPLICATION_VERSION 2.1.5 + 1.7
APPLICATION_URL https://keras.io/
SYSTEM_NAME comet
SYSTEM_SINGULARITY_VERSION 2.3.2
SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
- LAST_UPDATED 20180321
+ LAST_UPDATED 20180405
%setup
@@ -218,8 +218,8 @@ OSVersion: xenial
# Install Bazel from Debian Package
apt-get -y install openjdk-8-jdk
apt-get -y install zlib1g-dev
- wget https://github.com/bazelbuild/bazel/releases/download/0.8.1/bazel_0.8.1-linux-x86_64.deb
- dpkg -i bazel_0.8.1-linux-x86_64.deb
+ wget https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel_0.11.1-linux-x86_64.deb
+ dpkg -i bazel_0.11.1-linux-x86_64.deb
# Install TensorFlow python(2) dependencies
apt-get -y install python-numpy
@@ -231,7 +231,7 @@ OSVersion: xenial
cd /opt
git clone https://github.com/tensorflow/tensorflow
cd tensorflow
- git checkout r1.6
+ git checkout r1.7
# Build and install TensorFlow for python(2)
echo '#!/usr/bin/expect -f' > install-tensorflow-python.exp
@@ -288,11 +288,14 @@ OSVersion: xenial
chmod +x install-tensorflow-python.exp
./install-tensorflow-python.exp
+
+ # See https://github.com/tensorflow/tensorflow/issues/17801
+ ln -s /usr/local/cuda-8.0/nvvm/libdevice/libdevice.compute_50.10.bc /usr/local/cuda-8.0/nvvm/libdevice/libdevice.10.bc
bazel build --config=opt --config=cuda //tensorflow/tools/pip_package:build_pip_package
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg
- pip install tensorflow_pkg/tensorflow-1.6.0-cp27-cp27mu-linux_x86_64.whl
+ pip install tensorflow_pkg/tensorflow-1.7.0-cp27-cp27mu-linux_x86_64.whl
# Install TensorFlow python3 dependencies
apt-get -y install python3-numpy
@@ -356,10 +359,13 @@ OSVersion: xenial
chmod +x install-tensorflow-python3.exp
./install-tensorflow-python3.exp
+ # See https://github.com/tensorflow/tensorflow/issues/17801
+ ln -s /usr/local/cuda-8.0/nvvm/libdevice/libdevice.compute_50.10.bc /usr/local/cuda-8.0/nvvm/libdevice/libdevice.10.bc
+
bazel build --config=opt --config=cuda //tensorflow/tools/pip_package:build_pip_package
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg
- pip3 install tensorflow_pkg/tensorflow-1.6.0-cp35-cp35m-linux_x86_64.whl
+ pip3 install tensorflow_pkg/tensorflow-1.7.0-cp35-cp35m-linux_x86_64.whl
# Install common python packages for data science and machine learning applications
apt-get -y install python-scipy
@@ -390,7 +396,7 @@ OSVersion: xenial
# Install Keras dependencies for python(2) and python3
apt-get -y install python-yaml
apt-get -y install python3-yaml
-
+
# Download, build, and install Keras
cd /opt
wget https://github.com/keras-team/keras/archive/2.1.5.tar.gz
diff --git a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def
index 88051d2..10481b0 100644
--- a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-cpu.def
@@ -7,12 +7,12 @@ OSVersion: xenial
AUTHOR_NAME Marty Kandes
AUTHOR_EMAIL mkandes@sdsc.edu
APPLICATION_NAME tensorflow
- APPLICATION_VERSION 1.6
+ APPLICATION_VERSION 1.7
APPLICATION_URL https://www.tensorflow.org
SYSTEM_NAME comet
SYSTEM_SINGULARITY_VERSION 2.3.2
SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
- LAST_UPDATED 20180313
+ LAST_UPDATED 20180329
%setup
@@ -81,8 +81,8 @@ OSVersion: xenial
# Install Bazel from Debian Package
apt-get -y install openjdk-8-jdk
apt-get -y install zlib1g-dev
- wget https://github.com/bazelbuild/bazel/releases/download/0.8.1/bazel_0.8.1-linux-x86_64.deb
- dpkg -i bazel_0.8.1-linux-x86_64.deb
+ wget https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel_0.11.1-linux-x86_64.deb
+ dpkg -i bazel_0.11.1-linux-x86_64.deb
# Install TensorFlow python(2) dependencies
apt-get -y install python-numpy
@@ -94,7 +94,7 @@ OSVersion: xenial
cd /opt
git clone https://github.com/tensorflow/tensorflow
cd tensorflow
- git checkout r1.6
+ git checkout r1.7
# Build and install TensorFlow for python(2)
echo '#!/usr/bin/expect -f' > install-tensorflow-python.exp
@@ -137,7 +137,7 @@ OSVersion: xenial
bazel build --config=opt //tensorflow/tools/pip_package:build_pip_package
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg
- pip install tensorflow_pkg/tensorflow-1.6.0-cp27-cp27mu-linux_x86_64.whl
+ pip install tensorflow_pkg/tensorflow-1.7.0-cp27-cp27mu-linux_x86_64.whl
# Install TensorFlow python3 dependencies
apt-get -y install python3-numpy
@@ -186,7 +186,7 @@ OSVersion: xenial
bazel build --config=opt //tensorflow/tools/pip_package:build_pip_package
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg
- pip3 install tensorflow_pkg/tensorflow-1.6.0-cp35-cp35m-linux_x86_64.whl
+ pip3 install tensorflow_pkg/tensorflow-1.7.0-cp35-cp35m-linux_x86_64.whl
# Install common python packages for data science and machine learning applications
apt-get -y install python-scipy
diff --git a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
index e08d4b8..dd58267 100644
--- a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
@@ -7,12 +7,12 @@ OSVersion: xenial
AUTHOR_NAME Marty Kandes
AUTHOR_EMAIL mkandes@sdsc.edu
APPLICATION_NAME tensorflow
- APPLICATION_VERSION 1.6
+ APPLICATION_VERSION 1.7
APPLICATION_URL https://www.tensorflow.org
SYSTEM_NAME comet
SYSTEM_SINGULARITY_VERSION 2.3.2
SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
- LAST_UPDATED 20180313
+ LAST_UPDATED 20180331
%setup
@@ -218,8 +218,8 @@ OSVersion: xenial
# Install Bazel from Debian Package
apt-get -y install openjdk-8-jdk
apt-get -y install zlib1g-dev
- wget https://github.com/bazelbuild/bazel/releases/download/0.8.1/bazel_0.8.1-linux-x86_64.deb
- dpkg -i bazel_0.8.1-linux-x86_64.deb
+ wget https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel_0.11.1-linux-x86_64.deb
+ dpkg -i bazel_0.11.1-linux-x86_64.deb
# Install TensorFlow python(2) dependencies
apt-get -y install python-numpy
@@ -231,7 +231,7 @@ OSVersion: xenial
cd /opt
git clone https://github.com/tensorflow/tensorflow
cd tensorflow
- git checkout r1.6
+ git checkout r1.7
# Build and install TensorFlow for python(2)
echo '#!/usr/bin/expect -f' > install-tensorflow-python.exp
@@ -288,11 +288,14 @@ OSVersion: xenial
chmod +x install-tensorflow-python.exp
./install-tensorflow-python.exp
+
+ # See https://github.com/tensorflow/tensorflow/issues/17801
+ ln -s /usr/local/cuda-8.0/nvvm/libdevice/libdevice.compute_50.10.bc /usr/local/cuda-8.0/nvvm/libdevice/libdevice.10.bc
bazel build --config=opt --config=cuda //tensorflow/tools/pip_package:build_pip_package
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg
- pip install tensorflow_pkg/tensorflow-1.6.0-cp27-cp27mu-linux_x86_64.whl
+ pip install tensorflow_pkg/tensorflow-1.7.0-cp27-cp27mu-linux_x86_64.whl
# Install TensorFlow python3 dependencies
apt-get -y install python3-numpy
@@ -356,10 +359,13 @@ OSVersion: xenial
chmod +x install-tensorflow-python3.exp
./install-tensorflow-python3.exp
+ # See https://github.com/tensorflow/tensorflow/issues/17801
+ ln -s /usr/local/cuda-8.0/nvvm/libdevice/libdevice.compute_50.10.bc /usr/local/cuda-8.0/nvvm/libdevice/libdevice.10.bc
+
bazel build --config=opt --config=cuda //tensorflow/tools/pip_package:build_pip_package
bazel-bin/tensorflow/tools/pip_package/build_pip_package tensorflow_pkg
- pip3 install tensorflow_pkg/tensorflow-1.6.0-cp35-cp35m-linux_x86_64.whl
+ pip3 install tensorflow_pkg/tensorflow-1.7.0-cp35-cp35m-linux_x86_64.whl
# Install common python packages for data science and machine learning applications
apt-get -y install python-scipy
@@ -402,6 +408,6 @@ OSVersion: xenial
%test
# Test TensorFlow for both python and python3
- time -p python /opt/tensorflow/tensorflow/examples/tutorials/mnist/mnist_deep.py
- time -p python3 /opt/tensorflow/tensorflow/examples/tutorials/mnist/mnist_deep.py
+ #time -p python /opt/tensorflow/tensorflow/examples/tutorials/mnist/mnist_deep.py
+ #time -p python3 /opt/tensorflow/tensorflow/examples/tutorials/mnist/mnist_deep.py
--
GitLab