Compare commits

..

6 Commits

Author SHA1 Message Date
amlrelsa-ms
bd629ae454 update samples from Release-166 as a part of SDK release 2022-10-26 18:46:34 +00:00
Harneet Virk
41de75a584 Merge pull request #1846 from Azure/release_update_stablev2/Release-156
update samples from Release-156 as a part of 1.47.0 SDK stable release
2022-10-25 21:01:03 -07:00
amlrelsa-ms
96a426dc36 update samples from Release-156 as a part of 1.47.0 SDK stable release 2022-10-25 21:28:24 +00:00
Harneet Virk
824dd40f7e Merge pull request #1836 from Azure/release_update/Release-165
update samples from Release-165 as a part of  SDK release
2022-10-11 13:07:26 -07:00
amlrelsa-ms
fa2e649fe8 update samples from Release-165 as a part of SDK release 2022-10-11 19:33:50 +00:00
Harneet Virk
e25e8e3a41 Merge pull request #1832 from Azure/release_update/Release-164
update samples from Release-164 as a part of  SDK release
2022-10-05 11:29:47 -07:00
24 changed files with 51 additions and 50 deletions

View File

@@ -103,7 +103,7 @@
"source": [ "source": [
"import azureml.core\n", "import azureml.core\n",
"\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\")" "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")"
] ]
}, },

View File

@@ -10,12 +10,11 @@ dependencies:
- python>=3.6,<3.9 - python>=3.6,<3.9
- matplotlib==3.2.1 - matplotlib==3.2.1
- py-xgboost==1.3.3 - py-xgboost==1.3.3
- pytorch::pytorch=1.4.0 - pytorch::pytorch=1.11.0
- conda-forge::fbprophet==0.7.1 - conda-forge::fbprophet==0.7.1
- cudatoolkit=10.1.243 - cudatoolkit=10.1.243
- scipy==1.5.3 - scipy==1.5.3
- notebook - notebook
- pywin32==227
- PySocks==1.7.1 - PySocks==1.7.1
- conda-forge::pyqt==5.12.3 - conda-forge::pyqt==5.12.3
- jinja2<=2.11.2 - jinja2<=2.11.2
@@ -25,12 +24,12 @@ dependencies:
- pip: - pip:
# Required packages for AzureML execution, history, and data preparation. # Required packages for AzureML execution, history, and data preparation.
- azureml-widgets~=1.46.0 - azureml-widgets~=1.47.0
- azureml-defaults~=1.46.0 - azureml-defaults~=1.47.0
- pytorch-transformers==1.0.0 - pytorch-transformers==1.0.0
- spacy==2.2.4 - spacy==2.2.4
- pystan==2.19.1.1 - pystan==2.19.1.1
- https://aka.ms/automl-resources/packages/en_core_web_sm-2.1.0.tar.gz - 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 - arch==4.14
- wasabi==0.9.1 - wasabi==0.9.1

View File

@@ -6,10 +6,8 @@ channels:
dependencies: dependencies:
# The python interpreter version. # The python interpreter version.
# Currently Azure ML only supports 3.6.0 and later. # Currently Azure ML only supports 3.6.0 and later.
- pip==20.2.4 - pip==20.1.1
- python>=3.6,<3.9 - python>=3.6,<3.9
- boto3==1.20.19
- botocore<=1.23.19
- matplotlib==3.2.1 - matplotlib==3.2.1
- numpy>=1.21.6,<=1.22.3 - numpy>=1.21.6,<=1.22.3
- cython==0.29.14 - cython==0.29.14
@@ -19,19 +17,19 @@ dependencies:
- py-xgboost<=1.3.3 - py-xgboost<=1.3.3
- holidays==0.10.3 - holidays==0.10.3
- conda-forge::fbprophet==0.7.1 - conda-forge::fbprophet==0.7.1
- pytorch::pytorch=1.4.0 - pytorch::pytorch=1.11.0
- cudatoolkit=10.1.243 - cudatoolkit=10.1.243
- notebook
- jinja2<=2.11.2 - jinja2<=2.11.2
- markupsafe<2.1.0 - markupsafe<2.1.0
- jsonschema==4.15.0
- pip: - pip:
# Required packages for AzureML execution, history, and data preparation. # Required packages for AzureML execution, history, and data preparation.
- azureml-widgets~=1.46.0 - azureml-widgets~=1.47.0
- azureml-defaults~=1.46.0 - azureml-defaults~=1.47.0
- pytorch-transformers==1.0.0 - pytorch-transformers==1.0.0
- spacy==2.2.4 - spacy==2.2.4
- pystan==2.19.1.1 - pystan==2.19.1.1
- https://aka.ms/automl-resources/packages/en_core_web_sm-2.1.0.tar.gz - 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 - arch==4.14

