Skip to content

Commit

Permalink
Updating release-1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
axsaucedo committed Sep 24, 2020
1 parent 02f6bd0 commit 70a36cd
Show file tree
Hide file tree
Showing 55 changed files with 90 additions and 90 deletions.
2 changes: 1 addition & 1 deletion components/alibi-detect-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.access.redhat.com/ubi8/python-36
LABEL name="Seldon Alibi Detect Server" \
vendor="Seldon Technologies" \
version="1.3.0-dev" \
version="1.3.0" \
release="1" \
summary="Alibi Detect Server for Seldon Core" \
description="The Alibi Detect Server provides outlier, drift and adversarial detection services for Seldon Core"
Expand Down
2 changes: 1 addition & 1 deletion components/alibi-explain-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.access.redhat.com/ubi8/python-36
LABEL name="Seldon Alibi Wrapper" \
vendor="Seldon Technologies" \
version="1.3.0-dev" \
version="1.3.0" \
release="1" \
summary="Alibi Explainer Wrapper for Seldon Core" \
description="Allows Seldon Core inference models to run with a black box model explanation model from the Alibi:Explain project"
Expand Down
2 changes: 1 addition & 1 deletion components/seldon-request-logger/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.access.redhat.com/ubi8/python-36
LABEL name="Seldon Request Logger" \
vendor="Seldon Technologies" \
version="1.3.0-dev" \
version="1.3.0" \
release="1" \
summary="The payload logger for Seldon Core" \
description="The Seldon Payload Logger allows request and response payloads from a Seldon Core inference graph to be processed and sent to an ELK endpoint"
Expand Down
2 changes: 1 addition & 1 deletion components/storage-initializer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.access.redhat.com/ubi8/python-36
LABEL name="Storage Initializer" \
vendor="Seldon Technologies" \
version="1.3.0-dev" \
version="1.3.0" \
release="1" \
summary="Storage Initializer for Seldon Core" \
description="Allows Seldon Core to download artifacts from cloud and local storage to a local volume"
Expand Down
16 changes: 8 additions & 8 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:1.3.0-dev
s2i usage seldonio/seldon-core-s2i-python3:1.3.0
```


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

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

For more help see:

```bash
s2i usage seldonio/seldon-core-s2i-python3:1.3.0-dev
s2i usage seldonio/seldon-core-s2i-python3:1.3.0
s2i build --help
```

Expand Down Expand Up @@ -217,7 +217,7 @@ s2i build \
-e EXTRA_INDEX_URL=https://<pypi-user>:<pypi-auth>@mypypi.example.com/simple \
-e PIP_TRUSTED_HOST=mypypi.example.com \
<src-folder> \
seldonio/seldon-core-s2i-python3:1.3.0-dev \
seldonio/seldon-core-s2i-python3:1.3.0 \
<my-image-name>
```

