Merge branch 'master' into 3024_openshift_mwc

.lighthouse/jenkins-x/release.yaml

@@ -33,11 +33,11 @@ spec:
           resources:
             requests:
               cpu: 1
-              memory: 2000Mi
+              memory: 3000Mi
               ephemeral-storage: "60Gi"
             limits:
               cpu: 1
-              memory: 2000Mi
+              memory: 3000Mi
               ephemeral-storage: "60Gi"
           securityContext:
             privileged: true

README.md

@@ -60,7 +60,7 @@ We provide optimized model servers for some of the most popular Deep Learning an
 You only have to upload your model binaries into your preferred object store, in this case we have a trained scikit-learn iris model in a Google bucket:
 
 ```console
-gs://seldon-models/sklearn/iris/model.pickle
+gs://seldon-models/sklearn/iris/model.joblib
 ```
 
 Create a namespace to run your model in:

components/alibi-explain-server/Dockerfile.gpu

@@ -0,0 +1,28 @@
+FROM nvidia/cuda:11.2.1-devel-ubuntu18.04
+
+RUN \
+    apt update && apt install -y git wget unzip bzip2 libgomp1 build-essential
+
+RUN wget -O Miniconda3.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
+    bash Miniconda3.sh -b -p /opt/python
+
+ENV PATH=/opt/python/bin:$PATH
+
+#RUN conda install -c conda-forge python=3.7.10
+
+WORKDIR /app
+
+COPY setup.py setup.py
+COPY alibiexplainer alibiexplainer
+COPY README.md README.md
+
+# Required for https://github.com/slundberg/shap/issues/1633
+RUN pip install . --no-binary protobuf
+
+COPY requirements-gpu.txt .
+
+RUN pip install --force-reinstall -r requirements-gpu.txt
+
+ENTRYPOINT ["python", "-m", "alibiexplainer"]
+
+

components/alibi-explain-server/Makefile

@@ -39,9 +39,15 @@ type_check:
 docker-build: build_apis
 	docker build --file=Dockerfile -t seldonio/${IMAGE}:${VERSION} .
 
+docker-build-gpu: 
+	docker build --file=Dockerfile.gpu -t seldonio/${IMAGE}-gpu:${VERSION} .
+
 docker-push:
 	docker push seldonio/${IMAGE}:${VERSION}
 
+docker-push-gpu:
+	docker push seldonio/${IMAGE}-gpu:${VERSION}
+
 kind_load: docker-build
 	kind load docker-image seldonio/${IMAGE}:${VERSION}
 
@@ -214,3 +220,4 @@ curl_explain_adult_treeshap:
 
 cleanup_treeshap:
 	docker rm -f explainer
+

components/alibi-explain-server/requirements-gpu.txt

@@ -0,0 +1,4 @@
+alibi @ git+git://github.com/jklaise/alibi-1@b4b8dc5b5104049d9445cde785bbd8ef1f38529e
+numpy==1.20.1  # Version of numpy used to compile shap, need this otherwise RuntimeError will be raised. Ignore warning from tensorflow about incompatibility.
+shap @ git+git://github.com/slundberg/shap@fe082e345f7248119c8c0307197df51b839e6a1a
+xgboost==1.3.3

doc/source/ingress/istio.md

@@ -95,8 +95,7 @@ Istio has the capability for fine grained traffic routing to your deployments. T
  * A/B testing
  * shadow deployments
 
