From a1bb3ccc8074160a057ceed1d948b428df009fd2 Mon Sep 17 00:00:00 2001 From: Ajay Karpur Date: Mon, 9 Mar 2020 16:24:23 -0700 Subject: [PATCH 1/3] Add multi-model capability label to Dockerfiles --- docker/1.1.0/final/Dockerfile.cpu | 1 + docker/1.1.0/final/Dockerfile.gpu | 1 + docker/1.2.0/py2/Dockerfile.cpu | 1 + docker/1.2.0/py2/Dockerfile.gpu | 1 + docker/1.2.0/py3/Dockerfile.cpu | 1 + docker/1.2.0/py3/Dockerfile.gpu | 1 + docker/1.3.1/py2/Dockerfile.cpu | 1 + docker/1.3.1/py2/Dockerfile.gpu | 1 + docker/1.3.1/py3/Dockerfile.cpu | 1 + docker/1.3.1/py3/Dockerfile.gpu | 1 + docker/1.4.0/py2/Dockerfile.gpu | 1 + docker/1.4.0/py3/Dockerfile.cpu | 1 + docker/1.4.0/py3/Dockerfile.gpu | 1 + 13 files changed, 13 insertions(+) diff --git a/docker/1.1.0/final/Dockerfile.cpu b/docker/1.1.0/final/Dockerfile.cpu index 9a9d2c06..788e7167 100644 --- a/docker/1.1.0/final/Dockerfile.cpu +++ b/docker/1.1.0/final/Dockerfile.cpu @@ -2,6 +2,7 @@ ARG py_version FROM pytorch-base:1.1.0-cpu-py$py_version LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true # Copy workaround script for incorrect hostname COPY lib/changehostname.c / diff --git a/docker/1.1.0/final/Dockerfile.gpu b/docker/1.1.0/final/Dockerfile.gpu index d72e53ea..5b302902 100644 --- a/docker/1.1.0/final/Dockerfile.gpu +++ b/docker/1.1.0/final/Dockerfile.gpu @@ -2,6 +2,7 @@ ARG py_version FROM pytorch-base:1.1.0-gpu-py$py_version LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true # Copy workaround script for incorrect hostname COPY lib/changehostname.c / diff --git a/docker/1.2.0/py2/Dockerfile.cpu b/docker/1.2.0/py2/Dockerfile.cpu index 346fd43e..e087fb06 100644 --- a/docker/1.2.0/py2/Dockerfile.cpu +++ b/docker/1.2.0/py2/Dockerfile.cpu @@ -2,6 +2,7 @@ FROM ubuntu:16.04 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ diff --git a/docker/1.2.0/py2/Dockerfile.gpu b/docker/1.2.0/py2/Dockerfile.gpu index 165db15d..08c7484e 100644 --- a/docker/1.2.0/py2/Dockerfile.gpu +++ b/docker/1.2.0/py2/Dockerfile.gpu @@ -2,6 +2,7 @@ FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true RUN apt-get update && apt-get install -y --allow-downgrades --allow-change-held-packages --no-install-recommends \ build-essential \ diff --git a/docker/1.2.0/py3/Dockerfile.cpu b/docker/1.2.0/py3/Dockerfile.cpu index fb172ce3..7d868743 100644 --- a/docker/1.2.0/py3/Dockerfile.cpu +++ b/docker/1.2.0/py3/Dockerfile.cpu @@ -2,6 +2,7 @@ FROM ubuntu:16.04 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ diff --git a/docker/1.2.0/py3/Dockerfile.gpu b/docker/1.2.0/py3/Dockerfile.gpu index 79eb1d57..fe52c294 100644 --- a/docker/1.2.0/py3/Dockerfile.gpu +++ b/docker/1.2.0/py3/Dockerfile.gpu @@ -2,6 +2,7 @@ FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true RUN apt-get update && apt-get install -y --allow-downgrades --allow-change-held-packages --no-install-recommends \ build-essential \ diff --git a/docker/1.3.1/py2/Dockerfile.cpu b/docker/1.3.1/py2/Dockerfile.cpu index a5091ecd..346249a7 100644 --- a/docker/1.3.1/py2/Dockerfile.cpu +++ b/docker/1.3.1/py2/Dockerfile.cpu @@ -2,6 +2,7 @@ FROM ubuntu:16.04 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true ARG PYTHON_VERSION=2.7 ARG PYTORCH_VERSION=1.3.1 diff --git a/docker/1.3.1/py2/Dockerfile.gpu b/docker/1.3.1/py2/Dockerfile.gpu index 9a626a8c..42f124e4 100644 --- a/docker/1.3.1/py2/Dockerfile.gpu +++ b/docker/1.3.1/py2/Dockerfile.gpu @@ -2,6 +2,7 @@ FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true ARG PYTHON_VERSION=2.7 ARG PYTORCH_VERSION=1.3.1 diff --git a/docker/1.3.1/py3/Dockerfile.cpu b/docker/1.3.1/py3/Dockerfile.cpu index 47d545aa..d2e7b800 100644 --- a/docker/1.3.1/py3/Dockerfile.cpu +++ b/docker/1.3.1/py3/Dockerfile.cpu @@ -2,6 +2,7 @@ FROM ubuntu:16.04 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true ARG PYTHON_VERSION=3.6.6 ARG PYTORCH_VERSION=1.3.1 diff --git a/docker/1.3.1/py3/Dockerfile.gpu b/docker/1.3.1/py3/Dockerfile.gpu index fd23f785..0eb5e5df 100644 --- a/docker/1.3.1/py3/Dockerfile.gpu +++ b/docker/1.3.1/py3/Dockerfile.gpu @@ -2,6 +2,7 @@ FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true # Add arguments to achieve the version, python and url ARG PYTHON_VERSION=3.6.6 diff --git a/docker/1.4.0/py2/Dockerfile.gpu b/docker/1.4.0/py2/Dockerfile.gpu index 3106f31a..13e686e7 100644 --- a/docker/1.4.0/py2/Dockerfile.gpu +++ b/docker/1.4.0/py2/Dockerfile.gpu @@ -2,6 +2,7 @@ FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true ARG PYTHON_VERSION=2.7 ARG PYTORCH_VERSION=1.4.0 diff --git a/docker/1.4.0/py3/Dockerfile.cpu b/docker/1.4.0/py3/Dockerfile.cpu index fea60118..478c80e6 100644 --- a/docker/1.4.0/py3/Dockerfile.cpu +++ b/docker/1.4.0/py3/Dockerfile.cpu @@ -2,6 +2,7 @@ FROM ubuntu:16.04 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true ARG PYTHON_VERSION=3.6.6 ARG PYTORCH_VERSION=1.4.0 diff --git a/docker/1.4.0/py3/Dockerfile.gpu b/docker/1.4.0/py3/Dockerfile.gpu index f90550ed..4a029635 100644 --- a/docker/1.4.0/py3/Dockerfile.gpu +++ b/docker/1.4.0/py3/Dockerfile.gpu @@ -2,6 +2,7 @@ FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true +LABEL com.amazonaws.sagemaker.capabilities.multi-models=true # Add arguments to achieve the version, python and url ARG PYTHON_VERSION=3.6.6 From 76f93cf729d2e558780f50dad4b0a6691545ab47 Mon Sep 17 00:00:00 2001 From: Ajay Karpur Date: Mon, 9 Mar 2020 17:45:20 -0700 Subject: [PATCH 2/3] Remove MME label from GPU images --- docker/1.1.0/final/Dockerfile.gpu | 1 - docker/1.2.0/py2/Dockerfile.gpu | 1 - docker/1.2.0/py3/Dockerfile.gpu | 1 - docker/1.3.1/py2/Dockerfile.gpu | 1 - docker/1.3.1/py3/Dockerfile.gpu | 1 - docker/1.4.0/py2/Dockerfile.gpu | 1 - docker/1.4.0/py3/Dockerfile.gpu | 1 - 7 files changed, 7 deletions(-) diff --git a/docker/1.1.0/final/Dockerfile.gpu b/docker/1.1.0/final/Dockerfile.gpu index 5b302902..d72e53ea 100644 --- a/docker/1.1.0/final/Dockerfile.gpu +++ b/docker/1.1.0/final/Dockerfile.gpu @@ -2,7 +2,6 @@ ARG py_version FROM pytorch-base:1.1.0-gpu-py$py_version LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true # Copy workaround script for incorrect hostname COPY lib/changehostname.c / diff --git a/docker/1.2.0/py2/Dockerfile.gpu b/docker/1.2.0/py2/Dockerfile.gpu index 08c7484e..165db15d 100644 --- a/docker/1.2.0/py2/Dockerfile.gpu +++ b/docker/1.2.0/py2/Dockerfile.gpu @@ -2,7 +2,6 @@ FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true RUN apt-get update && apt-get install -y --allow-downgrades --allow-change-held-packages --no-install-recommends \ build-essential \ diff --git a/docker/1.2.0/py3/Dockerfile.gpu b/docker/1.2.0/py3/Dockerfile.gpu index fe52c294..79eb1d57 100644 --- a/docker/1.2.0/py3/Dockerfile.gpu +++ b/docker/1.2.0/py3/Dockerfile.gpu @@ -2,7 +2,6 @@ FROM nvidia/cuda:10.0-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true RUN apt-get update && apt-get install -y --allow-downgrades --allow-change-held-packages --no-install-recommends \ build-essential \ diff --git a/docker/1.3.1/py2/Dockerfile.gpu b/docker/1.3.1/py2/Dockerfile.gpu index 42f124e4..9a626a8c 100644 --- a/docker/1.3.1/py2/Dockerfile.gpu +++ b/docker/1.3.1/py2/Dockerfile.gpu @@ -2,7 +2,6 @@ FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true ARG PYTHON_VERSION=2.7 ARG PYTORCH_VERSION=1.3.1 diff --git a/docker/1.3.1/py3/Dockerfile.gpu b/docker/1.3.1/py3/Dockerfile.gpu index 0eb5e5df..fd23f785 100644 --- a/docker/1.3.1/py3/Dockerfile.gpu +++ b/docker/1.3.1/py3/Dockerfile.gpu @@ -2,7 +2,6 @@ FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true # Add arguments to achieve the version, python and url ARG PYTHON_VERSION=3.6.6 diff --git a/docker/1.4.0/py2/Dockerfile.gpu b/docker/1.4.0/py2/Dockerfile.gpu index 13e686e7..3106f31a 100644 --- a/docker/1.4.0/py2/Dockerfile.gpu +++ b/docker/1.4.0/py2/Dockerfile.gpu @@ -2,7 +2,6 @@ FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true ARG PYTHON_VERSION=2.7 ARG PYTORCH_VERSION=1.4.0 diff --git a/docker/1.4.0/py3/Dockerfile.gpu b/docker/1.4.0/py3/Dockerfile.gpu index 4a029635..f90550ed 100644 --- a/docker/1.4.0/py3/Dockerfile.gpu +++ b/docker/1.4.0/py3/Dockerfile.gpu @@ -2,7 +2,6 @@ FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 # NCCL_VERSION=2.4.7, CUDNN_VERSION=7.6.2.24 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true # Add arguments to achieve the version, python and url ARG PYTHON_VERSION=3.6.6 From 5fd448a97b172bf14fd10fca6e8da10c0f1f089f Mon Sep 17 00:00:00 2001 From: Ajay Karpur Date: Mon, 9 Mar 2020 17:59:41 -0700 Subject: [PATCH 3/3] Remove MME label from unsupported framework versions --- docker/1.1.0/final/Dockerfile.cpu | 1 - docker/1.2.0/py2/Dockerfile.cpu | 1 - docker/1.2.0/py3/Dockerfile.cpu | 1 - docker/1.3.1/py2/Dockerfile.cpu | 1 - docker/1.3.1/py3/Dockerfile.cpu | 1 - 5 files changed, 5 deletions(-) diff --git a/docker/1.1.0/final/Dockerfile.cpu b/docker/1.1.0/final/Dockerfile.cpu index 788e7167..9a9d2c06 100644 --- a/docker/1.1.0/final/Dockerfile.cpu +++ b/docker/1.1.0/final/Dockerfile.cpu @@ -2,7 +2,6 @@ ARG py_version FROM pytorch-base:1.1.0-cpu-py$py_version LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true # Copy workaround script for incorrect hostname COPY lib/changehostname.c / diff --git a/docker/1.2.0/py2/Dockerfile.cpu b/docker/1.2.0/py2/Dockerfile.cpu index e087fb06..346fd43e 100644 --- a/docker/1.2.0/py2/Dockerfile.cpu +++ b/docker/1.2.0/py2/Dockerfile.cpu @@ -2,7 +2,6 @@ FROM ubuntu:16.04 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ diff --git a/docker/1.2.0/py3/Dockerfile.cpu b/docker/1.2.0/py3/Dockerfile.cpu index 7d868743..fb172ce3 100644 --- a/docker/1.2.0/py3/Dockerfile.cpu +++ b/docker/1.2.0/py3/Dockerfile.cpu @@ -2,7 +2,6 @@ FROM ubuntu:16.04 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ diff --git a/docker/1.3.1/py2/Dockerfile.cpu b/docker/1.3.1/py2/Dockerfile.cpu index 346249a7..a5091ecd 100644 --- a/docker/1.3.1/py2/Dockerfile.cpu +++ b/docker/1.3.1/py2/Dockerfile.cpu @@ -2,7 +2,6 @@ FROM ubuntu:16.04 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true ARG PYTHON_VERSION=2.7 ARG PYTORCH_VERSION=1.3.1 diff --git a/docker/1.3.1/py3/Dockerfile.cpu b/docker/1.3.1/py3/Dockerfile.cpu index d2e7b800..47d545aa 100644 --- a/docker/1.3.1/py3/Dockerfile.cpu +++ b/docker/1.3.1/py3/Dockerfile.cpu @@ -2,7 +2,6 @@ FROM ubuntu:16.04 LABEL maintainer="Amazon AI" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port=true -LABEL com.amazonaws.sagemaker.capabilities.multi-models=true ARG PYTHON_VERSION=3.6.6 ARG PYTORCH_VERSION=1.3.1