Skip to content

Commit

Permalink
python wrapper version usage updated
Browse files Browse the repository at this point in the history
  • Loading branch information
gsunner committed Feb 13, 2020
1 parent 6cde341 commit 66524af
Show file tree
Hide file tree
Showing 22 changed files with 735 additions and 735 deletions.
14 changes: 7 additions & 7 deletions doc/source/python/python_wrapping_s2i.md
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.15
s2i usage seldonio/seldon-core-s2i-python3:0.16
```


Expand Down Expand Up @@ -83,22 +83,22 @@ 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 3.6 : seldonio/seldon-core-s2i-python36:0.15, seldonio/seldon-core-s2i-python3:0.15
* Python 3.6 : seldonio/seldon-core-s2i-python36:0.16, seldonio/seldon-core-s2i-python3:0.16
* 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 <src-folder> seldonio/seldon-core-s2i-python3:0.15 <my-image-name>
s2i build <src-folder> seldonio/seldon-core-s2i-python3:0.16 <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-python3:0.15 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-python3:0.16 seldon-core-template-model
```

The above s2i build invocation:
Expand All @@ -113,13 +113,13 @@ 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-python3:0.15 seldon-core-template-model
s2i build wrappers/s2i/python/test/model-template-app seldonio/seldon-core-s2i-python3:0.16 seldon-core-template-model
```

For more help see:

```bash
s2i usage seldonio/seldon-core-s2i-python3:0.15
s2i usage seldonio/seldon-core-s2i-python3:0.16
s2i build --help
```

Expand Down Expand Up @@ -230,7 +230,7 @@ The allowable ```type``` values for the parameters are defined in the [proto buf
To use a private repository for installing Python dependencies use the following build command:

```bash
s2i build -i <python-wheel-folder>:/whl <src-folder> seldonio/seldon-core-s2i-python3:0.15 <my-image-name>
s2i build -i <python-wheel-folder>:/whl <src-folder> seldonio/seldon-core-s2i-python3:0.16 <my-image-name>
```

This command will look for local Python wheels in the ```<python-wheel-folder>``` and use these before searching PyPI.
Expand Down
2 changes: 1 addition & 1 deletion examples/combiners/mnist_combiner/mnist_combiner.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.15 seldonio/mnistcombiner_rest:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.16 seldonio/mnistcombiner_rest:0.1"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@
}
],
"source": [
"!s2i build pipeline/pipeline_steps/loanclassifier seldonio/seldon-core-s2i-python37:0.15 loanclassifier:0.1"
"!s2i build pipeline/pipeline_steps/loanclassifier seldonio/seldon-core-s2i-python37:0.16 loanclassifier:0.1"
]
},
{
Expand Down Expand Up @@ -732,7 +732,7 @@
"source": [
"%%bash\n",
"eval $(minikube docker-env)\n",
"s2i build pipeline/pipeline_steps/loanclassifier seldonio/seldon-core-s2i-python37:0.15 loanclassifier:0.1"
"s2i build pipeline/pipeline_steps/loanclassifier seldonio/seldon-core-s2i-python37:0.16 loanclassifier:0.1"
]
},
{
Expand Down Expand Up @@ -1595,7 +1595,7 @@
}
],
"source": [
"!s2i build pipeline/pipeline_steps/loanclassifier-explainer seldonio/seldon-core-s2i-python37:0.15 loanclassifier-explainer:0.1"
"!s2i build pipeline/pipeline_steps/loanclassifier-explainer seldonio/seldon-core-s2i-python37:0.16 loanclassifier-explainer:0.1"
]
},
{
Expand Down Expand Up @@ -1827,7 +1827,7 @@
"source": [
"%%bash\n",
"eval $(minikube docker-env)\n",
"s2i build pipeline/pipeline_steps/loanclassifier-explainer seldonio/seldon-core-s2i-python37:0.15 loanclassifier-explainer:0.1"
"s2i build pipeline/pipeline_steps/loanclassifier-explainer seldonio/seldon-core-s2i-python37:0.16 loanclassifier-explainer:0.1"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python36:0.15 deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python36:0.16 deep-mnist:0.1"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python36:0.15 deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python36:0.16 deep-mnist:0.1"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python36:0.15 deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python36:0.16 deep-mnist:0.1"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/deep_mnist/deep_mnist.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python37:0.15 deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python37:0.16 deep-mnist:0.1"
]
},
{
Expand Down Expand Up @@ -420,7 +420,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python37:0.15 deep-mnist:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python37:0.16 deep-mnist:0.1"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/keras_mnist/keras_mnist.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.15 keras-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.16 keras-mnist:0.1"
]
},
{
Expand Down Expand Up @@ -636,7 +636,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.15 keras-mnist:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.16 keras-mnist:0.1"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/mlflow_model/mlflow.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
}
],
"source": [
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.15 mlflow_model:0.1"
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.16 mlflow_model:0.1"
]
},
{
Expand Down Expand Up @@ -544,7 +544,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.15 mlflow_model:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.16 mlflow_model:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/nvidia-mnist/nvidia_mnist.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.15 mnist-caffe2-transformer:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.16 mnist-caffe2-transformer:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/resnet/reset.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
}
],
"source": [
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.15 seldon-resnet2.4"
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.16 seldon-resnet2.4"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/sk_mnist/skmnist.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.15 sk-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.16 sk-mnist:0.1"
]
},
{
Expand Down Expand Up @@ -442,7 +442,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.15 sk-mnist:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.16 sk-mnist:0.1"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions examples/models/sklearn_iris/sklearn_iris.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python37:0.15 sklearn-iris:0.1"
"!s2i build . seldonio/seldon-core-s2i-python37:0.16 sklearn-iris:0.1"
]
},
{
Expand Down Expand Up @@ -255,7 +255,7 @@
}
],
"source": [
"!s2i build -E .s2i/environment_grpc . seldonio/seldon-core-s2i-python3:0.15 sklearn-iris:0.1"
"!s2i build -E .s2i/environment_grpc . seldonio/seldon-core-s2i-python3:0.16 sklearn-iris:0.1"
]
},
{
Expand Down Expand Up @@ -469,7 +469,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.15 sklearn-iris:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.16 sklearn-iris:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/sklearn_iris_fbs/sklearn_iris.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.15 sklearn-iris:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.16 sklearn-iris:0.1"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.15 sklearn-iris-jsondata:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.16 sklearn-iris-jsondata:0.1"
]
},
{
Expand Down Expand Up @@ -294,7 +294,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.15 sklearn-iris-jsondata:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.16 sklearn-iris-jsondata:0.1"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.15 sklearn-iris-multipart-formdata:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.16 sklearn-iris-multipart-formdata:0.1"
]
},
{
Expand Down Expand Up @@ -279,7 +279,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.15 sklearn-iris-multipart-formdata:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.16 sklearn-iris-multipart-formdata:0.1"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.15 reddit-classifier:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.16 reddit-classifier:0.1"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions examples/models/template_model_bindata/modelWithBindata.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
}
],
"source": [
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.15 model-with-bindata-rest:0.1"
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.16 model-with-bindata-rest:0.1"
]
},
{
Expand Down Expand Up @@ -193,7 +193,7 @@
}
],
"source": [
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.15 model-with-bindata-grpc:0.1"
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.16 model-with-bindata-grpc:0.1"
]
},
{
Expand Down Expand Up @@ -342,7 +342,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.15 model-with-bindata-rest:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.16 model-with-bindata-rest:0.1"
]
},
{
Expand Down Expand Up @@ -498,7 +498,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.15 model-with-bindata-grpc:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.16 model-with-bindata-grpc:0.1"
]
},
{
Expand Down
Loading

0 comments on commit 66524af

Please sign in to comment.