amlhpc 0.2__tar.gz → 0.2.2__tar.gz

{amlhpc-0.2 → amlhpc-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amlhpc
-Version: 0.2
+Version: 0.2.2
 Summary: Emulate Slurm/PBS/LSF HPC scheduler in Azure ML
 Author: Hugo Meiland
 Author-email: hugo.meiland@microsoft.com
@@ -82,5 +82,5 @@ optional arguments:
   -w WRAP, --wrap WRAP  command line to be executed, should be enclosed with quotes
 ```
 
-If you encounter a scenario or option that is not supoprted yet or behaves unexpected, please create an issue and explain the option and the scenario.
+If you encounter a scenario or option that is not supported yet or behaves unexpected, please create an issue and explain the option and the scenario.
 

{amlhpc-0.2 → amlhpc-0.2.2}/README.md

@@ -66,4 +66,4 @@ optional arguments:
   -w WRAP, --wrap WRAP  command line to be executed, should be enclosed with quotes
 ```
 
-If you encounter a scenario or option that is not supoprted yet or behaves unexpected, please create an issue and explain the option and the scenario.
+If you encounter a scenario or option that is not supported yet or behaves unexpected, please create an issue and explain the option and the scenario.

{amlhpc-0.2 → amlhpc-0.2.2}/amlhpc/slurm/sbatch.py

@@ -59,7 +59,7 @@ def sbatch(vargs=None):
     parser.add_argument('--datamover', default="None", type=str, help='use "simple" for moving the (recursive) data along with the runscript')
     parser.add_argument('-e', '--environment', default="None", type=str, help='Azure Machine Learning environment, should be enclosed in quotes, may use @latest')
     parser.add_argument('-N', '--nodes', default=1, type=int, help='amount of nodes to use for the job')
-    parser.add_argument('-p', '--partition', type=str, required=True,
+    parser.add_argument('-p', '--partition', default="None", type=str, 
                         help='set compute partition where the job should be run. Use <sinfo> to view available partitions')
     #parser.add_argument('--parallel', default="single", type=str, help='command line to be executed, should be enclosed with quotes')
     parser.add_argument('-v', '--verbose', action='count', default=0,  help='provide output on found settings and job properties')
@@ -78,6 +78,19 @@ def sbatch(vargs=None):
         print("Conflict: provide either script to execute as argument or commandline to execute through --wrap option")
         exit(-1)
 
+    if (args.script != "None"):
+        f = open(args.script, "r")
+        lines = f.readlines()
+        for line in lines:
+            if line.startswith('#SBATCH -p ') or line.startswith('#SBATCH --partition '):
+                words = list(line.split(" "))
+                args.partition = words[2] 
+                if (args.verbose): print("partition argument from runscript: " + args.partition) 
+
+    if (args.partition == "None"):
+        print("Missing: provide partition to run the job, either as -p argument or as configuration in runscript")
+        exit(-1)
+
     if (args.container != "None") and (args.environment != "None"):
         print("Conflict: provide either container or environment, cannot be used together")
         exit(-1)
@@ -100,8 +113,9 @@ def sbatch(vargs=None):
     if (args.verbose): print("using environment: " + args.environment) 
 
     if (args.script != "None"):
+        start_command = "chmod +x " + args.script + "; "
         job_code = pwd + "/" + args.script
-        job_command = args.script
+        job_command = start_command + args.script
         if (args.verbose): 
             print("provided script to be executed: " + job_code) 
             print("provided script to be uploaded: " + job_code) 

{amlhpc-0.2 → amlhpc-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "amlhpc"
-version = "0.2"
+version = "0.2.2"
 authors = [ "Hugo Meiland <hugo.meiland@microsoft.com>", "Utkarsh Ayachit <uayachit@microsoft.com>" ]
 description = "Emulate Slurm/PBS/LSF HPC scheduler in Azure ML"
 readme = "README.md"