-More information on these can be found in our [example showing canary
-updates](../examples/istio_canary.html) and [other examples, including shadow
+More information on these can be found in our [other examples, including shadow
 updates](../examples/istio_examples.html).
 
 
@@ -108,4 +107,4 @@ You can fix this by changing `defaultUserID=0` in your helm chart, or add the fo
 ```
 securityContext:
   runAsUser: 0
-```
+```

doc/source/workflow/usage-reporting.md

@@ -9,7 +9,7 @@ We provide an option to use an anonymous metrics collection tool provided by the
 To help support the development of seldon-core, the voluntary reporting of usage data can be enabled whenever the "seldon-core-operator" helm chart is used  by setting the "--set usageMetrics.enabled=true" option.
 
 ```bash
-helm install seldon-core-operator --name seldon-core \
+helm install seldon-core seldon-core-operator \
         --repo https://storage.googleapis.com/seldon-charts --set usageMetrics.enabled=true
 ```
 
@@ -62,7 +62,7 @@ An example of what's reported:
 Reporting of usage data is disabled by default, just use "seldon-core-operator" as normal.
 
 ```bash
-helm install seldon-core-operator --name seldon-core \
+helm install seldon-core seldon-core-operator \
         --repo https://storage.googleapis.com/seldon-charts
 ```
 

examples/batch/argo-workflows-batch/helm-charts/seldon-batch-workflow/templates/workflow.yaml

@@ -67,20 +67,20 @@ spec:
           predictors:
             - componentSpecs:
               - spec:
-                containers:
-                - name: classifier
-                  env:
-                  - name: GUNICORN_THREADS
-                    value: {{ .Values.seldonDeployment.serverThreads }}
-                  - name: GUNICORN_WORKERS
-                    value: {{ .Values.seldonDeployment.serverWorkers }}
-                  resources:
-                    requests:
-                      cpu: {{ .Values.seldonDeployment.requests.cpu }}
-                      memory: {{ .Values.seldonDeployment.requests.memory }}
-                    limits:
-                      cpu: {{ .Values.seldonDeployment.limits.cpu }}
-                      memory: {{ .Values.seldonDeployment.limits.memory }}
+                  containers:
+                  - name: classifier
+                    env:
+                    - name: GUNICORN_THREADS
+                      value: "{{ .Values.seldonDeployment.serverThreads }}"
+                    - name: GUNICORN_WORKERS
+                      value: "{{ .Values.seldonDeployment.serverWorkers }}"
+                    resources:
+                      requests:
+                        cpu: {{ .Values.seldonDeployment.requests.cpu }}
+                        memory: {{ .Values.seldonDeployment.requests.memory }}
+                      limits:
+                        cpu: {{ .Values.seldonDeployment.limits.cpu }}
+                        memory: {{ .Values.seldonDeployment.limits.memory }}
               graph:
                 children: []
                 implementation: {{ .Values.seldonDeployment.server }}

examples/cicd/sig-mlops-jenkins-classic/README.md

@@ -507,7 +507,7 @@ In particular, you will need to run the following:
 ```bash
 %%bash
 helm install \
-    --name "jenkins" stable/jenkins \
+    jenkins stable/jenkins \
     --namespace "jenkins" \
     --set "rbac.create=true" \
     --set "master.adminUser=admin" \

examples/models/aws_eks_deep_mnist/README.md

@@ -385,7 +385,7 @@ We first start with the custom resource definitions (CRDs)
 
 
 ```python
-!helm install seldon-core-operator --name seldon-core-operator --repo https://storage.googleapis.com/seldon-charts --set usageMetrics.enabled=true --namespace seldon-system
+!helm install seldon-core-operator seldon-core-operator --repo https://storage.googleapis.com/seldon-charts --set usageMetrics.enabled=true --namespace seldon-system
 ```
 
     NAME:   seldon-core-operator
@@ -467,7 +467,7 @@ In EKS it automatically creates an Elastic Load Balancer, which you can configur
 
 
 ```python
-!helm install stable/ambassador --name ambassador --set crds.keep=false
+!helm install ambassador stable/ambassador --set crds.keep=false
 ```
 
     NAME:   ambassador

examples/models/azure_aks_deep_mnist/README.md

@@ -354,7 +354,7 @@ We first start with the custom resource definitions (CRDs)
 
 
 ```python
-!helm install seldon-core-operator --name seldon-core-operator --repo https://storage.googleapis.com/seldon-charts
+!helm install seldon-core-operator seldon-core-operator --repo https://storage.googleapis.com/seldon-charts
 ```
 
     NAME:   seldon-core-operator
@@ -415,7 +415,7 @@ In EKS it automatically creates an Elastic Load Balancer, which you can configur
 
 
 ```python
-!helm install stable/ambassador --name ambassador --set crds.keep=false
+!helm install ambassador stable/ambassador --set crds.keep=false
 ```
 
     Error: release ambassador failed: serviceaccounts "ambassador" already exists

examples/models/gpu_tensorflow_deep_mnist/README.md

@@ -430,7 +430,7 @@ We first start with the custom resource definitions (CRDs)
 
 
 ```python
-!helm install seldon-core-operator --name seldon-core-operator --repo https://storage.googleapis.com/seldon-charts
+!helm install seldon-core-operator seldon-core-operator --repo https://storage.googleapis.com/seldon-charts
 ```
 
     NAME:   seldon-core-operator