Expand Down Expand Up @@ -307,7 +307,7 @@ The allowable `type` values for the parameters are defined in the [proto buffer
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:1.3.0-dev <my-image-name>
s2i build -i <python-wheel-folder>:/whl <src-folder> seldonio/seldon-core-s2i-python3:1.3.0 <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 doc/source/workflow/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ To complete containerisation process you need two more components:

Once these are in place you can use a simple s2i command
```bash
s2i build . seldonio/seldon-core-s2i-python3:1.3.0-dev model:0.1
s2i build . seldonio/seldon-core-s2i-python3:1.3.0 model:0.1
```
to create ready to use Docker image.

Expand Down
2 changes: 1 addition & 1 deletion doc/source/workflow/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ Now we can use the Seldon Core utilities to convert our python class into a full
The result below is a container with the name `sklearn_iris` and the tag `0.1` which we will be able to deploy using Seldon Core.

```console
s2i build . seldonio/seldon-core-s2i-python3:1.3.0-dev sklearn_iris:0.1
s2i build . seldonio/seldon-core-s2i-python3:1.3.0 sklearn_iris:0.1
```

**5. Deploy to Kubernetes**
Expand Down
2 changes: 1 addition & 1 deletion engine/Dockerfile.redhat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN yum install -y java-11-openjdk.x86_64

LABEL name="Seldon Engine" \
vendor="Seldon Technologies" \
version="1.3.0-dev" \
version="1.3.0" \
release="1" \
summary="The Seldon Engine that is deployed for each model to handle the data flow of each ML computational graph." \
description="The Seldon Engine that is deployed for each model to handle the data flow of each ML computational graph."
Expand Down
2 changes: 1 addition & 1 deletion engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</parent>
<groupId>io.seldon.engine</groupId>
<artifactId>seldon-engine</artifactId>
<version>1.3.0-dev</version>
<version>1.3.0</version>
<packaging>jar</packaging>
<name>engine</name>
<url>http://maven.apache.org</url>
Expand Down
2 changes: 1 addition & 1 deletion examples/batch/kubeflow-pipelines-batch/README.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
"\n",
" batch_process_step = dsl.ContainerOp(\n",
" name='data_downloader',\n",
" image='seldonio/seldon-core-s2i-python37:1.3.0-dev command=\"seldon-batch-processor\",\n",
" image='seldonio/seldon-core-s2i-python37:1.3.0 command=\"seldon-batch-processor\",\n",
" arguments=[\n",
" \"--deployment-name\", \"{{workflow.name}}\",\n",
" \"--namespace\", namespace,\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@
],
"source": [
"%%bash\n",
"SELDON_BASE_WRAPPER=\"seldonio/seldon-core-s2i-python36:1.3.0-dev
"SELDON_BASE_WRAPPER=\"seldonio/seldon-core-s2i-python36:1.3.0
"s2i build src/. $SELDON_BASE_WRAPPER sklearn-server:0.1 \\\n",
" --environment-file src/seldon_model.conf"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@
],
"source": [
"%%bash\n",
"SELDON_BASE_WRAPPER=\"seldonio/seldon-core-s2i-python36:1.3.0-dev
"SELDON_BASE_WRAPPER=\"seldonio/seldon-core-s2i-python36:1.3.0
"s2i build src/. $SELDON_BASE_WRAPPER sklearn-server:0.1 \\\n",
" --environment-file src/seldon_model.conf"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ FOLDER=torchserver
IMAGE_BASE=seldonio/${FOLDER}

build_rest:
s2i build -E environment_rest ./${FOLDER} seldonio/seldon-core-s2i-python37:1.3.0-dev ${IMAGE_BASE}_rest:${VERSION}
s2i build -E environment_rest ./${FOLDER} seldonio/seldon-core-s2i-python37:1.3.0 ${IMAGE_BASE}_rest:${VERSION}

push_rest:
docker push ${IMAGE_BASE}_rest:${VERSION}

build_grpc:
s2i build -E environment_grpc ./${FOLDER} seldonio/seldon-core-s2i-python37:1.3.0-dev ${IMAGE_BASE}_grpc:${VERSION}
s2i build -E environment_grpc ./${FOLDER} seldonio/seldon-core-s2i-python37:1.3.0 ${IMAGE_BASE}_grpc:${VERSION}

push_grpc:
docker push ${IMAGE_BASE}_grpc:${VERSION}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"s2i build -E environment_rest ./sklearnserver seldonio/seldon-core-s2i-python37:1.3.0-dev seldonio/sklearnserver_rest:0.1\n",
"s2i build -E environment_rest ./sklearnserver seldonio/seldon-core-s2i-python37:1.3.0 seldonio/sklearnserver_rest:0.1\n",
"---> Installing application source...\n",
"---> Installing dependencies ...\n",
"Looking in links: /whl\n",
Expand Down Expand Up @@ -281,7 +281,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"s2i build -E environment_grpc ./sklearnserver seldonio/seldon-core-s2i-python37:1.3.0-dev seldonio/sklearnserver_grpc:0.1\n",
"s2i build -E environment_grpc ./sklearnserver seldonio/seldon-core-s2i-python37:1.3.0 seldonio/sklearnserver_grpc:0.1\n",
"---> Installing application source...\n",
"---> Installing dependencies ...\n",
"Looking in links: /whl\n",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@
],
"source": [
"%%bash\n",
"SELDON_BASE_WRAPPER=\"seldonio/seldon-core-s2i-python36:1.3.0-dev
"SELDON_BASE_WRAPPER=\"seldonio/seldon-core-s2i-python36:1.3.0
"s2i build src/. $SELDON_BASE_WRAPPER sklearn-server:0.1 \\\n",
" --environment-file src/seldon_model.conf"
]
Expand Down
4 changes: 2 additions & 2 deletions examples/explainers/imagenet/resources/transformer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ IMAGE_VERSION=0.1
IMAGE_NAME=docker.io/seldonio/imagenet-transformer

