hpcflow-new2 0.2.0a51__tar.gz → 0.2.0a53__tar.gz

{hpcflow_new2-0.2.0a51 → hpcflow_new2-0.2.0a53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hpcflow-new2
-Version: 0.2.0a51
+Version: 0.2.0a53
 Summary: Computational workflow management
 License: MIT
 Author: aplowman

hpcflow_new2-0.2.0a53/hpcflow/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.0a53"

{hpcflow_new2-0.2.0a51 → hpcflow_new2-0.2.0a53}/hpcflow/sdk/submission/jobscript.py

@@ -461,7 +461,7 @@ class Jobscript(JSONLike):
         if not self.scheduler_name:
             return False
 
-        support_EAR_para = self.workflow._store.features.EAR_parallelism
+        support_EAR_para = self.workflow._store._features.EAR_parallelism
         if self.resources.use_job_array is None:
             if self.num_elements > 1 and support_EAR_para:
                 return True

{hpcflow_new2-0.2.0a51 → hpcflow_new2-0.2.0a53}/hpcflow/sdk/submission/schedulers/sge.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+import re
 import subprocess
 from typing import List, Tuple
 from hpcflow.sdk.submission.schedulers import Scheduler
@@ -41,7 +42,6 @@ class SGEPosix(Scheduler):
         return f"{self.js_cmd} {self.array_switch} 1-{num_elements}"
 
     def format_std_stream_file_option_lines(self, is_array, sub_idx):
-
         # note: we can't modify the file names
         base = f"./artifacts/submissions/{sub_idx}"
         return [
@@ -50,7 +50,6 @@ class SGEPosix(Scheduler):
         ]
 
     def format_options(self, resources, num_elements, is_array, sub_idx):
-
         # TODO: I think the PEs are set by the sysadmins so they should be set in the
         # config file as a mapping between num_cores/nodes and PE names?
         # `qconf -spl` shows a list of PEs
@@ -86,7 +85,6 @@ class SGEPosix(Scheduler):
         js_path: str,
         deps: List[Tuple],
     ) -> List[str]:
-
         cmd = [self.submit_cmd, "-terse"]
 
         dep_job_IDs = []
@@ -110,5 +108,9 @@ class SGEPosix(Scheduler):
 
     def parse_submission_output(self, stdout: str) -> str:
         """Extract scheduler reference for a newly submitted jobscript"""
-        job_ID = stdout  # since we submit with "-terse"
+        match = re.search("^\d+", stdout)
+        if match:
+            job_ID = match.group()
+        else:
+            raise RuntimeError(f"Could not parse Job ID from scheduler output {stdout!r}")
         return job_ID

{hpcflow_new2-0.2.0a51 → hpcflow_new2-0.2.0a53}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [tool.poetry]
 name = "hpcflow-new2"
-version = "0.2.0a51"
+version = "0.2.0a53"
 
 description = "Computational workflow management"
 authors = ["aplowman <adam.plowman@manchester.ac.uk>"]
@@ -63,7 +63,7 @@ hook-dirs = "hpcflow.__pyinstaller:get_hook_dirs"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.2.0a51"
+version = "0.2.0a53"
 tag_format = "v$version"
 version_files = [ 
     "pyproject.toml:version",

hpcflow_new2-0.2.0a51/hpcflow/_version.py

@@ -1 +0,0 @@
-__version__ = "0.2.0a51"