Updated to sklearn-1.5 (Azure#3297)

* Updated to sklearn-1.5 * Removed deprecated 'normalize' parameter
vrxmike · Jul 19, 2024 · 0fe5cf5 · 0fe5cf5
1 parent f52c498
commit 0fe5cf5
Show file tree

Hide file tree

Showing 41 changed files with 47 additions and 48 deletions.
diff --git a/cli/assets/component/README.md b/cli/assets/component/README.md
@@ -73,7 +73,7 @@ outputs:
   model_output:
     type: uri_folder
 code: ./train_src
-environment: azureml://registries/azureml/environments/sklearn-1.0/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/assets/component/component_additional_includes.yml b/cli/assets/component/component_additional_includes.yml
@@ -6,7 +6,7 @@ tags:
   author: azureml-sdk-team
 type: command
 code: ./component_src
-environment: azureml:AzureML-sklearn-1.0-ubuntu20.04-py38-cpu:1
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 additional_includes:
     - common_src
 command: >-

diff --git a/cli/assets/component/pipeline.yml b/cli/assets/component/pipeline.yml
@@ -12,12 +12,12 @@ description: pipeline component with inline job
 jobs:
   hello_job:
     type: command
-    environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+    environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
     command: echo 'hello'
 
   world_job:
     type: command
     command: echo 'world'
-    environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+    environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 
 # </jobs>
diff --git a/cli/assets/component/train.yml b/cli/assets/component/train.yml
@@ -23,7 +23,7 @@ outputs:
   model_output:
     type: uri_folder
 code: ./train_src
-environment: azureml://registries/azureml/environments/sklearn-1.0/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/endpoints/batch/deploy-pipelines/hello-batch/hello-component/hello.yml b/cli/endpoints/batch/deploy-pipelines/hello-batch/hello-component/hello.yml
@@ -8,6 +8,6 @@ jobs:
     type: command
     component:
       code: src
-      environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+      environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
       command: >-
         python hello.py
diff --git a/cli/jobs/pipelines-with-components/basics/1a_e2e_local_components/eval.yml b/cli/jobs/pipelines-with-components/basics/1a_e2e_local_components/eval.yml
@@ -9,7 +9,7 @@ inputs:
 outputs:
   eval_output:
     type: uri_folder
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 code: ./eval_src
 command: >-
   python eval.py 

diff --git a/cli/jobs/pipelines-with-components/basics/1a_e2e_local_components/score.yml b/cli/jobs/pipelines-with-components/basics/1a_e2e_local_components/score.yml
@@ -11,7 +11,7 @@ inputs:
 outputs:
   score_output:
     type: uri_folder
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 code: ./score_src
 command: >-
   python score.py 

diff --git a/cli/jobs/pipelines-with-components/basics/1a_e2e_local_components/train.yml b/cli/jobs/pipelines-with-components/basics/1a_e2e_local_components/train.yml
@@ -18,7 +18,7 @@ outputs:
   model_output:
     type: uri_folder
 code: ./train_src
-environment: azureml://registries/azureml/environments/sklearn-1.0/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-with-components/basics/1b_e2e_registered_components/eval.yml b/cli/jobs/pipelines-with-components/basics/1b_e2e_registered_components/eval.yml
@@ -9,7 +9,7 @@ inputs:
 outputs:
   eval_output:
     type: uri_folder
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 code: ./eval_src
 command: >-
   python eval.py 

diff --git a/cli/jobs/pipelines-with-components/basics/1b_e2e_registered_components/score.yml b/cli/jobs/pipelines-with-components/basics/1b_e2e_registered_components/score.yml
@@ -11,7 +11,7 @@ inputs:
 outputs:
   score_output:
     type: uri_folder
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 code: ./score_src
 command: >-
   python score.py 

diff --git a/cli/jobs/pipelines-with-components/basics/1b_e2e_registered_components/train.yml b/cli/jobs/pipelines-with-components/basics/1b_e2e_registered_components/train.yml
@@ -25,7 +25,7 @@ outputs:
   model_output:
     type: uri_folder
 code: ./train_src
-environment: azureml://registries/azureml/environments/sklearn-1.0/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-with-components/basics/5b_env_registered/component.yml b/cli/jobs/pipelines-with-components/basics/5b_env_registered/component.yml
@@ -7,7 +7,7 @@ version: 3
 
 code: ./src
 
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 
 command: >-
   python hello.py
diff --git a/cli/jobs/pipelines-with-components/nyc_taxi_data_regression/predict.yml b/cli/jobs/pipelines-with-components/nyc_taxi_data_regression/predict.yml
@@ -12,7 +12,7 @@ inputs:
 outputs:
   predictions:
     type: uri_folder
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 code: ./predict_src
 command: >-
   python predict.py 

diff --git a/cli/jobs/pipelines-with-components/nyc_taxi_data_regression/prep.yml b/cli/jobs/pipelines-with-components/nyc_taxi_data_regression/prep.yml
@@ -11,7 +11,7 @@ outputs:
   prep_data:
     type: uri_folder
 code: ./prep_src
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python prep.py 
   --raw_data ${{inputs.raw_data}} 

diff --git a/cli/jobs/pipelines-with-components/nyc_taxi_data_regression/score.yml b/cli/jobs/pipelines-with-components/nyc_taxi_data_regression/score.yml
@@ -12,7 +12,7 @@ inputs:
 outputs:
   score_report:
     type: uri_folder
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 code: ./score_src
 command: >-
   python score.py 

diff --git a/cli/jobs/pipelines-with-components/nyc_taxi_data_regression/train.yml b/cli/jobs/pipelines-with-components/nyc_taxi_data_regression/train.yml
@@ -18,7 +18,7 @@ outputs:
   test_data:
     type: uri_folder
 code: ./train_src
-environment: azureml://registries/azureml/environments/sklearn-1.0/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-with-components/nyc_taxi_data_regression/transform.yml b/cli/jobs/pipelines-with-components/nyc_taxi_data_regression/transform.yml
@@ -11,7 +11,7 @@ outputs:
   transformed_data:
     type: uri_folder
 code: ./transform_src
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python transform.py 
   --clean_data ${{inputs.clean_data}} 

diff --git a/cli/jobs/pipelines-with-components/pipeline_with_hyperparameter_sweep/predict.yml b/cli/jobs/pipelines-with-components/pipeline_with_hyperparameter_sweep/predict.yml
@@ -13,7 +13,7 @@ outputs:
   predict_result:
     type: uri_folder
 code: ./predict-src
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python predict.py 
   --model ${{inputs.model}} 

diff --git a/cli/jobs/pipelines-with-components/pipeline_with_hyperparameter_sweep/train.yml b/cli/jobs/pipelines-with-components/pipeline_with_hyperparameter_sweep/train.yml
@@ -59,7 +59,7 @@ outputs:
 
 code: ./train-src
 
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 
 command: >-
   python train.py 

diff --git a/...omponent/nyc_taxi_data_regression_with_pipeline_component/data_pipeline/prep_src/prep.yml b/...omponent/nyc_taxi_data_regression_with_pipeline_component/data_pipeline/prep_src/prep.yml
@@ -12,7 +12,7 @@ outputs:
   prep_data:
     type: uri_folder
 code: .
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python prep.py 
   $[[--raw_data ${{inputs.raw_data}}]]

diff --git a/...yc_taxi_data_regression_with_pipeline_component/data_pipeline/transform_src/transform.yml b/...yc_taxi_data_regression_with_pipeline_component/data_pipeline/transform_src/transform.yml
@@ -11,7 +11,7 @@ outputs:
   transformed_data:
     type: uri_folder
 code: .
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python transform.py 
   --clean_data ${{inputs.clean_data}} 

diff --git a/...t/nyc_taxi_data_regression_with_pipeline_component/train_pipeline/predict_src/predict.yml b/...t/nyc_taxi_data_regression_with_pipeline_component/train_pipeline/predict_src/predict.yml
@@ -12,7 +12,7 @@ inputs:
 outputs:
   predictions:
     type: uri_folder
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 code: .
 command: >-
   python predict.py 

diff --git a/...onent/nyc_taxi_data_regression_with_pipeline_component/train_pipeline/score_src/score.yml b/...onent/nyc_taxi_data_regression_with_pipeline_component/train_pipeline/score_src/score.yml
@@ -12,7 +12,7 @@ inputs:
 outputs:
   score_report:
     type: uri_folder
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 code: .
 command: >-
   python score.py 

diff --git a/...onent/nyc_taxi_data_regression_with_pipeline_component/train_pipeline/train_src/train.yml b/...onent/nyc_taxi_data_regression_with_pipeline_component/train_pipeline/train_src/train.yml
@@ -18,7 +18,7 @@ outputs:
   test_data:
     type: uri_folder
 code: .
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python train.py 
   --train_data ${{inputs.train_data}} 

diff --git a/...utoml-classification-task-bankmarketing-pipeline/components/component_register_model.yaml b/...utoml-classification-task-bankmarketing-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/...toml/cli-automl-regression-housepricing-pipeline/components/component_register_model.yaml b/...toml/cli-automl-regression-housepricing-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/...ication-multilabel-paper-categorization-pipeline/components/component_register_model.yaml b/...ication-multilabel-paper-categorization-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/...li-automl-text-classification-newsgroup-pipeline/components/component_register_model.yaml b/...li-automl-text-classification-newsgroup-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/...elines/automl/cli-automl-text-ner-conll-pipeline/components/component_register_model.yaml b/...elines/automl/cli-automl-text-ner-conll-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/cli/jobs/pipelines/automl/demand-forecast-pipeline/components/component_register_model.yaml b/cli/jobs/pipelines/automl/demand-forecast-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/...instance-segmentation-task-fridge-items-pipeline/components/component_register_model.yaml b/...instance-segmentation-task-fridge-items-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/...-multiclass-classification-fridge-items-pipeline/components/component_register_model.yaml b/...-multiclass-classification-fridge-items-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/...-multilabel-classification-fridge-items-pipeline/components/component_register_model.yaml b/...-multilabel-classification-fridge-items-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/...mage-object-detection-task-fridge-items-pipeline/components/component_register_model.yaml b/...mage-object-detection-task-fridge-items-pipeline/components/component_register_model.yaml
@@ -9,7 +9,7 @@ inputs:
   model_base_name:
     type: string
 code: ./src/
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 command: >-
   python register.py
   --model_input_path ${{inputs.model_input_path}}

diff --git a/cli/jobs/pipelines/mnist-batch-identification-using-parallel/pipeline.yml b/cli/jobs/pipelines/mnist-batch-identification-using-parallel/pipeline.yml
@@ -73,4 +73,4 @@ jobs:
       inference_result: ${{parent.jobs.predict_digits_mnist.outputs.job_output_file}}
     command: >-
       cat ${{inputs.inference_result}}
-    environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+    environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
diff --git a/cli/jobs/pipelines/nyc-taxi/pipeline.yml b/cli/jobs/pipelines/nyc-taxi/pipeline.yml
@@ -17,7 +17,7 @@ jobs:
       prep_data: 
         mode: upload
     code: src/prep
-    environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+    environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
     compute: azureml:cpu-cluster
     command: >-
       python prep.py 
@@ -32,7 +32,7 @@ jobs:
       transformed_data:
         mode: upload
     code: src/transform
-    environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+    environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
     compute: azureml:cpu-cluster
     command: >-
       python transform.py 
@@ -48,7 +48,7 @@ jobs:
       test_data: 
         mode: upload
     code: src/train
-    environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+    environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
     compute: azureml:cpu-cluster
     command: >-
       python train.py 
@@ -64,7 +64,7 @@ jobs:
     outputs:
       predictions: 
     code: src/predict
-    environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+    environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
     compute: azureml:cpu-cluster
     command: >-
       python predict.py 
@@ -80,7 +80,7 @@ jobs:
     outputs:
       score_report: 
     code: src/score
-    environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+    environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
     compute: azureml:cpu-cluster
     command: >-      
       python score.py 

diff --git a/cli/jobs/single-step/pytorch/iris/job.yml b/cli/jobs/single-step/pytorch/iris/job.yml
@@ -12,7 +12,7 @@ inputs:
     path: https://azuremlexamples.blob.core.windows.net/datasets/iris.csv
   epochs: 10
   lr: 0.1
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 compute: azureml:cpu-cluster
 display_name: pytorch-iris-example
 experiment_name: pytorch-iris-example

diff --git a/cli/jobs/single-step/scikit-learn/diabetes/job.yml b/cli/jobs/single-step/scikit-learn/diabetes/job.yml
@@ -7,7 +7,7 @@ inputs:
   diabetes_csv: 
     type: uri_file
     path: https://azuremlexamples.blob.core.windows.net/datasets/diabetes.csv
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 compute: azureml:cpu-cluster
 display_name: sklearn-diabetes-example
 experiment_name: sklearn-diabetes-example

diff --git a/cli/jobs/single-step/scikit-learn/diabetes/src/main.py b/cli/jobs/single-step/scikit-learn/diabetes/src/main.py
@@ -17,7 +17,6 @@ def main(args):
     # setup parameters
     params = {
         "fit_intercept": args.fit_intercept,
-        "normalize": args.normalize,
         "positive": args.positive,
     }
 

diff --git a/cli/jobs/single-step/scikit-learn/iris/job.yml b/cli/jobs/single-step/scikit-learn/iris/job.yml
@@ -13,7 +13,7 @@ inputs:
   C: 0.8
   kernel: "rbf"
   coef0: 0.1
-environment: azureml://registries/azureml/environments/sklearn-1.0/labels/latest
+environment: azureml://registries/azureml/environments/sklearn-1.5/labels/latest
 compute: azureml:cpu-cluster
 display_name: sklearn-iris-example
 experiment_name: sklearn-iris-example