From 33feeca77b93a492bcd825b07aa58e6f98ec65cc Mon Sep 17 00:00:00 2001 From: Alexander Wallace Date: Wed, 8 Feb 2023 17:41:07 +0000 Subject: [PATCH 1/2] Init --- ...ipts-deploy-managed-online-endpoint-ncd.yml} | 8 ++++---- ...sh => deploy-managed-online-endpoint-ncd.sh} | 16 +++++++--------- .../online/{mlflow => ncd}/create-endpoint.yaml | 0 .../{mlflow => ncd}/lightgbm-deployment.yaml | 0 .../{mlflow => ncd}/lightgbm-iris/model/MLmodel | 0 .../lightgbm-iris/model/conda.yaml | 0 .../lightgbm-iris/model/model.lgb | 0 .../lightgbm-iris/model/requirements.txt | 0 .../sample-request-lightgbm.json | 0 .../{mlflow => ncd}/sample-request-sklearn.json | 0 .../sklearn-deployment-with-script.yaml | 0 .../{mlflow => ncd}/sklearn-deployment.yaml | 0 .../sklearn-diabetes/environment/conda.yml | 0 .../sklearn-diabetes/model/MLmodel | 0 .../sklearn-diabetes/model/conda.yaml | 0 .../sklearn-diabetes/model/model.pkl | Bin .../sklearn-diabetes/model/requirements.txt | 0 .../sklearn-diabetes/src/score.py | 0 18 files changed, 11 insertions(+), 13 deletions(-) rename .github/workflows/{cli-scripts-deploy-managed-online-endpoint-mlflow.yml => cli-scripts-deploy-managed-online-endpoint-ncd.yml} (87%) rename cli/{deploy-managed-online-endpoint-mlflow.sh => deploy-managed-online-endpoint-ncd.sh} (81%) rename cli/endpoints/online/{mlflow => ncd}/create-endpoint.yaml (100%) rename cli/endpoints/online/{mlflow => ncd}/lightgbm-deployment.yaml (100%) rename cli/endpoints/online/{mlflow => ncd}/lightgbm-iris/model/MLmodel (100%) rename cli/endpoints/online/{mlflow => ncd}/lightgbm-iris/model/conda.yaml (100%) rename cli/endpoints/online/{mlflow => ncd}/lightgbm-iris/model/model.lgb (100%) rename cli/endpoints/online/{mlflow => ncd}/lightgbm-iris/model/requirements.txt (100%) rename cli/endpoints/online/{mlflow => ncd}/sample-request-lightgbm.json (100%) rename cli/endpoints/online/{mlflow => ncd}/sample-request-sklearn.json (100%) rename cli/endpoints/online/{mlflow => ncd}/sklearn-deployment-with-script.yaml (100%) rename cli/endpoints/online/{mlflow => ncd}/sklearn-deployment.yaml (100%) rename cli/endpoints/online/{mlflow => ncd}/sklearn-diabetes/environment/conda.yml (100%) rename cli/endpoints/online/{mlflow => ncd}/sklearn-diabetes/model/MLmodel (100%) rename cli/endpoints/online/{mlflow => ncd}/sklearn-diabetes/model/conda.yaml (100%) rename cli/endpoints/online/{mlflow => ncd}/sklearn-diabetes/model/model.pkl (100%) rename cli/endpoints/online/{mlflow => ncd}/sklearn-diabetes/model/requirements.txt (100%) rename cli/endpoints/online/{mlflow => ncd}/sklearn-diabetes/src/score.py (100%) diff --git a/.github/workflows/cli-scripts-deploy-managed-online-endpoint-mlflow.yml b/.github/workflows/cli-scripts-deploy-managed-online-endpoint-ncd.yml similarity index 87% rename from .github/workflows/cli-scripts-deploy-managed-online-endpoint-mlflow.yml rename to .github/workflows/cli-scripts-deploy-managed-online-endpoint-ncd.yml index 8186a6eafd..e8c22024a8 100644 --- a/.github/workflows/cli-scripts-deploy-managed-online-endpoint-mlflow.yml +++ b/.github/workflows/cli-scripts-deploy-managed-online-endpoint-ncd.yml @@ -3,7 +3,7 @@ # Any manual changes to this file may cause incorrect behavior. # Any manual changes will be overwritten if the code is regenerated. -name: cli-scripts-deploy-managed-online-endpoint-mlflow +name: cli-scripts-deploy-managed-online-endpoint-ncd on: workflow_dispatch: schedule: @@ -12,9 +12,9 @@ on: branches: - main paths: - - cli/deploy-managed-online-endpoint-mlflow.sh + - cli/deploy-managed-online-endpoint-ncd.sh - infra/** - - .github/workflows/cli-scripts-deploy-managed-online-endpoint-mlflow.yml + - .github/workflows/cli-scripts-deploy-managed-online-endpoint-ncd.yml - cli/setup.sh concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -45,5 +45,5 @@ jobs: run: | source "${{ github.workspace }}/infra/sdk_helpers.sh"; source "${{ github.workspace }}/infra/init_environment.sh"; - set -e; bash -x deploy-managed-online-endpoint-mlflow.sh + set -e; bash -x deploy-managed-online-endpoint-ncd.sh working-directory: cli diff --git a/cli/deploy-managed-online-endpoint-mlflow.sh b/cli/deploy-managed-online-endpoint-ncd.sh similarity index 81% rename from cli/deploy-managed-online-endpoint-mlflow.sh rename to cli/deploy-managed-online-endpoint-ncd.sh index 8582340c7b..b01dfc4607 100644 --- a/cli/deploy-managed-online-endpoint-mlflow.sh +++ b/cli/deploy-managed-online-endpoint-ncd.sh @@ -1,18 +1,16 @@ set -e - # export ENDPOINT_NAME="" # # endpoint name -export ENDPOINT_NAME=endpt-mlflow-`echo $RANDOM` -AML_MODEL_NAME=mir-sample-sklearn-mlflow-model +export ENDPOINT_NAME=endpt-ncd-`echo $RANDOM` +AML_MODEL_NAME=mir-sample-sklearn-ncd-model echo $AML_MODEL_NAME - # -az ml online-endpoint create --name $ENDPOINT_NAME -f endpoints/online/mlflow/create-endpoint.yaml +az ml online-endpoint create --name $ENDPOINT_NAME -f endpoints/online/ncd/create-endpoint.yaml # # check if create was successful @@ -30,7 +28,7 @@ fi model_archive=$(az ml model archive -n $AML_MODEL_NAME --version 1 || true) # -az ml online-deployment create --name sklearn-deployment --endpoint $ENDPOINT_NAME -f endpoints/online/mlflow/sklearn-deployment.yaml --all-traffic +az ml online-deployment create --name sklearn-deployment --endpoint $ENDPOINT_NAME -f endpoints/online/ncd/sklearn-deployment.yaml --all-traffic # deploy_status=`az ml online-deployment show --name sklearn-deployment --endpoint $ENDPOINT_NAME --query "provisioning_state" -o tsv` @@ -44,11 +42,11 @@ else fi # -az ml online-endpoint invoke --name $ENDPOINT_NAME --request-file endpoints/online/mlflow/sample-request-sklearn.json +az ml online-endpoint invoke --name $ENDPOINT_NAME --request-file endpoints/online/ncd/sample-request-sklearn.json # # -az ml online-deployment create --name lightgbm-deployment --endpoint $ENDPOINT_NAME -f endpoints/online/mlflow/lightgbm-deployment.yaml +az ml online-deployment create --name lightgbm-deployment --endpoint $ENDPOINT_NAME -f endpoints/online/ncd/lightgbm-deployment.yaml # deploy_status=`az ml online-deployment show --name lightgbm-deployment --endpoint $ENDPOINT_NAME --query "provisioning_state" -o tsv` @@ -62,7 +60,7 @@ else fi # -az ml online-endpoint invoke --name $ENDPOINT_NAME --deployment lightgbm-deployment --request-file endpoints/online/mlflow/sample-request-lightgbm.json +az ml online-endpoint invoke --name $ENDPOINT_NAME --deployment lightgbm-deployment --request-file endpoints/online/ncd/sample-request-lightgbm.json # # cleanup of model diff --git a/cli/endpoints/online/mlflow/create-endpoint.yaml b/cli/endpoints/online/ncd/create-endpoint.yaml similarity index 100% rename from cli/endpoints/online/mlflow/create-endpoint.yaml rename to cli/endpoints/online/ncd/create-endpoint.yaml diff --git a/cli/endpoints/online/mlflow/lightgbm-deployment.yaml b/cli/endpoints/online/ncd/lightgbm-deployment.yaml similarity index 100% rename from cli/endpoints/online/mlflow/lightgbm-deployment.yaml rename to cli/endpoints/online/ncd/lightgbm-deployment.yaml diff --git a/cli/endpoints/online/mlflow/lightgbm-iris/model/MLmodel b/cli/endpoints/online/ncd/lightgbm-iris/model/MLmodel similarity index 100% rename from cli/endpoints/online/mlflow/lightgbm-iris/model/MLmodel rename to cli/endpoints/online/ncd/lightgbm-iris/model/MLmodel diff --git a/cli/endpoints/online/mlflow/lightgbm-iris/model/conda.yaml b/cli/endpoints/online/ncd/lightgbm-iris/model/conda.yaml similarity index 100% rename from cli/endpoints/online/mlflow/lightgbm-iris/model/conda.yaml rename to cli/endpoints/online/ncd/lightgbm-iris/model/conda.yaml diff --git a/cli/endpoints/online/mlflow/lightgbm-iris/model/model.lgb b/cli/endpoints/online/ncd/lightgbm-iris/model/model.lgb similarity index 100% rename from cli/endpoints/online/mlflow/lightgbm-iris/model/model.lgb rename to cli/endpoints/online/ncd/lightgbm-iris/model/model.lgb diff --git a/cli/endpoints/online/mlflow/lightgbm-iris/model/requirements.txt b/cli/endpoints/online/ncd/lightgbm-iris/model/requirements.txt similarity index 100% rename from cli/endpoints/online/mlflow/lightgbm-iris/model/requirements.txt rename to cli/endpoints/online/ncd/lightgbm-iris/model/requirements.txt diff --git a/cli/endpoints/online/mlflow/sample-request-lightgbm.json b/cli/endpoints/online/ncd/sample-request-lightgbm.json similarity index 100% rename from cli/endpoints/online/mlflow/sample-request-lightgbm.json rename to cli/endpoints/online/ncd/sample-request-lightgbm.json diff --git a/cli/endpoints/online/mlflow/sample-request-sklearn.json b/cli/endpoints/online/ncd/sample-request-sklearn.json similarity index 100% rename from cli/endpoints/online/mlflow/sample-request-sklearn.json rename to cli/endpoints/online/ncd/sample-request-sklearn.json diff --git a/cli/endpoints/online/mlflow/sklearn-deployment-with-script.yaml b/cli/endpoints/online/ncd/sklearn-deployment-with-script.yaml similarity index 100% rename from cli/endpoints/online/mlflow/sklearn-deployment-with-script.yaml rename to cli/endpoints/online/ncd/sklearn-deployment-with-script.yaml diff --git a/cli/endpoints/online/mlflow/sklearn-deployment.yaml b/cli/endpoints/online/ncd/sklearn-deployment.yaml similarity index 100% rename from cli/endpoints/online/mlflow/sklearn-deployment.yaml rename to cli/endpoints/online/ncd/sklearn-deployment.yaml diff --git a/cli/endpoints/online/mlflow/sklearn-diabetes/environment/conda.yml b/cli/endpoints/online/ncd/sklearn-diabetes/environment/conda.yml similarity index 100% rename from cli/endpoints/online/mlflow/sklearn-diabetes/environment/conda.yml rename to cli/endpoints/online/ncd/sklearn-diabetes/environment/conda.yml diff --git a/cli/endpoints/online/mlflow/sklearn-diabetes/model/MLmodel b/cli/endpoints/online/ncd/sklearn-diabetes/model/MLmodel similarity index 100% rename from cli/endpoints/online/mlflow/sklearn-diabetes/model/MLmodel rename to cli/endpoints/online/ncd/sklearn-diabetes/model/MLmodel diff --git a/cli/endpoints/online/mlflow/sklearn-diabetes/model/conda.yaml b/cli/endpoints/online/ncd/sklearn-diabetes/model/conda.yaml similarity index 100% rename from cli/endpoints/online/mlflow/sklearn-diabetes/model/conda.yaml rename to cli/endpoints/online/ncd/sklearn-diabetes/model/conda.yaml diff --git a/cli/endpoints/online/mlflow/sklearn-diabetes/model/model.pkl b/cli/endpoints/online/ncd/sklearn-diabetes/model/model.pkl similarity index 100% rename from cli/endpoints/online/mlflow/sklearn-diabetes/model/model.pkl rename to cli/endpoints/online/ncd/sklearn-diabetes/model/model.pkl diff --git a/cli/endpoints/online/mlflow/sklearn-diabetes/model/requirements.txt b/cli/endpoints/online/ncd/sklearn-diabetes/model/requirements.txt similarity index 100% rename from cli/endpoints/online/mlflow/sklearn-diabetes/model/requirements.txt rename to cli/endpoints/online/ncd/sklearn-diabetes/model/requirements.txt diff --git a/cli/endpoints/online/mlflow/sklearn-diabetes/src/score.py b/cli/endpoints/online/ncd/sklearn-diabetes/src/score.py similarity index 100% rename from cli/endpoints/online/mlflow/sklearn-diabetes/src/score.py rename to cli/endpoints/online/ncd/sklearn-diabetes/src/score.py From 3a8df10191383c99309ba708a7a6fd14cb600640 Mon Sep 17 00:00:00 2001 From: Alexander Wallace Date: Wed, 8 Feb 2023 17:42:03 +0000 Subject: [PATCH 2/2] Readme --- .../cli-scripts-deploy-managed-online-endpoint-ncd.yml | 2 +- cli/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cli-scripts-deploy-managed-online-endpoint-ncd.yml b/.github/workflows/cli-scripts-deploy-managed-online-endpoint-ncd.yml index e8c22024a8..457c55eead 100644 --- a/.github/workflows/cli-scripts-deploy-managed-online-endpoint-ncd.yml +++ b/.github/workflows/cli-scripts-deploy-managed-online-endpoint-ncd.yml @@ -7,7 +7,7 @@ name: cli-scripts-deploy-managed-online-endpoint-ncd on: workflow_dispatch: schedule: - - cron: "38 2/12 * * *" + - cron: "6 0/12 * * *" pull_request: branches: - main diff --git a/cli/README.md b/cli/README.md index 7253004b24..7dbec5b893 100644 --- a/cli/README.md +++ b/cli/README.md @@ -51,7 +51,7 @@ path|status| [deploy-local-endpoint.sh](deploy-local-endpoint.sh)|[![deploy-local-endpoint](https://github.com/Azure/azureml-examples/workflows/cli-scripts-deploy-local-endpoint/badge.svg?branch=main)](https://github.com/Azure/azureml-examples/actions/workflows/cli-scripts-deploy-local-endpoint.yml) [deploy-managed-online-endpoint-access-resource-sai.sh](deploy-managed-online-endpoint-access-resource-sai.sh)|[![deploy-managed-online-endpoint-access-resource-sai](https://github.com/Azure/azureml-examples/workflows/cli-scripts-deploy-managed-online-endpoint-access-resource-sai/badge.svg?branch=main)](https://github.com/Azure/azureml-examples/actions/workflows/cli-scripts-deploy-managed-online-endpoint-access-resource-sai.yml) [deploy-managed-online-endpoint-access-resource-uai.sh](deploy-managed-online-endpoint-access-resource-uai.sh)|[![deploy-managed-online-endpoint-access-resource-uai](https://github.com/Azure/azureml-examples/workflows/cli-scripts-deploy-managed-online-endpoint-access-resource-uai/badge.svg?branch=main)](https://github.com/Azure/azureml-examples/actions/workflows/cli-scripts-deploy-managed-online-endpoint-access-resource-uai.yml) -[deploy-managed-online-endpoint-mlflow.sh](deploy-managed-online-endpoint-mlflow.sh)|[![deploy-managed-online-endpoint-mlflow](https://github.com/Azure/azureml-examples/workflows/cli-scripts-deploy-managed-online-endpoint-mlflow/badge.svg?branch=main)](https://github.com/Azure/azureml-examples/actions/workflows/cli-scripts-deploy-managed-online-endpoint-mlflow.yml) +[deploy-managed-online-endpoint-ncd.sh](deploy-managed-online-endpoint-ncd.sh)|[![deploy-managed-online-endpoint-ncd](https://github.com/Azure/azureml-examples/workflows/cli-scripts-deploy-managed-online-endpoint-ncd/badge.svg?branch=main)](https://github.com/Azure/azureml-examples/actions/workflows/cli-scripts-deploy-managed-online-endpoint-ncd.yml) [deploy-managed-online-endpoint.sh](deploy-managed-online-endpoint.sh)|[![deploy-managed-online-endpoint](https://github.com/Azure/azureml-examples/workflows/cli-scripts-deploy-managed-online-endpoint/badge.svg?branch=main)](https://github.com/Azure/azureml-examples/actions/workflows/cli-scripts-deploy-managed-online-endpoint.yml) [deploy-mlcompute-create_with-system-identity.sh](deploy-mlcompute-create_with-system-identity.sh)|[![deploy-mlcompute-create_with-system-identity](https://github.com/Azure/azureml-examples/workflows/cli-scripts-deploy-mlcompute-create_with-system-identity/badge.svg?branch=main)](https://github.com/Azure/azureml-examples/actions/workflows/cli-scripts-deploy-mlcompute-create_with-system-identity.yml) [deploy-mlcompute-update-to-system-identity.sh](deploy-mlcompute-update-to-system-identity.sh)|[![deploy-mlcompute-update-to-system-identity](https://github.com/Azure/azureml-examples/workflows/cli-scripts-deploy-mlcompute-update-to-system-identity/badge.svg?branch=main)](https://github.com/Azure/azureml-examples/actions/workflows/cli-scripts-deploy-mlcompute-update-to-system-identity.yml)