View File

@@ -6,11 +6,8 @@ channels:
dependencies: dependencies:
# The python interpreter version. # The python interpreter version.
# Currently Azure ML only supports 3.6.0 and later. # Currently Azure ML only supports 3.6.0 and later.
- pip==20.2.4 - pip==20.1.1
- nomkl
- python>=3.6,<3.9 - python>=3.6,<3.9
- boto3==1.20.19
- botocore<=1.23.19
- matplotlib==3.2.1 - matplotlib==3.2.1
- numpy>=1.21.6,<=1.22.3 - numpy>=1.21.6,<=1.22.3
- cython==0.29.14 - cython==0.29.14
@@ -20,19 +17,19 @@ dependencies:
- py-xgboost<=1.3.3 - py-xgboost<=1.3.3
- holidays==0.10.3 - holidays==0.10.3
- conda-forge::fbprophet==0.7.1 - conda-forge::fbprophet==0.7.1
- pytorch::pytorch=1.4.0 - pytorch::pytorch=1.11.0
- cudatoolkit=9.0 - cudatoolkit=9.0
- notebook
- jinja2<=2.11.2 - jinja2<=2.11.2
- markupsafe<2.1.0 - markupsafe<2.1.0
- jsonschema==4.15.0
- pip: - pip:
# Required packages for AzureML execution, history, and data preparation. # Required packages for AzureML execution, history, and data preparation.
- azureml-widgets~=1.46.0 - azureml-widgets~=1.47.0
- azureml-defaults~=1.46.0 - azureml-defaults~=1.47.0
- pytorch-transformers==1.0.0 - pytorch-transformers==1.0.0
- spacy==2.2.4 - spacy==2.2.4
- pystan==2.19.1.1 - pystan==2.19.1.1
- https://aka.ms/automl-resources/packages/en_core_web_sm-2.1.0.tar.gz - 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 - arch==4.14

View File

@@ -33,6 +33,8 @@ if not errorlevel 1 (
call conda env create -f %automl_env_file% -n %conda_env_name% 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: call conda activate %conda_env_name% 2>nul:
if errorlevel 1 goto ErrorExit if errorlevel 1 goto ErrorExit

View File

@@ -1,4 +1,4 @@
from distutils.version import LooseVersion from setuptools._vendor.packaging import version
import platform import platform
try: try:
@@ -17,7 +17,7 @@ if architecture != "64bit":
minimumVersion = "4.7.8" minimumVersion = "4.7.8"
versionInvalid = (LooseVersion(conda.__version__) < LooseVersion(minimumVersion)) versionInvalid = (version.parse(conda.__version__) < version.parse(minimumVersion))
if versionInvalid: if versionInvalid:
print('Setup requires conda version ' + minimumVersion + ' or higher.') print('Setup requires conda version ' + minimumVersion + ' or higher.')

View File

@@ -97,7 +97,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "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\")" "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")"
] ]
}, },

View File

@@ -97,7 +97,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "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\")" "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")"
] ]
}, },

View File

