Skip to content

Commit

Permalink
Merge pull request #346 from jklaise/s2i-0.4-update
Browse files Browse the repository at this point in the history 
S2i 0.4 update
  • Loading branch information
@ukclivecox
ukclivecox authored Dec 17, 2018
2 parents 6dc3f61 + 7050827 commit 5f09096
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 38 deletions.
21 changes: 10 additions & 11 deletions docs/wrappers/python.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ If you are not familiar with s2i you can read [general instructions on using s2i
To check everything is working you can run

```bash
s2i usage seldonio/seldon-core-s2i-python3:0.3
s2i usage seldonio/seldon-core-s2i-python3:0.4
```


Expand Down Expand Up @@ -83,25 +83,24 @@ These values can also be provided or overridden on the command line when buildin
# Step 3 - Build your image
Use ```s2i build``` to create your Docker image from source code. You will need Docker installed on the machine and optionally git if your source code is in a public git repo. You can choose from three python builder images

* Python 2 : seldonio/seldon-core-s2i-python2:0.3
* Python 3.6 : seldonio/seldon-core-s2i-python36:0.3, seldonio/seldon-core-s2i-python3:0.3
* Python 3.7 : seldonio/seldon-core-s2i-python37:0.3
* Note there are [issues running TensorFlow under Python 3.7](https://github.com/tensorflow/tensorflow/issues/20444) (Nov 2018)
* Python 2 : seldonio/seldon-core-s2i-python2:0.4
* Python 3.6 : seldonio/seldon-core-s2i-python36:0.4, seldonio/seldon-core-s2i-python3:0.4
* Note there are [issues running TensorFlow under Python 3.7](https://github.com/tensorflow/tensorflow/issues/20444) (Nov 2018) and Python 3.7 is not officially supported by TensorFlow (Dec 2018).
* Python 3.6 plus ONNX support via [Intel nGraph](https://github.com/NervanaSystems/ngraph) : seldonio/seldon-core-s2i-python3-ngraph-onnx:0.1

Using s2i you can build directly from a git repo or from a local source folder. See the [s2i docs](https://github.com/openshift/source-to-image/blob/master/docs/cli.md#s2i-build) for further details. The general format is:

```bash
s2i build <git-repo> seldonio/seldon-core-s2i-python2:0.3 <my-image-name>
s2i build <src-folder> seldonio/seldon-core-s2i-python2:0.3 <my-image-name>
s2i build <git-repo> seldonio/seldon-core-s2i-python2:0.4 <my-image-name>
s2i build <src-folder> seldonio/seldon-core-s2i-python2:0.4 <my-image-name>
```

Change to seldonio/seldon-core-s2i-python3 if using python 3.

An example invocation using the test template model inside seldon-core:

```bash
s2i build https://github.com/seldonio/seldon-core.git --context-dir=wrappers/s2i/python/test/model-template-app seldonio/seldon-core-s2i-python2:0.3 seldon-core-template-model
s2i build https://github.com/seldonio/seldon-core.git --context-dir=wrappers/s2i/python/test/model-template-app seldonio/seldon-core-s2i-python2:0.4 seldon-core-template-model
```

The above s2i build invocation:
Expand All @@ -116,14 +115,14 @@ For building from a local source folder, an example where we clone the seldon-co
```bash
git clone https://github.com/seldonio/seldon-core.git
cd seldon-core
s2i build wrappers/s2i/python/test/model-template-app seldonio/seldon-core-s2i-python2:0.3 seldon-core-template-model
s2i build wrappers/s2i/python/test/model-template-app seldonio/seldon-core-s2i-python2:0.4 seldon-core-template-model
```

For more help see:

```
s2i usage seldonio/seldon-core-s2i-python2:0.3
s2i usage seldonio/seldon-core-s2i-python3:0.3
s2i usage seldonio/seldon-core-s2i-python2:0.4
s2i usage seldonio/seldon-core-s2i-python3:0.4
s2i build --help
```

Expand Down
4 changes: 2 additions & 2 deletions examples/models/deep_mnist/deep_mnist.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python2:0.3 deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python2:0.4 deep-mnist:0.1"
]
},
{
Expand Down Expand Up @@ -190,7 +190,7 @@
"metadata": {},
"outputs": [],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python2:0.3 deep-mnist:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python2:0.4 deep-mnist:0.1"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/keras_mnist/keras_mnist.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.3 keras-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.4 keras-mnist:0.1"
]
},
{
Expand Down Expand Up @@ -358,7 +358,7 @@
"metadata": {},
"outputs": [],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.3 keras-mnist:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.4 keras-mnist:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/nvidia-mnist/nvidia_mnist.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.3 mnist-caffe2-transformer:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.4 mnist-caffe2-transformer:0.1"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/sk_mnist/skmnist.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.3 sk-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.4 sk-mnist:0.1"
]
},
{
Expand Down Expand Up @@ -198,7 +198,7 @@
"metadata": {},
"outputs": [],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.3 sk-mnist:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.4 sk-mnist:0.1"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions examples/models/sklearn_iris/sklearn_iris.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.3 sklearn-iris:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.4 sklearn-iris:0.1"
]
},
{
Expand Down Expand Up @@ -137,7 +137,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build -E .s2i/environment_grpc . seldonio/seldon-core-s2i-python3:0.3 sklearn-iris:0.1"
"!s2i build -E .s2i/environment_grpc . seldonio/seldon-core-s2i-python3:0.4 sklearn-iris:0.1"
]
},
{
Expand Down Expand Up @@ -251,7 +251,7 @@
"metadata": {},
"outputs": [],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.3 sklearn-iris:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.4 sklearn-iris:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/sklearn_iris_fbs/sklearn_iris.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.3 sklearn-iris:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.4 sklearn-iris:0.1"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions examples/models/template_model_with_feedback/modelWithFeedback.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.3 model-with-feedback-rest:0.1"
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.4 model-with-feedback-rest:0.1"
]
},
{
Expand Down Expand Up @@ -98,7 +98,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python3:0.3 model-with-feedback-grpc:0.1"
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python3:0.4 model-with-feedback-grpc:0.1"
]
},
{
Expand Down Expand Up @@ -228,7 +228,7 @@
"metadata": {},
"outputs": [],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.3 model-with-feedback-rest:0.1 --loglevel 5"
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.4 model-with-feedback-rest:0.1 --loglevel 5"
]
},
{
Expand Down Expand Up @@ -323,7 +323,7 @@
"metadata": {},
"outputs": [],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_grpc . seldonio/seldon-core-s2i-python3:0.3 model-with-feedback-grpc:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_grpc . seldonio/seldon-core-s2i-python3:0.4 model-with-feedback-grpc:0.1"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions examples/models/template_model_with_metrics/modelWithMetrics.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.3 model-with-metrics-rest:0.1"
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.4 model-with-metrics-rest:0.1"
]
},
{
Expand Down Expand Up @@ -105,7 +105,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python3:0.3 model-with-metrics-grpc:0.1"
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python3:0.4 model-with-metrics-grpc:0.1"
]
},
{
Expand Down Expand Up @@ -239,7 +239,7 @@
"metadata": {},
"outputs": [],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.3 model-with-metrics-rest:0.1 --loglevel 5"
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.4 model-with-metrics-rest:0.1 --loglevel 5"
]
},
{
Expand Down Expand Up @@ -316,7 +316,7 @@
"metadata": {},
"outputs": [],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_grpc . seldonio/seldon-core-s2i-python3:0.3 model-with-metrics-grpc:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_grpc . seldonio/seldon-core-s2i-python3:0.4 model-with-metrics-grpc:0.1"
]
},
{
Expand Down
10 changes: 5 additions & 5 deletions readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Seldon-core allows various types of components to be built and plugged into the
* [Mahalanobis distance outlier detection](https://github.com/SeldonIO/seldon-core/blob/master/examples/transformers/outlier_mahalanobis/outlier_documentation.ipynb). Example usage can be found in the [Advanced graphs notebook](https://github.com/cliveseldon/seldon-core/blob/master/notebooks/advanced_graphs.ipynb)
* **Combiners**
* [MNIST Average Combiner](examples/combiners/mnist_combiner/mnist_combiner.ipynb) - ensembles sklearn and Tensorflow Models.

## Integrations

* [kubeflow](https://github.com/kubeflow/kubeflow)
Expand Down Expand Up @@ -178,12 +178,12 @@ Follow the [install guide](docs/install.md) for details on ways to install seldo
| Seldon Operator | [seldonio/cluster-manager](https://hub.docker.com/r/seldonio/cluster-manager/tags/) | 0.2.5 | 0.2.6-SNAPSHOT |
| Seldon Service Orchestrator | [seldonio/engine](https://hub.docker.com/r/seldonio/engine/tags/) | 0.2.5 | 0.2.6-SNAPSHOT |
| Seldon API Gateway | [seldonio/apife](https://hub.docker.com/r/seldonio/apife/tags/) | 0.2.5 | 0.2.6-SNAPSHOT |
| [Seldon Python 3 (3.6) Wrapper for S2I](docs/wrappers/python.md) | [seldonio/seldon-core-s2i-python3](https://hub.docker.com/r/seldonio/seldon-core-s2i-python3/tags/) | 0.3 | 0.4-SNAPSHOT |
| [Seldon Python 3.6 Wrapper for S2I](docs/wrappers/python.md) | [seldonio/seldon-core-s2i-python36](https://hub.docker.com/r/seldonio/seldon-core-s2i-python36/tags/) | 0.3 | 0.4-SNAPSHOT |
| [Seldon Python 2 Wrapper for S2I](docs/wrappers/python.md) | [seldonio/seldon-core-s2i-python2](https://hub.docker.com/r/seldonio/seldon-core-s2i-python2/tags/) | 0.3 | 0.4-SNAPSHOT |
| [Seldon Python 3 (3.6) Wrapper for S2I](docs/wrappers/python.md) | [seldonio/seldon-core-s2i-python3](https://hub.docker.com/r/seldonio/seldon-core-s2i-python3/tags/) | 0.4 | 0.5-SNAPSHOT |
| [Seldon Python 3.6 Wrapper for S2I](docs/wrappers/python.md) | [seldonio/seldon-core-s2i-python36](https://hub.docker.com/r/seldonio/seldon-core-s2i-python36/tags/) | 0.4 | 0.5-SNAPSHOT |
| [Seldon Python 2 Wrapper for S2I](docs/wrappers/python.md) | [seldonio/seldon-core-s2i-python2](https://hub.docker.com/r/seldonio/seldon-core-s2i-python2/tags/) | 0.4 | 0.5-SNAPSHOT |
| [Seldon Python ONNX Wrapper for S2I](docs/wrappers/python.md) | [seldonio/seldon-core-s2i-python3-ngraph-onnx](https://hub.docker.com/r/seldonio/seldon-core-s2i-python3-ngraph-onnx/tags/) | 0.2 | |
| [Seldon Java Build Wrapper for S2I](docs/wrappers/java.md) | [seldonio/seldon-core-s2i-java-build](https://hub.docker.com/r/seldonio/seldon-core-s2i-java-build/tags/) | 0.1 | |
| [Seldon Java Runtime Wrapper for S2I](docs/wrappers/java.md) | [seldonio/seldon-core-s2i-java-runtime](https://hub.docker.com/r/seldonio/seldon-core-s2i-java-runtime/tags/) | 0.1 | |
| [Seldon Java Runtime Wrapper for S2I](docs/wrappers/java.md) | [seldonio/seldon-core-s2i-java-runtime](https://hub.docker.com/r/seldonio/seldon-core-s2i-java-runtime/tags/) | 0.1 | |
| [Seldon R Wrapper for S2I](docs/wrappers/r.md) | [seldonio/seldon-core-s2i-r](https://hub.docker.com/r/seldonio/seldon-core-s2i-r/tags/) | 0.2 | |
| [Seldon NodeJS Wrapper for S2I](docs/wrappers/nodejs.md) | [seldonio/seldon-core-s2i-nodejs](https://hub.docker.com/r/seldonio/seldon-core-s2i-nodejs/tags/) | 0.1 | 0.2-SNAPSHOT |
| [Seldon Tensorflow Serving proxy](integrations/tfserving/README.md) | [seldonio/tfserving-proxy](https://hub.docker.com/r/seldonio/tfserving-proxy/tags/) | 0.1 |
Expand Down
2 changes: 1 addition & 1 deletion wrappers/s2i/python/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ SHELL:=/bin/bash
PYTHON_VERSION=2
IMAGE_PYTHON_VERSION=`echo -n $(PYTHON_VERSION) | sed 's/\.//g'`
BASE_IMAGE_PYTHON_VERSION=`echo -n $(PYTHON_VERSION) | cut -d. -f1`
IMAGE_VERSION=0.4-SNAPSHOT
IMAGE_VERSION=0.5-SNAPSHOT
IMAGE_NAME = docker.io/seldonio/seldon-core-s2i-python${IMAGE_PYTHON_VERSION}
BASE_IMAGE_NAME = docker.io/seldonio/seldon-core-s2i-python${BASE_IMAGE_PYTHON_VERSION}

Expand Down
4 changes: 2 additions & 2 deletions wrappers/s2i/python/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
e.g. from 0.3-SNAPSHOT to release 0.3 and create 0.4-SNAPSHOT

* set IMAGE_VERSION to new stable version X in Makefile (e.g. 0.3)
* ```./build_all.sh``` and then ```./push_all.sh```
* ```cd build_scripts``` and run ```./build_all.sh``` and then ```./push_all.sh```
* Update IMAGE_VERSION to (X+1)-SNAPSHOT (e.g. 0.4-SNAPSHOT)
* ```cd build_scripts``` and run ```./build_all.sh``` and then ```./push_all.sh```
* ```./build_all.sh``` and then ```./push_all.sh```
* Update main readme to show new versions of stable and snapshot
* Update versions in docs, Makefiles and notebooks of stable version
``` ./update_python_version.sh X X+1```, e.g ```./update_python_version.sh 0.2 0.3```
Expand Down

0 comments on commit 5f09096

Please sign in to comment.