From 07d3ebc3f47769533494e70b59d5c09b69d90b65 Mon Sep 17 00:00:00 2001
From: Abolfazl Shahbazi <abolfazl.shahbazi@intel.com>
Date: Thu, 17 Dec 2020 10:59:42 -0800
Subject: [PATCH 1/2] Fix for 'Horovod>0.19.5' installation
---
.../onednn/ubuntu-18.04-mpi-horovod-jupyter.Dockerfile | 1 +
.../dockerfiles/onednn/ubuntu-18.04-mpi-horovod.Dockerfile | 1 +
.../onednn/ubuntu-18.04-mpich-horovod-jupyter.Dockerfile | 1 +
.../dockerfiles/onednn/ubuntu-18.04-mpich-horovod.Dockerfile | 1 +
.../partials/onednn/ubuntu/horovod.partial.Dockerfile | 1 +
tensorflow/tools/dockerfiles/spec.yml | 1 +
6 files changed, 6 insertions(+)
diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpi-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpi-horovod-jupyter.Dockerfile
index f147acbd0db..a11af9ebf1e 100644
--- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpi-horovod-jupyter.Dockerfile
+++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpi-horovod-jupyter.Dockerfile
@@ -85,6 +85,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
python3-dev
diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpi-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpi-horovod.Dockerfile
index b6e0d024486..20ec6458ef4 100644
--- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpi-horovod.Dockerfile
+++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpi-horovod.Dockerfile
@@ -85,6 +85,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
python3-dev
diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpich-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpich-horovod-jupyter.Dockerfile
index b2fc1c9e039..162d0a938fb 100644
--- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpich-horovod-jupyter.Dockerfile
+++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpich-horovod-jupyter.Dockerfile
@@ -81,6 +81,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
python3-dev
diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpich-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpich-horovod.Dockerfile
index 8043109352e..c36de1475dd 100644
--- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpich-horovod.Dockerfile
+++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-18.04-mpich-horovod.Dockerfile
@@ -81,6 +81,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
python3-dev
diff --git a/tensorflow/tools/dockerfiles/partials/onednn/ubuntu/horovod.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/onednn/ubuntu/horovod.partial.Dockerfile
index 63c1e13443c..abc750f2442 100644
--- a/tensorflow/tools/dockerfiles/partials/onednn/ubuntu/horovod.partial.Dockerfile
+++ b/tensorflow/tools/dockerfiles/partials/onednn/ubuntu/horovod.partial.Dockerfile
@@ -6,6 +6,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
python3-dev
diff --git a/tensorflow/tools/dockerfiles/spec.yml b/tensorflow/tools/dockerfiles/spec.yml
index 421f8c56bd1..5043c8ec7c6 100644
--- a/tensorflow/tools/dockerfiles/spec.yml
+++ b/tensorflow/tools/dockerfiles/spec.yml
@@ -421,6 +421,7 @@ slice_sets:
- TF_PACKAGE=intel-tensorflow
- UBUNTU_VERSION=20.04
- PYTHON=python3.7
+ - DEBIAN_FRONTEND="noninteractive"
ubuntu-devel-onednn:
- add_to_name: "-16.04-devel"
From 03e9740b138d482fbbaddb35ee3fe0bdd1667e50 Mon Sep 17 00:00:00 2001
From: Abolfazl Shahbazi <abolfazl.shahbazi@intel.com>
Date: Thu, 17 Dec 2020 13:09:33 -0800
Subject: [PATCH 2/2] Other misc fixes for OneDNN Dockerfiles
---
.../onednn/ubuntu-20.04-mpi-horovod-jupyter.Dockerfile | 1 +
.../dockerfiles/onednn/ubuntu-20.04-mpi-horovod.Dockerfile | 1 +
.../onednn/ubuntu-20.04-mpich-horovod-jupyter.Dockerfile | 1 +
.../dockerfiles/onednn/ubuntu-20.04-mpich-horovod.Dockerfile | 1 +
.../partials/onednn/ubuntu/2004-horovod.partial.Dockerfile | 1 +
5 files changed, 5 insertions(+)
diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpi-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpi-horovod-jupyter.Dockerfile
index 7830420f496..22648657728 100644
--- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpi-horovod-jupyter.Dockerfile
+++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpi-horovod-jupyter.Dockerfile
@@ -95,6 +95,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
${PYTHON}-dev
diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpi-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpi-horovod.Dockerfile
index a5084ee7182..479a4d7cf41 100644
--- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpi-horovod.Dockerfile
+++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpi-horovod.Dockerfile
@@ -95,6 +95,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
${PYTHON}-dev
diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpich-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpich-horovod-jupyter.Dockerfile
index a35aa122ced..b328010b0a4 100644
--- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpich-horovod-jupyter.Dockerfile
+++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpich-horovod-jupyter.Dockerfile
@@ -91,6 +91,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
${PYTHON}-dev
diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpich-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpich-horovod.Dockerfile
index 2090352df62..5648c1ac582 100644
--- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpich-horovod.Dockerfile
+++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/ubuntu-20.04-mpich-horovod.Dockerfile
@@ -91,6 +91,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
${PYTHON}-dev
diff --git a/tensorflow/tools/dockerfiles/partials/onednn/ubuntu/2004-horovod.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/onednn/ubuntu/2004-horovod.partial.Dockerfile
index f018c3a2fc5..c19b891e033 100644
--- a/tensorflow/tools/dockerfiles/partials/onednn/ubuntu/2004-horovod.partial.Dockerfile
+++ b/tensorflow/tools/dockerfiles/partials/onednn/ubuntu/2004-horovod.partial.Dockerfile
@@ -6,6 +6,7 @@ ARG HOROVOD_VERSION=
RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
+ cmake \
g++-8 \
gcc-8 \
${PYTHON}-dev