From c939dec7f23307037b74194768debd08b0d8b368 Mon Sep 17 00:00:00 2001 From: jeff-shepherd <39775772+jeff-shepherd@users.noreply.github.com> Date: Fri, 19 Jul 2024 13:53:57 -0700 Subject: [PATCH] Upgrade to sklearn-1.5 from sklearn-1.1 (#3301) --- .../managed/sample/blue-deployment-with-curated-env.yml | 2 +- .../managed/sample/green-deployment-with-curated-env.yml | 2 +- .../components/compare2/compare2.yml | 2 +- .../components/eval/eval.yml | 2 +- .../components/score/score.yml | 2 +- .../components/train/train.yml | 2 +- cli/jobs/pipelines/cifar-10/pipeline.yml | 2 +- .../pipelines/tensorflow-image-segmentation/pipeline.yml | 2 +- cli/jobs/single-step/scikit-learn/iris/job-sweep.yml | 2 +- .../endpoints/online/llm/src/sk/skills/WriterSkill/spec.yml | 2 +- ...automl-image-classification-multiclass-in-pipeline.ipynb | 2 +- ...automl-image-classification-multilabel-in-pipeline.ipynb | 2 +- .../automl-image-instance-segmentation-in-pipeline.ipynb | 2 +- .../automl-image-object-detection-in-pipeline.ipynb | 2 +- .../automl-text-classification-in-pipeline.ipynb | 2 +- .../automl-text-classification-multilabel-in-pipeline.ipynb | 2 +- ...toml-text-ner-named-entity-recognition-in-pipeline.ipynb | 2 +- .../pytorch/distributed-training/distributed-cifar10.ipynb | 6 +++--- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cli/endpoints/online/managed/sample/blue-deployment-with-curated-env.yml b/cli/endpoints/online/managed/sample/blue-deployment-with-curated-env.yml index 1eae7f9288..2d27ebfaa1 100644 --- a/cli/endpoints/online/managed/sample/blue-deployment-with-curated-env.yml +++ b/cli/endpoints/online/managed/sample/blue-deployment-with-curated-env.yml @@ -6,6 +6,6 @@ model: code_configuration: code: ../../model-1/onlinescoring/ scoring_script: score.py -environment: azureml://registries/azureml/environments/sklearn-1.1/versions/30 +environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest instance_type: Standard_DS3_v2 instance_count: 1 diff --git a/cli/endpoints/online/managed/sample/green-deployment-with-curated-env.yml b/cli/endpoints/online/managed/sample/green-deployment-with-curated-env.yml index 387bfb8c8e..ede3c99cbb 100644 --- a/cli/endpoints/online/managed/sample/green-deployment-with-curated-env.yml +++ b/cli/endpoints/online/managed/sample/green-deployment-with-curated-env.yml @@ -6,6 +6,6 @@ model: code_configuration: code: ../../model-2/onlinescoring/ scoring_script: score.py -environment: azureml://registries/azureml/environments/sklearn-1.1/versions/30 +environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest instance_type: Standard_DS3_v2 instance_count: 1 diff --git a/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/compare2/compare2.yml b/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/compare2/compare2.yml index 1a3d48a90b..937a6a5bb6 100644 --- a/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/compare2/compare2.yml +++ b/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/compare2/compare2.yml @@ -18,7 +18,7 @@ outputs: type: uri_folder best_result: type: uri_folder -environment: azureml://registries/azureml/environments/sklearn-1.1/labels/latest +environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest code: . command: >- python compare2.py diff --git a/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/eval/eval.yml b/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/eval/eval.yml index 6373b30d95..f9db017dee 100644 --- a/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/eval/eval.yml +++ b/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/eval/eval.yml @@ -10,7 +10,7 @@ inputs: outputs: eval_output: type: uri_folder -environment: azureml://registries/azureml/environments/sklearn-1.1/labels/latest +environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest code: . command: >- python eval.py diff --git a/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/score/score.yml b/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/score/score.yml index 86b068b4c9..3033e17f91 100644 --- a/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/score/score.yml +++ b/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/score/score.yml @@ -13,7 +13,7 @@ inputs: outputs: score_output: type: uri_folder -environment: azureml://registries/azureml/environments/sklearn-1.1/labels/latest +environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest code: . command: >- python score.py diff --git a/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/train/train.yml b/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/train/train.yml index ef4df83288..f0e07b9674 100644 --- a/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/train/train.yml +++ b/cli/jobs/pipelines-with-components/pipeline_with_pipeline_component/pipeline_with_train_eval_pipeline_component/components/train/train.yml @@ -19,7 +19,7 @@ outputs: model_output: type: uri_folder code: . -environment: azureml://registries/azureml/environments/sklearn-1.1/labels/latest +environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest command: >- python train.py --training_data ${{inputs.training_data}} diff --git a/cli/jobs/pipelines/cifar-10/pipeline.yml b/cli/jobs/pipelines/cifar-10/pipeline.yml index 28f168c619..60258b47fa 100644 --- a/cli/jobs/pipelines/cifar-10/pipeline.yml +++ b/cli/jobs/pipelines/cifar-10/pipeline.yml @@ -13,7 +13,7 @@ jobs: tar -xvzf cifar-10-python.tar.gz -C ${{outputs.cifar}}; rm cifar-10-python.tar.gz; compute: azureml:gpu-cluster - environment: azureml://registries/azureml/environments/sklearn-1.1/labels/latest + environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest outputs: cifar: type: uri_folder diff --git a/cli/jobs/pipelines/tensorflow-image-segmentation/pipeline.yml b/cli/jobs/pipelines/tensorflow-image-segmentation/pipeline.yml index e2c4027f8a..7ef1eae3b3 100644 --- a/cli/jobs/pipelines/tensorflow-image-segmentation/pipeline.yml +++ b/cli/jobs/pipelines/tensorflow-image-segmentation/pipeline.yml @@ -28,7 +28,7 @@ jobs: type: uri_folder mode: upload - environment: azureml://registries/azureml/environments/sklearn-1.1/labels/latest + environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest compute: azureml:cpu-cluster diff --git a/cli/jobs/single-step/scikit-learn/iris/job-sweep.yml b/cli/jobs/single-step/scikit-learn/iris/job-sweep.yml index e68c4aa4bf..d40aa59938 100644 --- a/cli/jobs/single-step/scikit-learn/iris/job-sweep.yml +++ b/cli/jobs/single-step/scikit-learn/iris/job-sweep.yml @@ -8,7 +8,7 @@ trial: --C ${{search_space.C}} --kernel ${{search_space.kernel}} --coef0 ${{search_space.coef0}} - environment: azureml:AzureML-sklearn-1.1@latest + environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest inputs: iris_csv: type: uri_file diff --git a/sdk/python/endpoints/online/llm/src/sk/skills/WriterSkill/spec.yml b/sdk/python/endpoints/online/llm/src/sk/skills/WriterSkill/spec.yml index 12439990a6..2730cc9cba 100644 --- a/sdk/python/endpoints/online/llm/src/sk/skills/WriterSkill/spec.yml +++ b/sdk/python/endpoints/online/llm/src/sk/skills/WriterSkill/spec.yml @@ -12,4 +12,4 @@ tags: # Not really used, but required by the schema command: n/a -environment: azureml://registries/azureml/environments/sklearn-1.1-ubuntu20.04-py38-cpu/versions/17 +environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest diff --git a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-classification-multiclass-in-pipeline/automl-image-classification-multiclass-in-pipeline.ipynb b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-classification-multiclass-in-pipeline/automl-image-classification-multiclass-in-pipeline.ipynb index 9b9e568cef..941bd595a4 100644 --- a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-classification-multiclass-in-pipeline/automl-image-classification-multiclass-in-pipeline.ipynb +++ b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-classification-multiclass-in-pipeline/automl-image-classification-multiclass-in-pipeline.ipynb @@ -410,7 +410,7 @@ " command=\"python register.py \"\n", " + \"--model_input_path ${{inputs.model_input_path}} \"\n", " + \"--model_base_name ${{inputs.model_base_name}}\",\n", - " environment=\"azureml://registries/azureml/environments/sklearn-1.1/labels/latest\",\n", + " environment=\"azureml://registries/azureml/environments/sklearn-1.5/labels/latest\",\n", " )\n", " register_model = command_func(\n", " model_input_path=image_classification_node.outputs.best_model\n", diff --git a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-classification-multilabel-in-pipeline/automl-image-classification-multilabel-in-pipeline.ipynb b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-classification-multilabel-in-pipeline/automl-image-classification-multilabel-in-pipeline.ipynb index 43ad625d37..8fcefb4f99 100644 --- a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-classification-multilabel-in-pipeline/automl-image-classification-multilabel-in-pipeline.ipynb +++ b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-classification-multilabel-in-pipeline/automl-image-classification-multilabel-in-pipeline.ipynb @@ -416,7 +416,7 @@ " command=\"python register.py \"\n", " + \"--model_input_path ${{inputs.model_input_path}} \"\n", " + \"--model_base_name ${{inputs.model_base_name}}\",\n", - " environment=\"azureml://registries/azureml/environments/sklearn-1.1/labels/latest\",\n", + " environment=\"azureml://registries/azureml/environments/sklearn-1.5/labels/latest\",\n", " )\n", " register_model = command_func(\n", " model_input_path=image_classification_multilabel_node.outputs.best_model\n", diff --git a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-instance-segmentation-in-pipeline/automl-image-instance-segmentation-in-pipeline.ipynb b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-instance-segmentation-in-pipeline/automl-image-instance-segmentation-in-pipeline.ipynb index 4fbd28f40f..88ba780a00 100644 --- a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-instance-segmentation-in-pipeline/automl-image-instance-segmentation-in-pipeline.ipynb +++ b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-instance-segmentation-in-pipeline/automl-image-instance-segmentation-in-pipeline.ipynb @@ -373,7 +373,7 @@ " command=\"python register.py \"\n", " + \"--model_input_path ${{inputs.model_input_path}} \"\n", " + \"--model_base_name ${{inputs.model_base_name}}\",\n", - " environment=\"azureml://registries/azureml/environments/sklearn-1.1/labels/latest\",\n", + " environment=\"azureml://registries/azureml/environments/sklearn-1.5/labels/latest\",\n", " )\n", " register_model = command_func(\n", " model_input_path=image_instance_segmentation_node.outputs.best_model\n", diff --git a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-object-detection-in-pipeline/automl-image-object-detection-in-pipeline.ipynb b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-object-detection-in-pipeline/automl-image-object-detection-in-pipeline.ipynb index 945a9f6611..6e188962fb 100644 --- a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-object-detection-in-pipeline/automl-image-object-detection-in-pipeline.ipynb +++ b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-image-object-detection-in-pipeline/automl-image-object-detection-in-pipeline.ipynb @@ -428,7 +428,7 @@ " command=\"python register.py \"\n", " + \"--model_input_path ${{inputs.model_input_path}} \"\n", " + \"--model_base_name ${{inputs.model_base_name}}\",\n", - " environment=\"azureml://registries/azureml/environments/sklearn-1.1/labels/latest\",\n", + " environment=\"azureml://registries/azureml/environments/sklearn-1.5/labels/latest\",\n", " )\n", " register_model = command_func(\n", " model_input_path=image_object_detection_node.outputs.best_model\n", diff --git a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-classification-in-pipeline/automl-text-classification-in-pipeline.ipynb b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-classification-in-pipeline/automl-text-classification-in-pipeline.ipynb index d512e020e1..9ea528d51e 100644 --- a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-classification-in-pipeline/automl-text-classification-in-pipeline.ipynb +++ b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-classification-in-pipeline/automl-text-classification-in-pipeline.ipynb @@ -188,7 +188,7 @@ " command=\"python register.py \"\n", " + \"--model_input_path ${{inputs.model_input_path}} \"\n", " + \"--model_base_name ${{inputs.model_base_name}}\",\n", - " environment=\"azureml://registries/azureml/environments/sklearn-1.1/labels/latest\",\n", + " environment=\"azureml://registries/azureml/environments/sklearn-1.5/labels/latest\",\n", " )\n", " register_model = command_func(\n", " model_input_path=text_classification_node.outputs.best_model\n", diff --git a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-classification-multilabel-in-pipeline/automl-text-classification-multilabel-in-pipeline.ipynb b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-classification-multilabel-in-pipeline/automl-text-classification-multilabel-in-pipeline.ipynb index 7acbf11aeb..e5464e6665 100644 --- a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-classification-multilabel-in-pipeline/automl-text-classification-multilabel-in-pipeline.ipynb +++ b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-classification-multilabel-in-pipeline/automl-text-classification-multilabel-in-pipeline.ipynb @@ -187,7 +187,7 @@ " command=\"python register.py \"\n", " + \"--model_input_path ${{inputs.model_input_path}} \"\n", " + \"--model_base_name ${{inputs.model_base_name}}\",\n", - " environment=\"azureml://registries/azureml/environments/sklearn-1.1/labels/latest\",\n", + " environment=\"azureml://registries/azureml/environments/sklearn-1.5/labels/latest\",\n", " )\n", " register_model = command_func(\n", " model_input_path=text_classification_multilabel_node.outputs.best_model\n", diff --git a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-ner-named-entity-recognition-in-pipeline/automl-text-ner-named-entity-recognition-in-pipeline.ipynb b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-ner-named-entity-recognition-in-pipeline/automl-text-ner-named-entity-recognition-in-pipeline.ipynb index 57261a6b0d..6ab96db537 100644 --- a/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-ner-named-entity-recognition-in-pipeline/automl-text-ner-named-entity-recognition-in-pipeline.ipynb +++ b/sdk/python/jobs/pipelines/1h_automl_in_pipeline/automl-text-ner-named-entity-recognition-in-pipeline/automl-text-ner-named-entity-recognition-in-pipeline.ipynb @@ -183,7 +183,7 @@ " command=\"python register.py \"\n", " + \"--model_input_path ${{inputs.model_input_path}} \"\n", " + \"--model_base_name ${{inputs.model_base_name}}\",\n", - " environment=\"azureml://registries/azureml/environments/sklearn-1.1/labels/latest\",\n", + " environment=\"azureml://registries/azureml/environments/sklearn-1.5/labels/latest\",\n", " )\n", " register_model = command_func(model_input_path=text_ner_node.outputs.best_model)\n", "\n", diff --git a/sdk/python/jobs/single-step/pytorch/distributed-training/distributed-cifar10.ipynb b/sdk/python/jobs/single-step/pytorch/distributed-training/distributed-cifar10.ipynb index 6a5c1fc9b1..79eb7494f4 100644 --- a/sdk/python/jobs/single-step/pytorch/distributed-training/distributed-cifar10.ipynb +++ b/sdk/python/jobs/single-step/pytorch/distributed-training/distributed-cifar10.ipynb @@ -215,11 +215,11 @@ "cell_type": "code", "execution_count": null, "metadata": { - "name": "inputs", "jupyter": { "outputs_hidden": false, "source_hidden": false }, + "name": "inputs", "nteract": { "transient": { "deleting": false @@ -254,7 +254,7 @@ " command=\"python read_write_data.py --input_data ${{inputs.cifar_zip}} --output_folder ${{outputs.cifar}}\",\n", " inputs=inputs,\n", " outputs=outputs,\n", - " environment=\"azureml-sklearn-1.1:30\",\n", + " environment=\"azureml://registries/azureml/environments/sklearn-1.5/labels/latest\",\n", ")\n", "\n", "# submit the command\n", @@ -311,11 +311,11 @@ "cell_type": "code", "execution_count": null, "metadata": { - "name": "job", "jupyter": { "outputs_hidden": false, "source_hidden": false }, + "name": "job", "nteract": { "transient": { "deleting": false