From 7cb8eb75faf25e38ab6e25963d8d880b9b9e06a8 Mon Sep 17 00:00:00 2001
From: "Gerber, Mike" <mike.gerber@sbb.spk-berlin.de>
Date: Wed, 9 Sep 2020 14:07:27 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20run-docker-compatibility-matr?=
 =?UTF-8?q?ix=20to=20test=20more=20combinations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 run-docker                      |  2 +-
 run-docker-compatibility-matrix | 18 ++++++++++++++++++
 test-nvidia                     |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100755 run-docker-compatibility-matrix

diff --git a/run-docker b/run-docker
index c95d212..af5c448 100755
--- a/run-docker
+++ b/run-docker
@@ -9,6 +9,6 @@ for tf in tf1 tf2; do
   esac
   work_dir=`dirname $0`
   image_id=`docker build -q --build-arg tf=$tf --build-arg BASE_IMAGE=$BASE_IMAGE -f assets/Dockerfile $work_dir`
-  docker run --gpus all -it --rm $image_id
+  docker run --gpus all -it --rm -e TF_CPP_MIN_LOG_LEVEL=1 $image_id
   docker rmi $image_id >/dev/null || true
 done
diff --git a/run-docker-compatibility-matrix b/run-docker-compatibility-matrix
new file mode 100755
index 0000000..d53b7a0
--- /dev/null
+++ b/run-docker-compatibility-matrix
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+for tf in tf1 tf2; do
+  #  Note: CUDA 11.0 only with CUDNN 8
+  for BASE_IMAGE in \
+    nvidia/cuda:10.0-cudnn7-runtime-ubuntu18.04 \
+    nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04 \
+    nvidia/cuda:10.2-cudnn7-runtime-ubuntu18.04 \
+    nvidia/cuda:11.0-cudnn8-runtime-ubuntu18.04 \
+  ; do
+    echo "== $tf $BASE_IMAGE"
+    work_dir=`dirname $0`
+    image_id=`docker build -q --build-arg tf=$tf --build-arg BASE_IMAGE=$BASE_IMAGE -f assets/Dockerfile $work_dir`
+    docker run --gpus all -it --rm -e TF_CPP_MIN_LOG_LEVEL=2 $image_id
+    docker rmi $image_id >/dev/null || true
+  done
+done
diff --git a/test-nvidia b/test-nvidia
index 44c357c..37a6bc9 100755
--- a/test-nvidia
+++ b/test-nvidia
@@ -5,7 +5,8 @@ import os
 os.system('nvidia-smi -L')
 
 
-os.environ['TF_CPP_MIN_LOG_LEVEL'] = '1'  # '1' means >= WARN
+if not 'TF_CPP_MIN_LOG_LEVEL' in os.environ:
+    os.environ['TF_CPP_MIN_LOG_LEVEL'] = '1'  # '1' means >= WARN
 import tensorflow as tf
 print('TensorFlow', tf.__version__)
 with tf.compat.v1.Session() as sess: