Merge pull request #6 from Microsoft/feature/cli-auth

Feature/cli auth

Author: jainr

.gitignore

@@ -89,6 +89,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+*.vscode
 
 # Spyder project settings
 .spyderproject

aml_config/security_config.json

@@ -5,5 +5,10 @@
     "remote_vm_name" : "<>",
     "remote_vm_username" : "<>",
     "remote_vm_password" : "<>",
-    "remote_vm_ip" : "<>"
+    "remote_vm_ip" : "<>",
+    "experiment_name" : "<>",
+    "aml_cluster_name" : "<>",
+    "vnet_resourcegroup_name" : "<>", 
+    "vnet_name" : "<>", 
+    "subnet_name" : "<>"
 }

aml_service/00-WorkSpace.py

@@ -45,7 +45,7 @@
         name=workspace_name,
         subscription_id=subscription_id,
         resource_group=resource_group,
-        auth=cli_auth
+        auth=cli_auth,
     )
 
 except:
@@ -57,8 +57,7 @@
         resource_group=resource_group,
         # create_resource_group=True,
         location=location,
-        auth=cli_auth
-
+        auth=cli_auth,
     )
 
 # print Workspace details

aml_service/01-Experiment.py

@@ -26,10 +26,13 @@
 import os
 from azureml.core import Experiment
 from azureml.core import Workspace
+from azureml.core.authentication import AzureCliAuthentication
+
+cli_auth = AzureCliAuthentication()
 
 
 def getExperiment():
-    ws = Workspace.from_config()
+    ws = Workspace.from_config(auth=cli_auth)
     script_folder = "."
     experiment_name = "devops-ai-demo"
     exp = Experiment(workspace=ws, name=experiment_name)

aml_service/02-AttachTrainingVM.py

@@ -33,10 +33,12 @@
 from azureml.core.compute import RemoteCompute
 from azureml.core.compute import DsvmCompute
 from azureml.core.compute_target import ComputeTargetException
+from azureml.core.authentication import AzureCliAuthentication
 
+cli_auth = AzureCliAuthentication()
 
 # Get workspace
-ws = Workspace.from_config()
+ws = Workspace.from_config(auth=cli_auth)
 
 # Read the New VM Config
 with open("aml_config/security_config.json") as f:

aml_service/03-AttachAmlCluster.py

@@ -0,0 +1,66 @@
+"""
+Copyright (C) Microsoft Corporation. All rights reserved.​
+
+Microsoft Corporation (“Microsoft”) grants you a nonexclusive, perpetual,
+royalty-free right to use, copy, and modify the software code provided by us
+("Software Code"). You may not sublicense the Software Code or any use of it
+(except to your affiliates and to vendors to perform work on your behalf)
+through distribution, network access, service agreement, lease, rental, or
+otherwise. This license does not purport to express any claim of ownership over
+data you may have shared with Microsoft in the creation of the Software Code.
+Unless applicable law gives you more rights, Microsoft reserves all other
+rights not expressly granted herein, whether by implication, estoppel or
+otherwise. ​
+
+THE SOFTWARE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+MICROSOFT OR ITS LICENSORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE CODE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+"""
+
+from azureml.core import Workspace
+from azureml.core.compute import ComputeTarget, AmlCompute
+from azureml.core.compute_target import ComputeTargetException
+from azureml.core.authentication import AzureCliAuthentication
+import os, json
+
+cli_auth = AzureCliAuthentication()
+# Get workspace
+ws = Workspace.from_config(auth=cli_auth)
+
+# Read the New VM Config
+with open("aml_config/security_config.json") as f:
+    config = json.load(f)
+
+aml_cluster_name = config["aml_cluster_name"]
+
+# un-comment the below lines if you want to put AML Compute under Vnet. Also update /aml_config/security_config.json
+# vnet_resourcegroup_name = config['vnet_resourcegroup_name']
+# vnet_name = config['vnet_name']
+# subnet_name = config['subnet_name']
+
+# Verify that cluster does not exist already
+try:
+    cpu_cluster = ComputeTarget(workspace=ws, name=aml_cluster_name)
+    print("Found existing cluster, use it.")
+except ComputeTargetException:
+    compute_config = AmlCompute.provisioning_configuration(
+        vm_size="STANDARD_D2_V2",
+        vm_priority="dedicated",
+        min_nodes=1,
+        max_nodes=3,
+        idle_seconds_before_scaledown="300",
+        #    #Uncomment the below lines for VNet support
+        #    vnet_resourcegroup_name=vnet_resourcegroup_name,
+        #    vnet_name=vnet_name,
+        #    subnet_name=subnet_name
+    )
+    cpu_cluster = ComputeTarget.create(ws, aml_cluster_name, compute_config)
+
+cpu_cluster.wait_for_completion(show_output=True)

aml_service/10-TrainOnLocal.py

@@ -30,6 +30,7 @@
 from azureml.core import ScriptRunConfig
 import json
 from azureml.core.authentication import AzureCliAuthentication
+
 cli_auth = AzureCliAuthentication()
 
 # Get workspace

aml_service/11-TrainOnLocalEnv.py

@@ -32,8 +32,12 @@
 from azureml.core import Experiment
 from azureml.core import ScriptRunConfig
 
+from azureml.core.authentication import AzureCliAuthentication
+
+cli_auth = AzureCliAuthentication()
+
 # Get workspace
-ws = Workspace.from_config()
+ws = Workspace.from_config(auth=cli_auth)
 
 # Attach Experiment
 experiment_name = "devops-ai-demo"

aml_service/12-TrainOnVM.py

@@ -30,10 +30,12 @@
 from azureml.core.runconfig import RunConfiguration
 from azureml.core import ScriptRunConfig
 import azureml.core
+from azureml.core.authentication import AzureCliAuthentication
 
-
+cli_auth = AzureCliAuthentication()
 # Get workspace
-ws = Workspace.from_config()
+ws = Workspace.from_config(auth=cli_auth)
+
 
 # Read the New VM Config
 with open("aml_config/security_config.json") as f:

aml_service/15-EvaluateModel.py

@@ -30,6 +30,7 @@
 import azureml.core
 from azureml.core import Run
 from azureml.core.authentication import AzureCliAuthentication
+
 cli_auth = AzureCliAuthentication()
 
 # Get workspace