diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-jupyter.Dockerfile index eaf41e8bcc8..3d37a3b56d2 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-jupyter.Dockerfile @@ -27,7 +27,7 @@ ARG CENTOS_VERSION=8 # Enable both PowerTools and EPEL otherwise some packages like hdf5-devel fail to install RUN dnf install -y 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled PowerTools && \ + dnf config-manager --set-enabled powertools && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${CENTOS_VERSION}".noarch.rpm && \ dnf clean all @@ -40,6 +40,7 @@ RUN yum update -y && \ git \ hdf5-devel \ java-1.8.0-openjdk \ + java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-headless \ libcurl-devel \ make \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpi-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpi-horovod-jupyter.Dockerfile index 939c8b444d1..136ccf0ea6b 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpi-horovod-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpi-horovod-jupyter.Dockerfile @@ -27,7 +27,7 @@ ARG CENTOS_VERSION=8 # Enable both PowerTools and EPEL otherwise some packages like hdf5-devel fail to install RUN dnf install -y 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled PowerTools && \ + dnf config-manager --set-enabled powertools && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${CENTOS_VERSION}".noarch.rpm && \ dnf clean all @@ -40,6 +40,7 @@ RUN yum update -y && \ git \ hdf5-devel \ java-1.8.0-openjdk \ + java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-headless \ libcurl-devel \ make \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpi-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpi-horovod.Dockerfile index f5a21743b25..a7cd7e9e0ef 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpi-horovod.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpi-horovod.Dockerfile @@ -27,7 +27,7 @@ ARG CENTOS_VERSION=8 # Enable both PowerTools and EPEL otherwise some packages like hdf5-devel fail to install RUN dnf install -y 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled PowerTools && \ + dnf config-manager --set-enabled powertools && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${CENTOS_VERSION}".noarch.rpm && \ dnf clean all @@ -40,6 +40,7 @@ RUN yum update -y && \ git \ hdf5-devel \ java-1.8.0-openjdk \ + java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-headless \ libcurl-devel \ make \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpich-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpich-horovod-jupyter.Dockerfile index 20ab1a81242..9a40e0648e8 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpich-horovod-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpich-horovod-jupyter.Dockerfile @@ -27,7 +27,7 @@ ARG CENTOS_VERSION=8 # Enable both PowerTools and EPEL otherwise some packages like hdf5-devel fail to install RUN dnf install -y 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled PowerTools && \ + dnf config-manager --set-enabled powertools && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${CENTOS_VERSION}".noarch.rpm && \ dnf clean all @@ -40,6 +40,7 @@ RUN yum update -y && \ git \ hdf5-devel \ java-1.8.0-openjdk \ + java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-headless \ libcurl-devel \ make \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpich-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpich-horovod.Dockerfile index 3e244cebbb2..5b7cbd77814 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpich-horovod.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel-mpich-horovod.Dockerfile @@ -27,7 +27,7 @@ ARG CENTOS_VERSION=8 # Enable both PowerTools and EPEL otherwise some packages like hdf5-devel fail to install RUN dnf install -y 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled PowerTools && \ + dnf config-manager --set-enabled powertools && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${CENTOS_VERSION}".noarch.rpm && \ dnf clean all @@ -40,6 +40,7 @@ RUN yum update -y && \ git \ hdf5-devel \ java-1.8.0-openjdk \ + java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-headless \ libcurl-devel \ make \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel.Dockerfile index c9ee9442248..abd9773c3ba 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-devel.Dockerfile @@ -27,7 +27,7 @@ ARG CENTOS_VERSION=8 # Enable both PowerTools and EPEL otherwise some packages like hdf5-devel fail to install RUN dnf install -y 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled PowerTools && \ + dnf config-manager --set-enabled powertools && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${CENTOS_VERSION}".noarch.rpm && \ dnf clean all @@ -40,6 +40,7 @@ RUN yum update -y && \ git \ hdf5-devel \ java-1.8.0-openjdk \ + java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-headless \ libcurl-devel \ make \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpi-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpi-horovod-jupyter.Dockerfile index 9b1a8ab6a32..aba6225bf7d 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpi-horovod-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpi-horovod-jupyter.Dockerfile @@ -88,8 +88,10 @@ ARG HOROVOD_WITH_TENSORFLOW=1 ARG HOROVOD_VERSION= RUN yum update -y && yum install -y \ + cmake \ gcc \ gcc-c++ \ + make \ python36-devel && \ yum clean all diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpi-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpi-horovod.Dockerfile index ea62cea0caf..f5fd0210230 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpi-horovod.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpi-horovod.Dockerfile @@ -88,8 +88,10 @@ ARG HOROVOD_WITH_TENSORFLOW=1 ARG HOROVOD_VERSION= RUN yum update -y && yum install -y \ + cmake \ gcc \ gcc-c++ \ + make \ python36-devel && \ yum clean all diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpich-horovod-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpich-horovod-jupyter.Dockerfile index de65f0a0f62..edd26df1409 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpich-horovod-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpich-horovod-jupyter.Dockerfile @@ -87,8 +87,10 @@ ARG HOROVOD_WITH_TENSORFLOW=1 ARG HOROVOD_VERSION= RUN yum update -y && yum install -y \ + cmake \ gcc \ gcc-c++ \ + make \ python36-devel && \ yum clean all diff --git a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpich-horovod.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpich-horovod.Dockerfile index 2b82d58d04d..84d8d9521fc 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpich-horovod.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/onednn/centos-8-mpich-horovod.Dockerfile @@ -87,8 +87,10 @@ ARG HOROVOD_WITH_TENSORFLOW=1 ARG HOROVOD_VERSION= RUN yum update -y && yum install -y \ + cmake \ gcc \ gcc-c++ \ + make \ python36-devel && \ yum clean all 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/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/centos/devel.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/onednn/centos/devel.partial.Dockerfile index 6b86b7fca4d..e57c739a9c6 100644 --- a/tensorflow/tools/dockerfiles/partials/onednn/centos/devel.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/onednn/centos/devel.partial.Dockerfile @@ -4,7 +4,7 @@ ARG CENTOS_VERSION=8 # Enable both PowerTools and EPEL otherwise some packages like hdf5-devel fail to install RUN dnf install -y 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled PowerTools && \ + dnf config-manager --set-enabled powertools && \ dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${CENTOS_VERSION}".noarch.rpm && \ dnf clean all @@ -17,6 +17,7 @@ RUN yum update -y && \ git \ hdf5-devel \ java-1.8.0-openjdk \ + java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-headless \ libcurl-devel \ make \ diff --git a/tensorflow/tools/dockerfiles/partials/onednn/centos/horovod.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/onednn/centos/horovod.partial.Dockerfile index b5fa86db28c..01bc57b9494 100644 --- a/tensorflow/tools/dockerfiles/partials/onednn/centos/horovod.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/onednn/centos/horovod.partial.Dockerfile @@ -5,8 +5,10 @@ ARG HOROVOD_WITH_TENSORFLOW=1 ARG HOROVOD_VERSION= RUN yum update -y && yum install -y \ + cmake \ gcc \ gcc-c++ \ + make \ python36-devel && \ yum clean all 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 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 f6ed6af4ebc..b67e136c981 100644 --- a/tensorflow/tools/dockerfiles/spec.yml +++ b/tensorflow/tools/dockerfiles/spec.yml @@ -351,7 +351,6 @@ slice_sets: args: - CENTOS_VERSION=8 - PYTHON=python3 - - HOROVOD_VERSION=0.19.5 - TF_PACKAGE=intel-tensorflow devel-onednn-mpi-horovod: @@ -499,7 +498,6 @@ slice_sets: args: - CENTOS_VERSION=8 - PYTHON=python3 - - HOROVOD_VERSION=0.19.5 - TF_PACKAGE=intel-tensorflow devel-onednn-mpich-horovod: