From 4df079db1c9fb7f7ba7827ac48f51bd722f5194f Mon Sep 17 00:00:00 2001 From: vizhur Date: Fri, 14 Feb 2020 02:01:41 +0000 Subject: [PATCH] update samples from Release-39 as a part of SDK release --- README.md | 2 +- configuration.ipynb | 2 +- .../automated-machine-learning/automl_env.yml | 1 + .../automated-machine-learning/automl_env_mac.yml | 1 + ...ipelines-with-automated-machine-learning-step.ipynb | 9 +++++++-- ...train-hyperparameter-tune-deploy-with-chainer.ipynb | 10 ++++------ ...in-hyperparameter-tune-deploy-with-tensorflow.ipynb | 10 ++++------ .../logging-api/logging-api.ipynb | 2 +- setup-environment/configuration.ipynb | 2 +- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 33d704d10..2add5721b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Read more detailed instructions on [how to set up your environment](./NBSETUP.md ## How to navigate and use the example notebooks? If you are using an Azure Machine Learning Notebook VM, you are all set. Otherwise, you should always run the [Configuration](./configuration.ipynb) notebook first when setting up a notebook library on a new machine or in a new environment. It configures your notebook library to connect to an Azure Machine Learning workspace, and sets up your workspace and compute to be used by many of the other examples. -This [index](./index.md) should assist in navigating the Azure Machine Learning notebook samples and encourage efficient retrieval of topics and content. +This [index](.index.md) should assist in navigating the Azure Machine Learning notebook samples and encourage efficient retrieval of topics and content. If you want to... diff --git a/configuration.ipynb b/configuration.ipynb index 37c998142..cf1e9a122 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.1.0rc1 of the Azure ML SDK\")\n", + "print(\"This notebook was created using version 1.1.1rc0 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 827999ee5..42906d192 100644 --- a/how-to-use-azureml/automated-machine-learning/automl_env.yml +++ b/how-to-use-azureml/automated-machine-learning/automl_env.yml @@ -4,6 +4,7 @@ dependencies: # Currently Azure ML only supports 3.5.2 and later. - pip<=19.3.1 - python>=3.5.2,<3.6.8 +- wheel==0.30.0 - nb_conda - matplotlib==2.1.0 - numpy>=1.16.0,<=1.16.2 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 9cdae0b38..fca456e04 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 @@ -5,6 +5,7 @@ dependencies: - pip<=19.3.1 - nomkl - python>=3.5.2,<3.6.8 +- wheel==0.30.0 - nb_conda - matplotlib==2.1.0 - numpy>=1.16.0,<=1.16.2 diff --git a/how-to-use-azureml/machine-learning-pipelines/intro-to-pipelines/aml-pipelines-with-automated-machine-learning-step.ipynb b/how-to-use-azureml/machine-learning-pipelines/intro-to-pipelines/aml-pipelines-with-automated-machine-learning-step.ipynb index 7b1017c6a..cb049d7ba 100644 --- a/how-to-use-azureml/machine-learning-pipelines/intro-to-pipelines/aml-pipelines-with-automated-machine-learning-step.ipynb +++ b/how-to-use-azureml/machine-learning-pipelines/intro-to-pipelines/aml-pipelines-with-automated-machine-learning-step.ipynb @@ -76,7 +76,7 @@ "from azureml.core.runconfig import RunConfiguration\n", "from azureml.core.conda_dependencies import CondaDependencies\n", "\n", - "from azureml.pipeline.steps import AutoMLStep\n", + "from azureml.train.automl.runtime import AutoMLStep\n", "\n", "# Check core SDK version number\n", "print(\"SDK version:\", azureml.core.VERSION)" @@ -173,7 +173,12 @@ "source": [ "# create a new RunConfig object\n", "conda_run_config = RunConfiguration(framework=\"python\")\n", - "cd = CondaDependencies.create(pip_packages=['azureml-sdk[automl]'])\n", + "\n", + "conda_run_config.environment.docker.enabled = True\n", + "conda_run_config.environment.docker.base_image = azureml.core.runconfig.DEFAULT_CPU_IMAGE\n", + "\n", + "cd = CondaDependencies.create(pip_packages=['azureml-sdk[automl]'], \n", + " conda_packages=['numpy', 'py-xgboost<=0.80'])\n", "conda_run_config.environment.python.conda_dependencies = cd\n", "\n", "print('run config is ready')" diff --git a/how-to-use-azureml/ml-frameworks/chainer/deployment/train-hyperparameter-tune-deploy-with-chainer/train-hyperparameter-tune-deploy-with-chainer.ipynb b/how-to-use-azureml/ml-frameworks/chainer/deployment/train-hyperparameter-tune-deploy-with-chainer/train-hyperparameter-tune-deploy-with-chainer.ipynb index 3e5a59fcd..6d4c30a7b 100644 --- a/how-to-use-azureml/ml-frameworks/chainer/deployment/train-hyperparameter-tune-deploy-with-chainer/train-hyperparameter-tune-deploy-with-chainer.ipynb +++ b/how-to-use-azureml/ml-frameworks/chainer/deployment/train-hyperparameter-tune-deploy-with-chainer/train-hyperparameter-tune-deploy-with-chainer.ipynb @@ -673,13 +673,11 @@ "metadata": {}, "outputs": [], "source": [ - "models = ws.models\n", - "for name, model in models.items():\n", - " print(\"Model: {}, ID: {}\".format(name, model.id))\n", + "model = ws.models['chainer-dnn-mnist']\n", + "print(\"Model: {}, ID: {}\".format('chainer-dnn-mnist', model.id))\n", " \n", - "webservices = ws.webservices\n", - "for name, webservice in webservices.items():\n", - " print(\"Webservice: {}, scoring URI: {}\".format(name, webservice.scoring_uri))" + "webservice = ws.webservices['chainer-mnist-1']\n", + "print(\"Webservice: {}, scoring URI: {}\".format('chainer-mnist-1', webservice.scoring_uri))" ] }, { diff --git a/how-to-use-azureml/ml-frameworks/tensorflow/deployment/train-hyperparameter-tune-deploy-with-tensorflow/train-hyperparameter-tune-deploy-with-tensorflow.ipynb b/how-to-use-azureml/ml-frameworks/tensorflow/deployment/train-hyperparameter-tune-deploy-with-tensorflow/train-hyperparameter-tune-deploy-with-tensorflow.ipynb index aa6b6b4aa..f35b534c6 100644 --- a/how-to-use-azureml/ml-frameworks/tensorflow/deployment/train-hyperparameter-tune-deploy-with-tensorflow/train-hyperparameter-tune-deploy-with-tensorflow.ipynb +++ b/how-to-use-azureml/ml-frameworks/tensorflow/deployment/train-hyperparameter-tune-deploy-with-tensorflow/train-hyperparameter-tune-deploy-with-tensorflow.ipynb @@ -1115,13 +1115,11 @@ "metadata": {}, "outputs": [], "source": [ - "models = ws.models\n", - "for name, model in models.items():\n", - " print(\"Model: {}, ID: {}\".format(name, model.id))\n", + "model = ws.models['tf-dnn-mnist']\n", + "print(\"Model: {}, ID: {}\".format('tf-dnn-mnist', model.id))\n", " \n", - "webservices = ws.webservices\n", - "for name, webservice in webservices.items():\n", - " print(\"Webservice: {}, scoring URI: {}\".format(name, webservice.scoring_uri))" + "webservice = ws.webservices['tf-mnist-svc']\n", + "print(\"Webservice: {}, scoring URI: {}\".format('tf-mnist-svc', webservice.scoring_uri))" ] }, { 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 1253622b9..e4019e75f 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 @@ -100,7 +100,7 @@ "\n", "# Check core SDK version number\n", "\n", - "print(\"This notebook was created using SDK version 1.1.0rc1, you are currently running version\", azureml.core.VERSION)" + "print(\"This notebook was created using SDK version 1.1.1rc0, you are currently running version\", azureml.core.VERSION)" ] }, { diff --git a/setup-environment/configuration.ipynb b/setup-environment/configuration.ipynb index 9d441c61d..62435abd3 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.1.0rc1 of the Azure ML SDK\")\n", + "print(\"This notebook was created using version 1.1.1rc0 of the Azure ML SDK\")\n", "print(\"You are currently using version\", azureml.core.VERSION, \"of the Azure ML SDK\")" ] },