From 96a426dc36fb7682d37193a5dd0b2c40ece104e6 Mon Sep 17 00:00:00 2001 From: amlrelsa-ms Date: Tue, 25 Oct 2022 21:28:24 +0000 Subject: [PATCH] update samples from Release-156 as a part of 1.47.0 SDK stable release --- configuration.ipynb | 2 +- .../automated-machine-learning/automl_env.yml | 9 ++++----- .../automl_env_linux.yml | 14 ++++++-------- .../automated-machine-learning/automl_env_mac.yml | 15 ++++++--------- .../automated-machine-learning/automl_setup.cmd | 2 ++ .../check_conda_version.py | 4 ++-- .../codegen-for-autofeaturization.ipynb | 2 +- ...odel-training-from-autofeaturization-run.ipynb | 2 +- ...fication-credit-card-fraud-local-managed.ipynb | 2 +- .../auto-ml-regression-model-proxy.ipynb | 2 +- ...auto-ml-forecasting-backtest-many-models.ipynb | 2 +- ...o-ml-forecasting-hierarchical-timeseries.ipynb | 8 +++++++- .../auto-ml-forecasting-many-models.ipynb | 2 +- .../train-explain-model-gpu-tree-explainer.ipynb | 2 +- .../logging-api/logging-api.ipynb | 2 +- .../train-on-local/{ => scripts}/mylib.py | 0 .../train-on-local/{ => scripts}/train.py | 0 .../training/train-on-local/train-on-local.ipynb | 6 +++--- setup-environment/configuration.ipynb | 2 +- 19 files changed, 40 insertions(+), 38 deletions(-) rename how-to-use-azureml/training/train-on-local/{ => scripts}/mylib.py (100%) rename how-to-use-azureml/training/train-on-local/{ => scripts}/train.py (100%) diff --git a/configuration.ipynb b/configuration.ipynb index 4152578c..30e6c0a5 100644 --- a/configuration.ipynb +++ b/configuration.ipynb @@ -103,7 +103,7 @@ "source": [ "import azureml.core\n", "\n", - "print(\"This notebook was created using version 1.46.0 of the Azure ML SDK\")\n", + "print(\"This notebook was created using version 1.47.0 of the Azure ML SDK\")\n", "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")" ] }, diff --git a/how-to-use-azureml/automated-machine-learning/automl_env.yml b/how-to-use-azureml/automated-machine-learning/automl_env.yml index 7b911227..90612a7f 100644 --- a/how-to-use-azureml/automated-machine-learning/automl_env.yml +++ b/how-to-use-azureml/automated-machine-learning/automl_env.yml @@ -10,12 +10,11 @@ dependencies: - python>=3.6,<3.9 - matplotlib==3.2.1 - py-xgboost==1.3.3 -- pytorch::pytorch=1.4.0 +- pytorch::pytorch=1.11.0 - conda-forge::fbprophet==0.7.1 - cudatoolkit=10.1.243 - scipy==1.5.3 - notebook -- pywin32==227 - PySocks==1.7.1 - conda-forge::pyqt==5.12.3 - jinja2<=2.11.2 @@ -25,12 +24,12 @@ dependencies: - pip: # Required packages for AzureML execution, history, and data preparation. - - azureml-widgets~=1.46.0 - - azureml-defaults~=1.46.0 + - azureml-widgets~=1.47.0 + - azureml-defaults~=1.47.0 - pytorch-transformers==1.0.0 - spacy==2.2.4 - pystan==2.19.1.1 - https://aka.ms/automl-resources/packages/en_core_web_sm-2.1.0.tar.gz - - -r https://automlsdkdataresources.blob.core.windows.net/validated-requirements/1.46.0/validated_win32_requirements.txt [--no-deps] + - -r https://automlsdkdataresources.blob.core.windows.net/validated-requirements/1.47.0/validated_win32_requirements.txt [--no-deps] - arch==4.14 - wasabi==0.9.1 diff --git a/how-to-use-azureml/automated-machine-learning/automl_env_linux.yml b/how-to-use-azureml/automated-machine-learning/automl_env_linux.yml index ded19faf..b9704a70 100644 --- a/how-to-use-azureml/automated-machine-learning/automl_env_linux.yml +++ b/how-to-use-azureml/automated-machine-learning/automl_env_linux.yml @@ -6,10 +6,8 @@ channels: dependencies: # The python interpreter version. # Currently Azure ML only supports 3.6.0 and later. -- pip==20.2.4 +- pip==20.1.1 - python>=3.6,<3.9 -- boto3==1.20.19 -- botocore<=1.23.19 - matplotlib==3.2.1 - numpy>=1.21.6,<=1.22.3 - cython==0.29.14 @@ -19,19 +17,19 @@ dependencies: - py-xgboost<=1.3.3 - holidays==0.10.3 - conda-forge::fbprophet==0.7.1 -- pytorch::pytorch=1.4.0 +- pytorch::pytorch=1.11.0 - cudatoolkit=10.1.243 +- notebook - jinja2<=2.11.2 - markupsafe<2.1.0 -- jsonschema==4.15.0 - pip: # Required packages for AzureML execution, history, and data preparation. - - azureml-widgets~=1.46.0 - - azureml-defaults~=1.46.0 + - azureml-widgets~=1.47.0 + - azureml-defaults~=1.47.0 - pytorch-transformers==1.0.0 - spacy==2.2.4 - pystan==2.19.1.1 - https://aka.ms/automl-resources/packages/en_core_web_sm-2.1.0.tar.gz - - -r https://automlsdkdataresources.blob.core.windows.net/validated-requirements/1.46.0/validated_linux_requirements.txt [--no-deps] + - -r https://automlsdkdataresources.blob.core.windows.net/validated-requirements/1.47.0/validated_linux_requirements.txt [--no-deps] - arch==4.14 diff --git a/how-to-use-azureml/automated-machine-learning/automl_env_mac.yml b/how-to-use-azureml/automated-machine-learning/automl_env_mac.yml index 205f3150..c7e455e5 100644 --- a/how-to-use-azureml/automated-machine-learning/automl_env_mac.yml +++ b/how-to-use-azureml/automated-machine-learning/automl_env_mac.yml @@ -6,11 +6,8 @@ channels: dependencies: # The python interpreter version. # Currently Azure ML only supports 3.6.0 and later. -- pip==20.2.4 -- nomkl +- pip==20.1.1 - python>=3.6,<3.9 -- boto3==1.20.19 -- botocore<=1.23.19 - matplotlib==3.2.1 - numpy>=1.21.6,<=1.22.3 - cython==0.29.14 @@ -20,19 +17,19 @@ dependencies: - py-xgboost<=1.3.3 - holidays==0.10.3 - conda-forge::fbprophet==0.7.1 -- pytorch::pytorch=1.4.0 +- pytorch::pytorch=1.11.0 - cudatoolkit=9.0 +- notebook - jinja2<=2.11.2 - markupsafe<2.1.0 -- jsonschema==4.15.0 - pip: # Required packages for AzureML execution, history, and data preparation. - - azureml-widgets~=1.46.0 - - azureml-defaults~=1.46.0 + - azureml-widgets~=1.47.0 + - azureml-defaults~=1.47.0 - pytorch-transformers==1.0.0 - spacy==2.2.4 - pystan==2.19.1.1 - https://aka.ms/automl-resources/packages/en_core_web_sm-2.1.0.tar.gz - - -r https://automlsdkdataresources.blob.core.windows.net/validated-requirements/1.46.0/validated_darwin_requirements.txt [--no-deps] + - -r https://automlsdkdataresources.blob.core.windows.net/validated-requirements/1.47.0/validated_darwin_requirements.txt [--no-deps] - arch==4.14 diff --git a/how-to-use-azureml/automated-machine-learning/automl_setup.cmd b/how-to-use-azureml/automated-machine-learning/automl_setup.cmd index 3f188e3f..9aeb7022 100644 --- a/how-to-use-azureml/automated-machine-learning/automl_setup.cmd +++ b/how-to-use-azureml/automated-machine-learning/automl_setup.cmd @@ -33,6 +33,8 @@ if not errorlevel 1 ( call conda env create -f %automl_env_file% -n %conda_env_name% ) +python "%conda_prefix%\scripts\pywin32_postinstall.py" -install + call conda activate %conda_env_name% 2>nul: if errorlevel 1 goto ErrorExit diff --git a/how-to-use-azureml/automated-machine-learning/check_conda_version.py b/how-to-use-azureml/automated-machine-learning/check_conda_version.py index 691ea908..4b634d63 100644 --- a/how-to-use-azureml/automated-machine-learning/check_conda_version.py +++ b/how-to-use-azureml/automated-machine-learning/check_conda_version.py @@ -1,4 +1,4 @@ -from distutils.version import LooseVersion +from setuptools._vendor.packaging import version import platform try: @@ -17,7 +17,7 @@ if architecture != "64bit": minimumVersion = "4.7.8" -versionInvalid = (LooseVersion(conda.__version__) < LooseVersion(minimumVersion)) +versionInvalid = (version.parse(conda.__version__) < version.parse(minimumVersion)) if versionInvalid: print('Setup requires conda version ' + minimumVersion + ' or higher.') diff --git a/how-to-use-azureml/automated-machine-learning/experimental/autofeaturization-codegen/codegen-for-autofeaturization.ipynb b/how-to-use-azureml/automated-machine-learning/experimental/autofeaturization-codegen/codegen-for-autofeaturization.ipynb index 11b807a6..e7abc0f5 100644 --- a/how-to-use-azureml/automated-machine-learning/experimental/autofeaturization-codegen/codegen-for-autofeaturization.ipynb +++ b/how-to-use-azureml/automated-machine-learning/experimental/autofeaturization-codegen/codegen-for-autofeaturization.ipynb @@ -97,7 +97,7 @@ "metadata": {}, "outputs": [], "source": [ - "print(\"This notebook was created using version 1.46.0 of the Azure ML SDK\")\n", + "print(\"This notebook was created using version 1.47.0 of the Azure ML SDK\")\n", "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")" ] }, diff --git a/how-to-use-azureml/automated-machine-learning/experimental/autofeaturization-custom-model-training/custom-model-training-from-autofeaturization-run.ipynb b/how-to-use-azureml/automated-machine-learning/experimental/autofeaturization-custom-model-training/custom-model-training-from-autofeaturization-run.ipynb index 5ac3e430..6d6daf48 100644 --- a/how-to-use-azureml/automated-machine-learning/experimental/autofeaturization-custom-model-training/custom-model-training-from-autofeaturization-run.ipynb +++ b/how-to-use-azureml/automated-machine-learning/experimental/autofeaturization-custom-model-training/custom-model-training-from-autofeaturization-run.ipynb @@ -97,7 +97,7 @@ "metadata": {}, "outputs": [], "source": [ - "print(\"This notebook was created using version 1.46.0 of the Azure ML SDK\")\n", + "print(\"This notebook was created using version 1.47.0 of the Azure ML SDK\")\n", "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")" ] }, diff --git a/how-to-use-azureml/automated-machine-learning/experimental/classification-credit-card-fraud-local-managed/auto-ml-classification-credit-card-fraud-local-managed.ipynb b/how-to-use-azureml/automated-machine-learning/experimental/classification-credit-card-fraud-local-managed/auto-ml-classification-credit-card-fraud-local-managed.ipynb index 2344885c..6550729d 100644 --- a/how-to-use-azureml/automated-machine-learning/experimental/classification-credit-card-fraud-local-managed/auto-ml-classification-credit-card-fraud-local-managed.ipynb +++ b/how-to-use-azureml/automated-machine-learning/experimental/classification-credit-card-fraud-local-managed/auto-ml-classification-credit-card-fraud-local-managed.ipynb @@ -92,7 +92,7 @@ "metadata": {}, "outputs": [], "source": [ - "print(\"This notebook was created using version 1.46.0 of the Azure ML SDK\")\n", + "print(\"This notebook was created using version 1.47.0 of the Azure ML SDK\")\n", "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")" ] }, diff --git a/how-to-use-azureml/automated-machine-learning/experimental/regression-model-proxy/auto-ml-regression-model-proxy.ipynb b/how-to-use-azureml/automated-machine-learning/experimental/regression-model-proxy/auto-ml-regression-model-proxy.ipynb index 91bc487d..564c163c 100644 --- a/how-to-use-azureml/automated-machine-learning/experimental/regression-model-proxy/auto-ml-regression-model-proxy.ipynb +++ b/how-to-use-azureml/automated-machine-learning/experimental/regression-model-proxy/auto-ml-regression-model-proxy.ipynb @@ -91,7 +91,7 @@ "metadata": {}, "outputs": [], "source": [ - "print(\"This notebook was created using version 1.46.0 of the Azure ML SDK\")\n", + "print(\"This notebook was created using version 1.47.0 of the Azure ML SDK\")\n", "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")" ] }, diff --git a/how-to-use-azureml/automated-machine-learning/forecasting-backtest-many-models/auto-ml-forecasting-backtest-many-models.ipynb b/how-to-use-azureml/automated-machine-learning/forecasting-backtest-many-models/auto-ml-forecasting-backtest-many-models.ipynb index 355e2921..ebf2dfe9 100644 --- a/how-to-use-azureml/automated-machine-learning/forecasting-backtest-many-models/auto-ml-forecasting-backtest-many-models.ipynb +++ b/how-to-use-azureml/automated-machine-learning/forecasting-backtest-many-models/auto-ml-forecasting-backtest-many-models.ipynb @@ -406,7 +406,7 @@ " compute_target=compute_target,\n", " node_count=2,\n", " process_count_per_node=2,\n", - " run_invocation_timeout=920,\n", + " run_invocation_timeout=1200,\n", " train_pipeline_parameters=mm_paramters,\n", ")" ] diff --git a/how-to-use-azureml/automated-machine-learning/forecasting-hierarchical-timeseries/auto-ml-forecasting-hierarchical-timeseries.ipynb b/how-to-use-azureml/automated-machine-learning/forecasting-hierarchical-timeseries/auto-ml-forecasting-hierarchical-timeseries.ipynb index 303df879..230bcce2 100644 --- a/how-to-use-azureml/automated-machine-learning/forecasting-hierarchical-timeseries/auto-ml-forecasting-hierarchical-timeseries.ipynb +++ b/how-to-use-azureml/automated-machine-learning/forecasting-hierarchical-timeseries/auto-ml-forecasting-hierarchical-timeseries.ipynb @@ -365,6 +365,7 @@ " node_count=2,\n", " process_count_per_node=8,\n", " train_pipeline_parameters=hts_parameters,\n", + " run_invocation_timeout=3900,\n", ")" ] }, @@ -634,7 +635,12 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.8" + "version": "3.7.13" + }, + "vscode": { + "interpreter": { + "hash": "6db9c8d9f0cce2d9127e384e15560d42c3b661994c9f717d0553d1d8985ab1ea" + } } }, "nbformat": 4, diff --git a/how-to-use-azureml/automated-machine-learning/forecasting-many-models/auto-ml-forecasting-many-models.ipynb b/how-to-use-azureml/automated-machine-learning/forecasting-many-models/auto-ml-forecasting-many-models.ipynb index 5f2c16dc..ebb6b801 100644 --- a/how-to-use-azureml/automated-machine-learning/forecasting-many-models/auto-ml-forecasting-many-models.ipynb +++ b/how-to-use-azureml/automated-machine-learning/forecasting-many-models/auto-ml-forecasting-many-models.ipynb @@ -517,7 +517,7 @@ " compute_target=compute_target,\n", " node_count=2,\n", " process_count_per_node=8,\n", - " run_invocation_timeout=920,\n", + " run_invocation_timeout=1200,\n", " train_pipeline_parameters=mm_paramters,\n", ")" ] diff --git a/how-to-use-azureml/explain-model/azure-integration/gpu-explanation/train-explain-model-gpu-tree-explainer.ipynb b/how-to-use-azureml/explain-model/azure-integration/gpu-explanation/train-explain-model-gpu-tree-explainer.ipynb index 42bbf2fc..818c88c7 100644 --- a/how-to-use-azureml/explain-model/azure-integration/gpu-explanation/train-explain-model-gpu-tree-explainer.ipynb +++ b/how-to-use-azureml/explain-model/azure-integration/gpu-explanation/train-explain-model-gpu-tree-explainer.ipynb @@ -106,7 +106,7 @@ "metadata": {}, "outputs": [], "source": [ - "print(\"This notebook was created using version 1.46.0 of the Azure ML SDK\")\n", + "print(\"This notebook was created using version 1.47.0 of the Azure ML SDK\")\n", "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")" ] }, diff --git a/how-to-use-azureml/track-and-monitor-experiments/logging-api/logging-api.ipynb b/how-to-use-azureml/track-and-monitor-experiments/logging-api/logging-api.ipynb index 271569ea..9c4f8717 100644 --- a/how-to-use-azureml/track-and-monitor-experiments/logging-api/logging-api.ipynb +++ b/how-to-use-azureml/track-and-monitor-experiments/logging-api/logging-api.ipynb @@ -101,7 +101,7 @@ "\n", "# Check core SDK version number\n", "\n", - "print(\"This notebook was created using SDK version 1.46.0, you are currently running version\", azureml.core.VERSION)" + "print(\"This notebook was created using SDK version 1.47.0, you are currently running version\", azureml.core.VERSION)" ] }, { diff --git a/how-to-use-azureml/training/train-on-local/mylib.py b/how-to-use-azureml/training/train-on-local/scripts/mylib.py similarity index 100% rename from how-to-use-azureml/training/train-on-local/mylib.py rename to how-to-use-azureml/training/train-on-local/scripts/mylib.py diff --git a/how-to-use-azureml/training/train-on-local/train.py b/how-to-use-azureml/training/train-on-local/scripts/train.py similarity index 100% rename from how-to-use-azureml/training/train-on-local/train.py rename to how-to-use-azureml/training/train-on-local/scripts/train.py diff --git a/how-to-use-azureml/training/train-on-local/train-on-local.ipynb b/how-to-use-azureml/training/train-on-local/train-on-local.ipynb index 6a9d730e..4ab46459 100644 --- a/how-to-use-azureml/training/train-on-local/train-on-local.ipynb +++ b/how-to-use-azureml/training/train-on-local/train-on-local.ipynb @@ -139,7 +139,7 @@ "metadata": {}, "outputs": [], "source": [ - "with open('./train.py', 'r') as f:\n", + "with open('./scripts/train.py', 'r') as f:\n", " print(f.read())" ] }, @@ -149,7 +149,7 @@ "metadata": {}, "outputs": [], "source": [ - "with open('./mylib.py', 'r') as f:\n", + "with open('./scripts/mylib.py', 'r') as f:\n", " print(f.read())" ] }, @@ -203,7 +203,7 @@ "source": [ "from azureml.core import ScriptRunConfig\n", "\n", - "src = ScriptRunConfig(source_directory='./', script='train.py', environment=user_managed_env)" + "src = ScriptRunConfig(source_directory='./scripts', script='train.py', environment=user_managed_env)" ] }, { diff --git a/setup-environment/configuration.ipynb b/setup-environment/configuration.ipynb index bef5a8dd..cd4b4a57 100644 --- a/setup-environment/configuration.ipynb +++ b/setup-environment/configuration.ipynb @@ -102,7 +102,7 @@ "source": [ "import azureml.core\n", "\n", - "print(\"This notebook was created using version 1.46.0 of the Azure ML SDK\")\n", + "print(\"This notebook was created using version 1.47.0 of the Azure ML SDK\")\n", "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")" ] },