@@ -9,7 +9,6 @@ dependencies:
- PyJWT < 2.0.0 - PyJWT < 2.0.0
- numpy==1.22.3 - numpy==1.22.3
- pywin32==227 - pywin32==227
- cryptography<37.0.0
- pip: - pip:
# Required packages for AzureML execution, history, and data preparation. # Required packages for AzureML execution, history, and data preparation.

View File

@@ -11,7 +11,6 @@ dependencies:
- urllib3==1.26.7 - urllib3==1.26.7
- PyJWT < 2.0.0 - PyJWT < 2.0.0
- numpy>=1.21.6,<=1.22.3 - numpy>=1.21.6,<=1.22.3
- cryptography<37.0.0
- pip: - pip:
# Required packages for AzureML execution, history, and data preparation. # Required packages for AzureML execution, history, and data preparation.

View File

@@ -92,7 +92,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "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\")" "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")"
] ]
}, },

View File

@@ -91,7 +91,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "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\")" "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")"
] ]
}, },

View File

@@ -406,7 +406,7 @@
" compute_target=compute_target,\n", " compute_target=compute_target,\n",
" node_count=2,\n", " node_count=2,\n",
" process_count_per_node=2,\n", " process_count_per_node=2,\n",
" run_invocation_timeout=920,\n", " run_invocation_timeout=1200,\n",
" train_pipeline_parameters=mm_paramters,\n", " train_pipeline_parameters=mm_paramters,\n",
")" ")"
] ]

View File

@@ -365,6 +365,7 @@
" node_count=2,\n", " node_count=2,\n",
" process_count_per_node=8,\n", " process_count_per_node=8,\n",
" train_pipeline_parameters=hts_parameters,\n", " train_pipeline_parameters=hts_parameters,\n",
" run_invocation_timeout=3900,\n",
")" ")"
] ]
}, },
@@ -634,7 +635,12 @@
"name": "python", "name": "python",
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.6.8" "version": "3.7.13"
},
"vscode": {
"interpreter": {
"hash": "6db9c8d9f0cce2d9127e384e15560d42c3b661994c9f717d0553d1d8985ab1ea"
}
} }
}, },
"nbformat": 4, "nbformat": 4,

View File

@@ -517,7 +517,7 @@
" compute_target=compute_target,\n", " compute_target=compute_target,\n",
" node_count=2,\n", " node_count=2,\n",
" process_count_per_node=8,\n", " process_count_per_node=8,\n",
" run_invocation_timeout=920,\n", " run_invocation_timeout=1200,\n",
" train_pipeline_parameters=mm_paramters,\n", " train_pipeline_parameters=mm_paramters,\n",
")" ")"
] ]

View File

@@ -106,7 +106,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "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\")" "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")"
] ]
}, },
@@ -241,6 +241,8 @@
"for dist in list(available_packages):\n", "for dist in list(available_packages):\n",
" if dist.key == 'pandas':\n", " if dist.key == 'pandas':\n",
" pandas_ver = dist.version\n", " pandas_ver = dist.version\n",
" if dist.key == 'numpy':\n",
" numpy_ver = dist.version\n",
"pandas_dep = 'pandas'\n", "pandas_dep = 'pandas'\n",
"numpy_dep = 'numpy'\n", "numpy_dep = 'numpy'\n",
"if pandas_ver:\n", "if pandas_ver:\n",
@@ -286,7 +288,7 @@
"pip uninstall -y xgboost && \\\n", "pip uninstall -y xgboost && \\\n",
"conda install py-xgboost==1.3.3 && \\\n", "conda install py-xgboost==1.3.3 && \\\n",
"pip uninstall -y numpy && \\\n", "pip uninstall -y numpy && \\\n",
"conda install {numpy_dep} \\\n", "pip install {numpy_dep} \\\n",
"\"\"\"\n", "\"\"\"\n",
"\n", "\n",
"env.python.user_managed_dependencies = True\n", "env.python.user_managed_dependencies = True\n",