build_grpc:
s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:1.3.0-dev $(IMAGE_NAME):$(IMAGE_VERSION)
s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:1.3.0 $(IMAGE_NAME):$(IMAGE_VERSION)

build_rest:
s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:1.3.0-dev $(IMAGE_NAME):$(IMAGE_VERSION)
s2i build -E environment_rest . seldonio/seldon-core-s2i-python36:1.3.0 $(IMAGE_NAME):$(IMAGE_VERSION)

push_to_dockerhub:
docker push $(IMAGE_NAME):$(IMAGE_VERSION)
2 changes: 1 addition & 1 deletion examples/feedback/reward-accuracy/README.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python37:1.3.0-dev metrics_model:0.1 \\\n",
"!s2i build . seldonio/seldon-core-s2i-python37:1.3.0 metrics_model:0.1 \\\n",
" --env MODEL_NAME=\"MetricsModel\" --env API_TYPE=REST --env SERVICE_TYPE=MODEL --env PERSISTENCE=0"
]
},
Expand Down
4 changes: 2 additions & 2 deletions examples/kubeflow/kubeflow_seldon_e2e_pipeline.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
"text": [
"#!/bin/bash\r\n",
"\r\n",
"s2i build . seldonio/seldon-core-s2i-python3:1.3.0-dev clean_text_transformer:0.1\r\n",
"s2i build . seldonio/seldon-core-s2i-python3:1.3.0 clean_text_transformer:0.1\r\n",
"\r\n"
]
}
Expand Down Expand Up @@ -477,7 +477,7 @@
"ERROR: No matching distribution found for en-core-web-sm==2.3.1 (from -r requirements.txt (line 5))\n",
"WARNING: Url '/whl' is ignored. It is either a non-existing path or lacks a specific scheme.\n",
"Build failed\n",
"ERROR: An error occurred: non-zero (13) exit code from seldonio/seldon-core-s2i-python37:1.3.0-dev
"ERROR: An error occurred: non-zero (13) exit code from seldonio/seldon-core-s2i-python37:1.3.0
"---> Installing application source...\n",
"---> Installing dependencies ...\n",
"Looking in links: /whl\n",
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:1.3.0-dev deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python36:1.3.0 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:1.3.0-dev deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python36:1.3.0 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:1.3.0-dev deep-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python36:1.3.0 deep-mnist:0.1"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions examples/models/chainer_mnist/chainer_mnist.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@
}
],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python3:1.3.0-dev chainer-mnist:0.1"
"!s2i build . seldonio/seldon-core-s2i-python3:1.3.0 chainer-mnist:0.1"
]
},
{
Expand Down Expand Up @@ -1095,7 +1095,7 @@
}
],
"source": [
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:1.3.0-dev chainer-mnist:0.1"
"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-python3:1.3.0 chainer-mnist:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/deep_mnist/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ IMAGE_NAME=seldonio/tf-example-mnist
IMAGE_VERSION=0.2

build_image:
s2i build . seldonio/seldon-core-s2i-python3:1.3.0-dev ${IMAGE_NAME}:${IMAGE_VERSION}
s2i build . seldonio/seldon-core-s2i-python3:1.3.0 ${IMAGE_NAME}:${IMAGE_VERSION}

push_image:
docker push $(IMAGE_NAME):$(IMAGE_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion examples/models/mean_classifier/image_metadata.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"labels": [{"name": "Seldon Mock Model"}, {"vendor": "Seldon Technologies"}, {"version": "1.3.0-dev"}, {"release": "1"}, {"summary": "A mock model for testing Seldon Core"}, {"description": "A mock REST model for testing Seldon Core"}]}
{"labels": [{"name": "Seldon Mock Model"}, {"vendor": "Seldon Technologies"}, {"version": "1.3.0"}, {"release": "1"}, {"summary": "A mock model for testing Seldon Core"}, {"description": "A mock REST model for testing Seldon Core"}]}
2 changes: 1 addition & 1 deletion examples/models/resnet/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


build_image:
s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:1.3.0-dev seldon-resnet2.4
s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:1.3.0 seldon-resnet2.4


clean:
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:1.3.0-dev seldon-resnet2.4"
"!s2i build -E environment_grpc . seldonio/seldon-core-s2i-python36:1.3.0 seldon-resnet2.4"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
],
"source": [
"%%bash\n",
"s2i build -E ENVIRONMENT_REST . seldonio/seldon-core-s2i-python37:1.3.0-dev runtime-metrics-tags:0.1\n",
"s2i build -E ENVIRONMENT_REST . seldonio/seldon-core-s2i-python37:1.3.0 runtime-metrics-tags:0.1\n",
"kind load docker-image runtime-metrics-tags:0.1"
]
},
Expand Down
2 changes: 1 addition & 1 deletion examples/models/sk_mnist/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ train:
python train.py

