From d6c1b135ca313267546bf1453a40cee701257b3b Mon Sep 17 00:00:00 2001 From: vishal Date: Fri, 23 Aug 2019 11:17:03 -0400 Subject: [PATCH 1/2] Update all images to use python 3.6 by updating ubuntu from 16 to ubuntu 18 --- docs/deployments/request-handlers.md | 5 ++--- images/onnx-serve-gpu/Dockerfile | 4 ++-- images/onnx-serve/Dockerfile | 4 ++-- images/python-packager/Dockerfile | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/deployments/request-handlers.md b/docs/deployments/request-handlers.md index bcddd4e6ac..7eb6b8e99f 100644 --- a/docs/deployments/request-handlers.md +++ b/docs/deployments/request-handlers.md @@ -80,10 +80,9 @@ msgpack==0.6.1 numpy>=1.13.3,<2 requirements-parser==0.2.0 packaging==19.0.0 -pillow==6.1.0 -regex==2017.4.5 requests==2.21.0 -tensorflow==1.14.0 # In TensorFlow model formats only +tensorflow==1.14.0 # In TensorFlow serving images only +onnxruntime==0.5.0 # In ONNX serving images only ``` You can install additional PyPI packages and import your own Python packages. See [Python Packages](../piplines/python-packages.md) for more details. diff --git a/images/onnx-serve-gpu/Dockerfile b/images/onnx-serve-gpu/Dockerfile index dfb56ca348..1c82f3e3a6 100644 --- a/images/onnx-serve-gpu/Dockerfile +++ b/images/onnx-serve-gpu/Dockerfile @@ -1,6 +1,6 @@ -FROM nvidia/cuda:9.1-cudnn7-devel +FROM nvidia/cuda:10.0-cudnn7-devel -ARG ONNXRUNTIME_VERSION="0.4.0" +ARG ONNXRUNTIME_VERSION="0.5.0" RUN apt-get update -qq && apt-get install -y -q \ python3 \ diff --git a/images/onnx-serve/Dockerfile b/images/onnx-serve/Dockerfile index 8210cf3c65..efb3b615c8 100644 --- a/images/onnx-serve/Dockerfile +++ b/images/onnx-serve/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 -ARG ONNXRUNTIME_VERSION="0.4.0" +ARG ONNXRUNTIME_VERSION="0.5.0" RUN apt-get update -qq && apt-get install -y -q \ python3 \ diff --git a/images/python-packager/Dockerfile b/images/python-packager/Dockerfile index e59aba113d..928de952f5 100644 --- a/images/python-packager/Dockerfile +++ b/images/python-packager/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 RUN apt-get update -qq && apt-get install -y -q \ python3 \ From 564c589ce64e54db388877c9a513e71819027e8f Mon Sep 17 00:00:00 2001 From: vishal Date: Fri, 23 Aug 2019 22:26:47 +0000 Subject: [PATCH 2/2] Adjust requirements.txt --- examples/imagenet/requirements.txt | 1 + pkg/workloads/cortex/lib/requirements.txt | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 examples/imagenet/requirements.txt diff --git a/examples/imagenet/requirements.txt b/examples/imagenet/requirements.txt new file mode 100644 index 0000000000..3868fb16b8 --- /dev/null +++ b/examples/imagenet/requirements.txt @@ -0,0 +1 @@ +pillow diff --git a/pkg/workloads/cortex/lib/requirements.txt b/pkg/workloads/cortex/lib/requirements.txt index d686db7124..b80248ed34 100644 --- a/pkg/workloads/cortex/lib/requirements.txt +++ b/pkg/workloads/cortex/lib/requirements.txt @@ -4,6 +4,4 @@ numpy>=1.13.3,<2 requirements-parser==0.2.0 packaging==19.0.0 json_tricks==3.13.1 -pillow==6.1.0 -regex==2017.4.5 requests==2.21.0