Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python release update #594

Merged
merged 4 commits into from
May 28, 2019
Merged

Python release update #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0df7d20
Update Python package version following release
jklaise May 28, 2019
d3cbf34
Manual update ofm current versions in reference doc
jklaise May 28, 2019
279c5e0
Improve automatic doc update script
jklaise May 28, 2019
f89498b
Automatic update of docs to lates S2I images
jklaise May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions doc/source/python/python_wrapping_s2i.md
View file
Open in desktop
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.5
s2i usage seldonio/seldon-core-s2i-python3:0.7
```


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.5, seldonio/seldon-core-s2i-python3:0.5
* Python 3.6 : seldonio/seldon-core-s2i-python36:0.7, seldonio/seldon-core-s2i-python3:0.7
* 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.5 <my-image-name>
s2i build <src-folder> seldonio/seldon-core-s2i-python3:0.7 <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.5 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.7 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.5 seldon-core-template-model
s2i build wrappers/s2i/python/test/model-template-app seldonio/seldon-core-s2i-python3:0.7 seldon-core-template-model
```

For more help see:

```bash
s2i usage seldonio/seldon-core-s2i-python3:0.5
s2i usage seldonio/seldon-core-s2i-python3:0.7
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.6-SNAPSHOT <my-image-name>
s2i build -i <python-wheel-folder>:/whl <src-folder> seldonio/seldon-core-s2i-python3:0.7 <my-image-name>
```

This command will look for local Python wheels in the ```<python-wheel-folder>``` and use these before searching PyPI.
Expand Down
6 changes: 3 additions & 3 deletions doc/source/reference/images.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
| Seldon Operator | [seldonio/cluster-manager](https://hub.docker.com/r/seldonio/cluster-manager/tags/) | 0.2.7 | 0.2.8-SNAPSHOT |
| Seldon Service Orchestrator | [seldonio/engine](https://hub.docker.com/r/seldonio/engine/tags/) | 0.2.7 | 0.2.8-SNAPSHOT |
| Seldon API Gateway | [seldonio/apife](https://hub.docker.com/r/seldonio/apife/tags/) | 0.2.7 | 0.2.8-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.6 | 0.7-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.6 | 0.7-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.7 | 0.8-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.7 | 0.8-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.5.1 | deprecated |
| [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.3 | |
| [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 | |
Expand All @@ -29,6 +29,6 @@

| Description | Python Version | Version |
|-------------|----------------|---------|
| [seldon-core](https://pypi.org/project/seldon-core/) | >3.4,<3.7 | 0.2.7 |
| [seldon-core](https://pypi.org/project/seldon-core/) | >3.4,<3.7 | 0.2.7.1 |
| [seldon-core](https://pypi.org/project/seldon-core/) | 2,>=3,<3.7 | 0.2.6 (deprecated) |

2 changes: 1 addition & 1 deletion examples/combiners/mnist_combiner/mnist_combiner.ipynb
View file
Open in desktop
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.6 seldonio/mnistcombiner_rest:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.7 seldonio/mnistcombiner_rest:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/aws_eks_deep_mnist/aws_eks_deep_mnist.ipynb
View file
Open in desktop
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.5.1 deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python36:0.7 deep-mnist:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/deep_mnist/deep_mnist.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python36:0.5.1 deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python36:0.7 deep-mnist:0.1"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/keras_mnist/keras_mnist.ipynb
View file
Open in desktop
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.6 keras-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.7 keras-mnist:0.1"
]
},
{
Expand Down Expand Up @@ -853,7 +853,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.6 keras-mnist:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.7 keras-mnist:0.1"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/mlflow_model/mlflow.ipynb
View file
Open in desktop
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.6-SNAPSHOT mlflow_model:0.1"
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.7 mlflow_model:0.1"
]
},
{
Expand Down Expand Up @@ -780,7 +780,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.6-SNAPSHOT mlflow_model:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:0.7 mlflow_model:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/nvidia-mnist/nvidia_mnist.ipynb
View file
Open in desktop
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.6 mnist-caffe2-transformer:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.7 mnist-caffe2-transformer:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/resnet/reset.ipynb
View file
Open in desktop
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.6-SNAPSHOT seldon-resnet2.4"
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.7 seldon-resnet2.4"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/sk_mnist/skmnist.ipynb
View file
Open in desktop
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.6 sk-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.7 sk-mnist:0.1"
]
},
{
Expand Down Expand Up @@ -658,7 +658,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.6 sk-mnist:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.7 sk-mnist:0.1"
]
},
{
Expand Down
6 changes: 3 additions & 3 deletions examples/models/sklearn_iris/sklearn_iris.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:0.6 sklearn-iris:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.7 sklearn-iris:0.1"
]
},
{
Expand Down Expand Up @@ -245,7 +245,7 @@
}
],
"source": [
"!s2i build -E .s2i/environment_grpc . seldonio/seldon-core-s2i-python3:0.6 sklearn-iris:0.1"
"!s2i build -E .s2i/environment_grpc . seldonio/seldon-core-s2i-python3:0.7 sklearn-iris:0.1"
]
},
{
Expand Down Expand Up @@ -708,7 +708,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.6 sklearn-iris:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:0.7 sklearn-iris:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/sklearn_iris_fbs/sklearn_iris.ipynb
View file
Open in desktop
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.6 sklearn-iris:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.7 sklearn-iris:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/sklearn_spacy_text/sklearn_spacy_text_classifier_example.ipynb
View file
Open in desktop
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.6 reddit-classifier:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:0.7 reddit-classifier:0.1"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions examples/models/template_model_bindata/modelWithBindata.ipynb
View file
Open in desktop
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.6 model-with-bindata-rest:0.1"
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.7 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.6 model-with-bindata-grpc:0.1"
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.7 model-with-bindata-grpc:0.1"
]
},
{
Expand Down Expand Up @@ -560,7 +560,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.6 model-with-bindata-rest:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:0.7 model-with-bindata-rest:0.1"
]
},
{
Expand Down Expand Up @@ -716,7 +716,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.6 model-with-bindata-grpc:0.1"
"!eval $(minikube docker-env) && s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:0.7 model-with-bindata-grpc:0.1"
]
},
{
Expand Down
Loading