View File

@@ -166,7 +166,7 @@ def download_data():
from zipfile import ZipFile from zipfile import ZipFile
# download data # download data
data_file = './fowl_data.zip' data_file = './fowl_data.zip'
download_url = 'https://azureopendatastorage.blob.core.windows.net/testpublic/temp/fowl_data.zip' download_url = 'https://azuremlexamples.blob.core.windows.net/datasets/fowl_data.zip'
urllib.request.urlretrieve(download_url, filename=data_file) urllib.request.urlretrieve(download_url, filename=data_file)
# extract files # extract files

View File

@@ -176,7 +176,7 @@
"metadata": {}, "metadata": {},
"source": [ "source": [
"### Download training data\n", "### Download training data\n",
"The dataset we will use (located on a public blob [here](https://azureopendatastorage.blob.core.windows.net/testpublic/temp/fowl_data.zip) as a zip file) consists of about 120 training images each for turkeys and chickens, with 100 validation images for each class. The images are a subset of the [Open Images v5 Dataset](https://storage.googleapis.com/openimages/web/index.html). We will download and extract the dataset as part of our training script `pytorch_train.py`" "The dataset we will use (located on a public blob [here](https://azuremlexamples.blob.core.windows.net/datasets/fowl_data.zip) as a zip file) consists of about 120 training images each for turkeys and chickens, with 100 validation images for each class. The images are a subset of the [Open Images v5 Dataset](https://storage.googleapis.com/openimages/web/index.html). We will download and extract the dataset as part of our training script `pytorch_train.py`"
] ]
}, },
{ {
@@ -260,15 +260,14 @@
"\n", "\n",
"channels:\n", "channels:\n",
"- conda-forge\n", "- conda-forge\n",
"- pytorch\n",
"dependencies:\n", "dependencies:\n",
"- python=3.6.2\n", "- python=3.8.12\n",
"- pip=21.3.1\n", "- pip=21.3.1\n",
"- pytorch::pytorch==1.8.1\n",
"- pytorch::torchvision==0.9.1\n",
"- pip:\n", "- pip:\n",
" - azureml-defaults==1.43.0\n", " - azureml-defaults"
" - torch==1.6.0\n",
" - torchvision==0.7.0\n",
" - future==0.17.1\n",
" - pillow"
] ]
}, },
{ {

View File

@@ -160,7 +160,7 @@
"source": [ "source": [
"from azureml.core import Dataset\n", "from azureml.core import Dataset\n",
"\n", "\n",
"web_paths = ['https://azureopendatastorage.blob.core.windows.net/testpublic/text8.zip']\n", "web_paths = ['https://azuremlexamples.blob.core.windows.net/datasets/text8.zip']\n",
"dataset = Dataset.File.from_files(path=web_paths)" "dataset = Dataset.File.from_files(path=web_paths)"
] ]
}, },

View File

@@ -101,7 +101,7 @@
"\n", "\n",
"# Check core SDK version number\n", "# Check core SDK version number\n",
"\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)"
] ]
}, },
{ {

View File

@@ -139,7 +139,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"with open('./train.py', 'r') as f:\n", "with open('./scripts/train.py', 'r') as f:\n",
" print(f.read())" " print(f.read())"
] ]
}, },
@@ -149,7 +149,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"with open('./mylib.py', 'r') as f:\n", "with open('./scripts/mylib.py', 'r') as f:\n",
" print(f.read())" " print(f.read())"
] ]
}, },
@@ -203,7 +203,7 @@
"source": [ "source": [
"from azureml.core import ScriptRunConfig\n", "from azureml.core import ScriptRunConfig\n",
"\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)"
] ]
}, },
{ {

View File

@@ -102,7 +102,7 @@
"source": [ "source": [
"import azureml.core\n", "import azureml.core\n",
"\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\")" "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")"
] ]
}, },