build_image:
s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0-dev ${IMAGE_NAME}:${IMAGE_VERSION}
s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0 ${IMAGE_NAME}:${IMAGE_VERSION}

push_image:
docker push $(IMAGE_NAME):$(IMAGE_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion examples/models/sklearn_iris/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ IMAGE_NAME=seldonio/sklearn-iris
IMAGE_VERSION=0.1

build_image: train
s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0-dev ${IMAGE_NAME}:${IMAGE_VERSION}
s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0 ${IMAGE_NAME}:${IMAGE_VERSION}

push_image:
docker push $(IMAGE_NAME):$(IMAGE_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion examples/models/sklearn_iris/sklearn_iris.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0-dev seldonio/sklearn-iris:0.1"
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0 seldonio/sklearn-iris:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/sklearn_iris_customdata/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ IMAGE_NAME=seldonio/sklearn-iris-customdata
IMAGE_VERSION=0.1

build_image: train
s2i build . seldonio/seldon-core-s2i-python3:1.3.0-dev ${IMAGE_NAME}:${IMAGE_VERSION}
s2i build . seldonio/seldon-core-s2i-python3:1.3.0 ${IMAGE_NAME}:${IMAGE_VERSION}

push_image:
docker push $(IMAGE_NAME):$(IMAGE_VERSION)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
},
"outputs": [],
"source": [
"!s2i build . seldonio/seldon-core-s2i-python37:1.3.0-dev seldonio/sklearn-iris-customdata:0.1"
"!s2i build . seldonio/seldon-core-s2i-python37:1.3.0 seldonio/sklearn-iris-customdata:0.1"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/models/sklearn_iris_jsondata/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ IMAGE_NAME=seldonio/sklearn-iris-jsondata
IMAGE_VERSION=0.1

build_image: train
s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0-dev ${IMAGE_NAME}:${IMAGE_VERSION}
s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0 ${IMAGE_NAME}:${IMAGE_VERSION}

push_image:
docker push $(IMAGE_NAME):$(IMAGE_VERSION)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"metadata": {},
"outputs": [],
"source": [
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0-dev seldonio/sklearn-iris-jsondata:0.1"
"!s2i build -E environment_rest . seldonio/seldon-core-s2i-python3:1.3.0 seldonio/sklearn-iris-jsondata:0.1"
]
},
{
Expand Down
Loading

0 comments on commit 70a36cd

Please sign in to comment.