Merge branch 'staging_0_1_1' into issue_340

MANIFEST.in

@@ -1,3 +1,4 @@
 include ts/frontend/model-server.jar
 include PyPiDescription.rst
 include ts/configs/*
+include ts/version.txt

README.md

@@ -226,59 +226,7 @@ torchserve --stop
 You see output specifying that TorchServe has stopped.
 
 ## Quick Start with Docker
-
-### Prerequisites
-
-* docker - Refer to the [official docker installation guide](https://docs.docker.com/install/)
-* git    - Refer to the [official git set-up guide](https://help.github.com/en/github/getting-started-with-github/set-up-git)
-* TorchServe source code. Clone and enter the repo as follows:
-
-```bash
-git clone https://github.com/pytorch/serve.git
-cd serve
-```
-
-### Build the TorchServe Docker image
-
-The following are examples on how to use the `build_image.sh` script to build Docker images to support CPU or GPU inference.
-
-To build the TorchServe image for a CPU device using the `master` branch, use the following command:
-
-```bash
-./build_image.sh
-```
-
-To create a Docker image for a specific branch, use the following command:
-
-```bash
-./build_image.sh -b <branch_name>
-```
-
-To create a Docker image for a GPU device, use the following command:
-
-```bash
-./build_image.sh --gpu
-```
-
-To create a Docker image for a GPU device with a specific branch, use following command:
-
-```bash
-./build_image.sh -b <branch_name> --gpu
-```
-
-To run your TorchServe Docker image and start TorchServe inside the container with a pre-registered `resnet-18` image classification model, use the following command:
-
-```bash
-./start.sh
-```
-For GPU run the following command:
-```bash
-./start.sh --gpu
-```
-For GPU with specific GPU device ids run the following command:
-```bash
-./start.sh --gpu_devices 1,2,3
-```
+Refer [torchserve docker](docker/README.md) for details.
 
 ## Learn More
 
@@ -295,3 +243,6 @@ We welcome all contributions!
 To learn more about how to contribute, see the contributor guide [here](https://github.com/pytorch/serve/blob/master/CONTRIBUTING.md).
 
 To file a bug or request a feature, please file a GitHub issue. For filing pull requests, please use the template [here](https://github.com/pytorch/serve/blob/master/pull_request_template.md). Cheers!
+
+
+*TorchServe acknowledges the [Multi Model Server (MMS)](https://github.com/awslabs/multi-model-server) project from which it was derived*

docker/Dockerfile

@@ -0,0 +1,86 @@
+# syntax = docker/dockerfile:experimental
+#
+# This file can build images for cpu and gpu env. By default it builds image for CPU.
+# Use following option to build image for cuda/GPU: --build-arg BASE_IMAGE=nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04
+# Here is complete command for GPU/cuda - 
+# $ DOCKER_BUILDKIT=1 docker build --file Dockerfile --build-arg BASE_IMAGE=nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04 -t torchserve:latest .
+#
+# Following comments have been shamelessly copied from https://github.com/pytorch/pytorch/blob/master/Dockerfile
+# 
+# NOTE: To build this you will need a docker version > 18.06 with
+#       experimental enabled and DOCKER_BUILDKIT=1
+#
+#       If you do not use buildkit you are not going to have a good time
+#
+#       For reference: 
+#           https://docs.docker.com/develop/develop-images/build_enhancements/
+
+
+ARG BASE_IMAGE=ubuntu:18.04
+
+FROM ${BASE_IMAGE} AS compile-image
+
+ENV PYTHONUNBUFFERED TRUE
+
+RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    ca-certificates \
+    g++ \
+    python3-dev \
+    python3-distutils \
+    python3-venv \
+    openjdk-11-jre-headless \
+    curl \
+    && rm -rf /var/lib/apt/lists/* \
+    && cd /tmp \
+    && curl -O https://bootstrap.pypa.io/get-pip.py \
+    && python3 get-pip.py
+
+RUN python3 -m venv /home/venv
+
+ENV PATH="/home/venv/bin:$PATH"
+
+RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
+RUN update-alternatives --install /usr/local/bin/pip pip /usr/local/bin/pip3 1
+
+# This is only useful for cuda env 
+RUN export USE_CUDA=1
+
+RUN pip install --no-cache-dir torch torchvision torchtext torchserve torch-model-archiver
+
+# Final image for production
+FROM ${BASE_IMAGE} AS runtime-image
+
+ENV PYTHONUNBUFFERED TRUE
+
+RUN --mount=type=cache,target=/var/cache/apt \
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    python3 \
+    openjdk-11-jre-headless \
+    && rm -rf /var/lib/apt/lists/* \
+    && cd /tmp
+
+COPY --from=compile-image /home/venv /home/venv
+
+ENV PATH="/home/venv/bin:$PATH"
+
+RUN useradd -m model-server \
+    && mkdir -p /home/model-server/tmp
+
+COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
+
+RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh \
+    && chown -R model-server /home/model-server
+
+COPY config.properties /home/model-server/config.properties
+RUN mkdir /home/model-server/model-store && chown -R model-server /home/model-server/model-store
+
+EXPOSE 8080 8081
+
+USER model-server
+WORKDIR /home/model-server
+ENV TEMP=/home/model-server/tmp
+ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"]
+CMD ["serve"]

docker/Dockerfile.cpu → docker/Dockerfile_dev.cpu

@@ -1,8 +1,21 @@
+# syntax = docker/dockerfile:experimental
+#
+# Following comments have been shamelessly copied from https://github.com/pytorch/pytorch/blob/master/Dockerfile
+# 
+# NOTE: To build this you will need a docker version > 18.06 with
+#       experimental enabled and DOCKER_BUILDKIT=1
+#
+#       If you do not use buildkit you are not going to have a good time
+#
+#       For reference: 
+#           https://docs.docker.com/develop/develop-images/build_enhancements/
+
 FROM ubuntu:18.04
 
 ENV PYTHONUNBUFFERED TRUE
 
-RUN apt-get update && \
+RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \
+    apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     fakeroot \
     ca-certificates \
@@ -20,12 +33,10 @@ RUN apt-get update && \
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
 RUN update-alternatives --install /usr/local/bin/pip pip /usr/local/bin/pip3 1
 
-RUN pip install --no-cache-dir psutil
-RUN pip install --no-cache-dir torch
-RUN pip install --no-cache-dir torchvision
-RUN pip install --no-cache-dir torchtext
+RUN pip install --no-cache-dir psutil future torch torchvision torchtext
 ADD serve serve
 RUN pip install ../serve/
+RUN pip install ../serve/model-archiver/
 
 RUN useradd -m model-server \
     && mkdir -p /home/model-server/tmp
@@ -45,5 +56,3 @@ WORKDIR /home/model-server
 ENV TEMP=/home/model-server/tmp
 ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"]
 CMD ["serve"]
-
-LABEL maintainer="wongale@amazon.com"

docker/Dockerfile.gpu → docker/Dockerfile_dev.gpu

@@ -1,8 +1,21 @@
+# syntax = docker/dockerfile:experimental
+#
+# Following comments have been shamelessly copied from https://github.com/pytorch/pytorch/blob/master/Dockerfile
+# 
+# NOTE: To build this you will need a docker version > 18.06 with
+#       experimental enabled and DOCKER_BUILDKIT=1
+#
+#       If you do not use buildkit you are not going to have a good time
+#
+#       For reference: 
+#           https://docs.docker.com/develop/develop-images/build_enhancements/
+
 FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04
 
 ENV PYTHONUNBUFFERED TRUE
 
-RUN apt-get update && \
+RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \
+    apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     fakeroot \
     ca-certificates \
@@ -21,10 +34,10 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
 RUN update-alternatives --install /usr/local/bin/pip pip /usr/local/bin/pip3 1
 
 RUN export USE_CUDA=1
-RUN pip install psutil future torch torchvision torchtext
-RUN pip install --no-cache-dir psutil
+RUN pip install --no-cache-dir psutil future torch torchvision torchtext
 ADD serve serve
 RUN pip install ../serve/
+RUN pip install ../serve/model-archiver/
 
 RUN useradd -m model-server \
     && mkdir -p /home/model-server/tmp
@@ -44,5 +57,3 @@ WORKDIR /home/model-server
 ENV TEMP=/home/model-server/tmp
 ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh"]
 CMD ["serve"]
-
-LABEL maintainer="wongale@amazon.com"