Update version to 0.10.0

deliahu · deliahu · commit 6aa0a9794146 · 2019-11-04T16:35:43.000-08:00
diff --git a/README.md b/README.md
@@ -2,10 +2,6 @@
 
 Cortex is an open source platform that takes machine learning models—trained with nearly any framework—and turns them into production web APIs in one command. <br>
 
-<!-- Delete on release branches -->
-<!-- CORTEX_VERSION_README_MINOR x1 -->
-[install](https://www.cortex.dev/install) • [docs](https://www.cortex.dev) • [examples](https://github.com/cortexlabs/cortex/tree/0.9/examples) • [we're hiring](https://angel.co/cortex-labs-inc/jobs) • [email us](mailto:hello@cortex.dev) • [chat with us](https://gitter.im/cortexlabs/cortex)<br><br>
-
 <!-- Set header Cache-Control=no-cache on the S3 object metadata (see https://help.github.com/en/articles/about-anonymized-image-urls) -->
 ![Demo](https://cortex-public.s3-us-west-2.amazonaws.com/demo/gif/v0.8.gif)<br>
 
@@ -47,12 +43,15 @@ The configuration below will download the model from the `cortex-examples` S3 bu
 
 - kind: api
   name: generator
-  model: s3://cortex-examples/text-generator/gpt-2/124M
-  request_handler: handler.py
+  tensorflow:
+    model: s3://cortex-examples/tensorflow/text-generator/gpt-2/124M
+    request_handler: handler.py
+  compute:
+    gpu: 1
 ```
 
 <!-- CORTEX_VERSION_README_MINOR -->
-You can run the code that generated the model [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/0.9/examples/text-generator/gpt-2.ipynb).
+You can run the code that generated the model [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/0.10/examples/tensorflow/text-generator/gpt-2.ipynb).
 
 <br>
 
@@ -66,11 +65,11 @@ The model requires encoded data for inference, but the API should accept strings
 from encoder import get_encoder
 encoder = get_encoder()
 
-def pre_inference(sample, metadata):
+def pre_inference(sample, signature, metadata):
     context = encoder.encode(sample["text"])
     return {"context": [context]}
 
-def post_inference(prediction, metadata):
+def post_inference(prediction, signature, metadata):
     response = prediction["sample"]
     return encoder.decode(response)
 ```
@@ -126,9 +125,8 @@ The CLI sends configuration and code to the cluster every time you run `cortex d
 
 ## More examples
 
-<!-- CORTEX_VERSION_README_MINOR x3 -->
-- [Iris classification](https://github.com/cortexlabs/cortex/tree/0.9/examples/iris-classifier)
-
-- [Sentiment analysis](https://github.com/cortexlabs/cortex/tree/0.9/examples/sentiment-analysis) with BERT
-
-- [Image classification](https://github.com/cortexlabs/cortex/tree/0.9/examples/image-classifier) with Inception v3 and AlexNet
+<!-- CORTEX_VERSION_README_MINOR x4 -->
+- [Sentiment analysis](https://github.com/cortexlabs/cortex/tree/0.10/examples/tensorflow/sentiment-analysis) in TensorFlow with BERT
+- [Image classification](https://github.com/cortexlabs/cortex/tree/0.10/examples/tensorflow/image-classifier) in TensorFlow with Inception v3
+- [Text Generation](https://github.com/cortexlabs/cortex/tree/0.10/examples/pytorch/text-generator) in PyTorch with Hugging Face's DistilGPT2
+- [Iris classification](https://github.com/cortexlabs/cortex/tree/0.10/examples/xgboost/iris-classifier) in XGBoost / ONNX
diff --git a/build/build-image.sh b/build/build-image.sh
@@ -19,7 +19,7 @@ set -euo pipefail
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)"
 
-CORTEX_VERSION=master
+CORTEX_VERSION=0.10.0
 
 dir=$1
 image=$2
diff --git a/build/cli.sh b/build/cli.sh
@@ -19,7 +19,7 @@ set -euo pipefail
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)"
 
-CORTEX_VERSION=master
+CORTEX_VERSION=0.10.0
 
 arg1=${1:-""}
 upload="false"
diff --git a/build/push-image.sh b/build/push-image.sh
@@ -17,7 +17,7 @@
 
 set -euo pipefail
 
-CORTEX_VERSION=master
+CORTEX_VERSION=0.10.0
 
 image=$1
 
diff --git a/docs/cluster/config.md b/docs/cluster/config.md
@@ -38,23 +38,23 @@ cluster_name: cortex
 telemetry: true
 
 # Image paths
-image_predictor_serve: cortexlabs/predictor-serve:master
-image_predictor_serve_gpu: cortexlabs/predictor-serve-gpu:master
-image_tf_serve: cortexlabs/tf-serve:master
-image_tf_serve_gpu: cortexlabs/tf-serve-gpu:master
-image_tf_api: cortexlabs/tf-api:master
-image_onnx_serve: cortexlabs/onnx-serve:master
-image_onnx_serve_gpu: cortexlabs/onnx-serve-gpu:master
-image_operator: cortexlabs/operator:master
-image_manager: cortexlabs/manager:master
-image_downloader: cortexlabs/downloader:master
-image_cluster_autoscaler: cortexlabs/cluster-autoscaler:master
-image_metrics_server: cortexlabs/metrics-server:master
-image_nvidia: cortexlabs/nvidia:master
-image_fluentd: cortexlabs/fluentd:master
-image_statsd: cortexlabs/statsd:master
-image_istio_proxy: cortexlabs/istio-proxy:master
-image_istio_pilot: cortexlabs/istio-pilot:master
-image_istio_citadel: cortexlabs/istio-citadel:master
-image_istio_galley: cortexlabs/istio-galley:master
+image_predictor_serve: cortexlabs/predictor-serve:0.10.0
+image_predictor_serve_gpu: cortexlabs/predictor-serve-gpu:0.10.0
+image_tf_serve: cortexlabs/tf-serve:0.10.0
+image_tf_serve_gpu: cortexlabs/tf-serve-gpu:0.10.0
+image_tf_api: cortexlabs/tf-api:0.10.0
+image_onnx_serve: cortexlabs/onnx-serve:0.10.0
+image_onnx_serve_gpu: cortexlabs/onnx-serve-gpu:0.10.0
+image_operator: cortexlabs/operator:0.10.0
+image_manager: cortexlabs/manager:0.10.0
+image_downloader: cortexlabs/downloader:0.10.0
+image_cluster_autoscaler: cortexlabs/cluster-autoscaler:0.10.0
+image_metrics_server: cortexlabs/metrics-server:0.10.0
+image_nvidia: cortexlabs/nvidia:0.10.0
+image_fluentd: cortexlabs/fluentd:0.10.0
+image_statsd: cortexlabs/statsd:0.10.0
+image_istio_proxy: cortexlabs/istio-proxy:0.10.0
+image_istio_pilot: cortexlabs/istio-pilot:0.10.0
+image_istio_citadel: cortexlabs/istio-citadel:0.10.0
+image_istio_galley: cortexlabs/istio-galley:0.10.0
 ```
diff --git a/docs/cluster/install.md b/docs/cluster/install.md
@@ -12,7 +12,7 @@ See [cluster configuration](config.md) to learn how you can customize your clust
 <!-- CORTEX_VERSION_MINOR -->
 ```bash
 # Install the Cortex CLI on your machine
-bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/master/get-cli.sh)"
+bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/0.10/get-cli.sh)"
 
 # Provision infrastructure on AWS and install Cortex
 cortex cluster up
@@ -26,7 +26,7 @@ Note: This will create resources in your AWS account which aren't included in th
 
 ```bash
 # Clone the Cortex repository
-git clone -b master https://github.com/cortexlabs/cortex.git
+git clone -b 0.10 https://github.com/cortexlabs/cortex.git
 
 # Navigate to the iris classifier example
 cd cortex/examples/tensorflow/iris-classifier
diff --git a/docs/cluster/update.md b/docs/cluster/update.md
@@ -22,7 +22,7 @@ cortex cluster update
 cortex cluster down
 
 # Update your CLI
-bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/master/get-cli.sh)"
+bash -c "$(curl -sS https://raw.githubusercontent.com/cortexlabs/cortex/0.10/get-cli.sh)"
 
 # Confirm version
 cortex version
diff --git a/docs/deployments/python-client.md b/docs/deployments/python-client.md
@@ -4,7 +4,7 @@ The Python client can be used to programmatically deploy models to a Cortex Clus
 
 <!-- CORTEX_VERSION_BRANCH_STABLE, e.g. v0.9.0 -->
 ```bash
-pip install git+https://github.com/cortexlabs/cortex.git@master#egg=cortex\&subdirectory=pkg/workloads/cortex/client
+pip install git+https://github.com/cortexlabs/cortex.git@v0.10.0#egg=cortex\&subdirectory=pkg/workloads/cortex/client
 ```
 
 The Python client needs to be initialized with AWS credentials and an operator URL for your Cortex cluster. You can find the operator URL by running `cortex cluster info`.
diff --git a/docs/packaging/tensorflow.md b/docs/packaging/tensorflow.md
@@ -1,7 +1,7 @@
 # Packaging TensorFlow models
 
 <!-- CORTEX_VERSION_MINOR -->
-Export your trained model and upload the export directory, or a checkpoint directory containing the export directory (which is usually the case if you used `estimator.train_and_evaluate`). An example is shown below (here is the [complete example](https://github.com/cortexlabs/cortex/blob/master/examples/tensorflow/sentiment-analysis)):
+Export your trained model and upload the export directory, or a checkpoint directory containing the export directory (which is usually the case if you used `estimator.train_and_evaluate`). An example is shown below (here is the [complete example](https://github.com/cortexlabs/cortex/blob/0.10/examples/tensorflow/sentiment-analysis)):
 
 ```Python
 import tensorflow as tf
diff --git a/docs/summary.md b/docs/summary.md
@@ -3,7 +3,7 @@
 * [Deploy machine learning models in production](../README.md)
 * [Install](cluster/install.md)
 * [GitHub](https://github.com/cortexlabs/cortex)
-* [Examples](https://github.com/cortexlabs/cortex/tree/master/examples)  <!-- CORTEX_VERSION_MINOR -->
+* [Examples](https://github.com/cortexlabs/cortex/tree/0.10/examples)  <!-- CORTEX_VERSION_MINOR -->
 * [We're hiring](https://angel.co/cortex-labs-inc/jobs)
 * [Email us](mailto:hello@cortex.dev)
 * [Chat with us](https://gitter.im/cortexlabs/cortex)
diff --git a/examples/tensorflow/image-classifier/inception.ipynb b/examples/tensorflow/image-classifier/inception.ipynb
@@ -201,7 +201,7 @@
       },
       "source": [
         "<!-- CORTEX_VERSION_MINOR -->\n",
-        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/master/examples/image-classifier) for how to deploy the model as an API."
+        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/0.10/examples/image-classifier) for how to deploy the model as an API."
       ]
     }
   ]
diff --git a/examples/tensorflow/iris-classifier/README.md b/examples/tensorflow/iris-classifier/README.md
@@ -22,7 +22,7 @@ A `deployment` specifies a set of resources that are deployed together. An `api`
 ```
 
 <!-- CORTEX_VERSION_MINOR -->
-You can run the code that generated the exported model used in this example [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/master/examples/tensorflow/iris-classifier/tensorflow.ipynb).
+You can run the code that generated the exported model used in this example [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/0.10/examples/tensorflow/iris-classifier/tensorflow.ipynb).
 
 ## Add request handling
 
diff --git a/examples/tensorflow/iris-classifier/tensorflow.ipynb b/examples/tensorflow/iris-classifier/tensorflow.ipynb
@@ -286,7 +286,7 @@
       },
       "source": [
         "<!-- CORTEX_VERSION_MINOR -->\n",
-        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/master/examples/iris-classifier) for how to deploy the model as an API."
+        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/0.10/examples/iris-classifier) for how to deploy the model as an API."
       ]
     }
   ]
diff --git a/examples/tensorflow/sentiment-analysis/README.md b/examples/tensorflow/sentiment-analysis/README.md
@@ -22,7 +22,7 @@ A `deployment` specifies a set of resources that are deployed together. An `api`
 ```
 
 <!-- CORTEX_VERSION_MINOR -->
-You can run the code that generated the exported BERT model [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/master/examples/tensorflow/sentiment-analysis/bert.ipynb).
+You can run the code that generated the exported BERT model [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/0.10/examples/tensorflow/sentiment-analysis/bert.ipynb).
 
 ## Add request handling
 
diff --git a/examples/tensorflow/sentiment-analysis/bert.ipynb b/examples/tensorflow/sentiment-analysis/bert.ipynb
@@ -997,7 +997,7 @@
       },
       "source": [
         "<!-- CORTEX_VERSION_MINOR -->\n",
-        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/master/examples/sentiment-analysis) for how to deploy the model as an API."
+        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/0.10/examples/sentiment-analysis) for how to deploy the model as an API."
       ]
     }
   ]
diff --git a/examples/tensorflow/text-generator/README.md b/examples/tensorflow/text-generator/README.md
@@ -23,7 +23,7 @@ A `deployment` specifies a set of resources that are deployed together. An `api`
 ```
 
 <!-- CORTEX_VERSION_MINOR -->
-You can run the code that generated the exported GPT-2 model [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/master/examples/tensorflow/text-generator/gpt-2.ipynb).
+You can run the code that generated the exported GPT-2 model [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/0.10/examples/tensorflow/text-generator/gpt-2.ipynb).
 
 ## Add request handling
 
diff --git a/examples/tensorflow/text-generator/gpt-2.ipynb b/examples/tensorflow/text-generator/gpt-2.ipynb
@@ -343,7 +343,7 @@
       },
       "source": [
         "<!-- CORTEX_VERSION_MINOR x2 -->\n",
-        "We also need to upload `vocab.bpe` and `encoder.json`, so that the [encoder](https://github.com/cortexlabs/cortex/blob/master/examples/tensorflow/text-generator/encoder.py) in the [pre-inference request handler](https://github.com/cortexlabs/cortex/blob/master/examples/tensorflow/text-generator/handler.py) can encode the input text before making a request to the model."
+        "We also need to upload `vocab.bpe` and `encoder.json`, so that the [encoder](https://github.com/cortexlabs/cortex/blob/0.10/examples/tensorflow/text-generator/encoder.py) in the [pre-inference request handler](https://github.com/cortexlabs/cortex/blob/0.10/examples/tensorflow/text-generator/handler.py) can encode the input text before making a request to the model."
       ]
     },
     {
@@ -373,7 +373,7 @@
       },
       "source": [
         "<!-- CORTEX_VERSION_MINOR -->\n",
-        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/master/examples/text-generator) for how to deploy the model as an API."
+        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/0.10/examples/text-generator) for how to deploy the model as an API."
       ]
     }
   ]
diff --git a/examples/xgboost/iris-classifier/README.md b/examples/xgboost/iris-classifier/README.md
@@ -22,7 +22,7 @@ A `deployment` specifies a set of resources that are deployed together. An `api`
 ```
 
 <!-- CORTEX_VERSION_MINOR -->
-You can run the code that generated the exported model used in this example [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/master/examples/xgboost/iris-classifier/xgboost.ipynb).
+You can run the code that generated the exported model used in this example [here](https://colab.research.google.com/github/cortexlabs/cortex/blob/0.10/examples/xgboost/iris-classifier/xgboost.ipynb).
 
 ## Add request handling
 
diff --git a/examples/xgboost/iris-classifier/xgboost.ipynb b/examples/xgboost/iris-classifier/xgboost.ipynb
@@ -234,7 +234,7 @@
       },
       "source": [
         "<!-- CORTEX_VERSION_MINOR -->\n",
-        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/master/examples/iris-classifier) for how to deploy the model as an API."
+        "That's it! See the [example on GitHub](https://github.com/cortexlabs/cortex/tree/0.10/examples/iris-classifier) for how to deploy the model as an API."
       ]
     }
   ]
diff --git a/get-cli.sh b/get-cli.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-CORTEX_VERSION_BRANCH_STABLE=master
+CORTEX_VERSION_BRANCH_STABLE=0.10.0
 
 case "$OSTYPE" in
   darwin*)  parsed_os="darwin" ;;
diff --git a/pkg/consts/consts.go b/pkg/consts/consts.go
@@ -17,7 +17,7 @@ limitations under the License.
 package consts
 
 var (
-	CortexVersion = "master" // CORTEX_VERSION
+	CortexVersion = "0.10.0" // CORTEX_VERSION
 
 	ContextCacheDir    = "/mnt/context"
 	EmptyDirMountPath  = "/mnt"
diff --git a/pkg/workloads/cortex/client/cortex/client.py b/pkg/workloads/cortex/client/cortex/client.py
@@ -44,7 +44,7 @@ def __init__(self, aws_access_key_id, aws_secret_access_key, operator_url):
         self.aws_access_key_id = aws_access_key_id
         self.aws_secret_access_key = aws_secret_access_key
         self.headers = {
-            "CortexAPIVersion": "master",  # CORTEX_VERSION
+            "CortexAPIVersion": "0.10.0",  # CORTEX_VERSION
             "Authorization": "CortexAWS {}|{}".format(
                 self.aws_access_key_id, self.aws_secret_access_key
             ),
diff --git a/pkg/workloads/cortex/client/setup.py b/pkg/workloads/cortex/client/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name="cortex",
-    version="master",  # CORTEX_VERSION
+    version="0.10.0",  # CORTEX_VERSION
     description="",
     author="Cortex Labs",
     author_email="dev@cortexlabs.com",
diff --git a/pkg/workloads/cortex/consts.py b/pkg/workloads/cortex/consts.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CORTEX_VERSION = "master"
+CORTEX_VERSION = "0.10.0"
