parsl 2024.1.8__tar.gz → 2024.1.15__tar.gz

{parsl-2024.1.8/parsl.egg-info → parsl-2024.1.15}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: parsl
-Version: 2024.1.8
+Version: 2024.1.15
 Summary: Simple data dependent workflows in Python
 Home-page: https://github.com/Parsl/parsl
-Download-URL: https://github.com/Parsl/parsl/archive/2024.01.08.tar.gz
+Download-URL: https://github.com/Parsl/parsl/archive/2024.01.15.tar.gz
 Author: The Parsl Team
 Author-email: parsl@googlegroups.com
 License: Apache 2.0

{parsl-2024.1.8 → parsl-2024.1.15}/parsl/dataflow/dflow.py

@@ -177,7 +177,9 @@ class DataFlowKernel:
 
         # this must be set before executors are added since add_executors calls
         # job_status_poller.add_executors.
-        self.job_status_poller = JobStatusPoller(self)
+        self.job_status_poller = JobStatusPoller(strategy=self.config.strategy,
+                                                 max_idletime=self.config.max_idletime,
+                                                 dfk=self)
 
         self.executors: Dict[str, ParslExecutor] = {}
 

{parsl-2024.1.8 → parsl-2024.1.15}/parsl/executors/high_throughput/executor.py

@@ -205,7 +205,6 @@ class HighThroughputExecutor(BlockProviderExecutor, RepresentationMixin):
 
         BlockProviderExecutor.__init__(self, provider=provider, block_error_handler=block_error_handler)
         self.label = label
-        self.launch_cmd = launch_cmd
         self.worker_debug = worker_debug
         self.storage_access = storage_access
         self.working_dir = working_dir
@@ -259,21 +258,25 @@ class HighThroughputExecutor(BlockProviderExecutor, RepresentationMixin):
         self.cpu_affinity = cpu_affinity
 
         if not launch_cmd:
-            self.launch_cmd = ("process_worker_pool.py {debug} {max_workers} "
-                               "-a {addresses} "
-                               "-p {prefetch_capacity} "
-                               "-c {cores_per_worker} "
-                               "-m {mem_per_worker} "
-                               "--poll {poll_period} "
-                               "--task_port={task_port} "
-                               "--result_port={result_port} "
-                               "--logdir={logdir} "
-                               "--block_id={{block_id}} "
-                               "--hb_period={heartbeat_period} "
-                               "{address_probe_timeout_string} "
-                               "--hb_threshold={heartbeat_threshold} "
-                               "--cpu-affinity {cpu_affinity} "
-                               "--available-accelerators {accelerators}")
+            launch_cmd = (
+                "process_worker_pool.py {debug} {max_workers} "
+                "-a {addresses} "
+                "-p {prefetch_capacity} "
+                "-c {cores_per_worker} "
+                "-m {mem_per_worker} "
+                "--poll {poll_period} "
+                "--task_port={task_port} "
+                "--result_port={result_port} "
+                "--logdir={logdir} "
+                "--block_id={{block_id}} "
+                "--hb_period={heartbeat_period} "
+                "{address_probe_timeout_string} "
+                "--hb_threshold={heartbeat_threshold} "
+                "--cpu-affinity {cpu_affinity} "
+                "--available-accelerators {accelerators}"
+            )
+
+        self.launch_cmd = launch_cmd
 
     radio_mode = "htex"
 

{parsl-2024.1.8 → parsl-2024.1.15}/parsl/executors/workqueue/executor.py

@@ -849,7 +849,7 @@ def _work_queue_submit_wait(*,
             break
 
         # Submit tasks
-        while task_queue.qsize() > 0 and not should_stop.value:
+        while task_queue.qsize() > 0 or q.empty() and not should_stop.value:
             # Obtain task from task_queue
             try:
                 task = task_queue.get(timeout=1)

{parsl-2024.1.8 → parsl-2024.1.15}/parsl/jobs/job_status_poller.py

@@ -2,7 +2,7 @@ import logging
 import parsl
 import time
 import zmq
-from typing import Dict, List, Sequence
+from typing import Dict, List, Sequence, Optional
 
 from parsl.jobs.states import JobStatus, JobState
 from parsl.jobs.strategy import Strategy
@@ -17,7 +17,7 @@ logger = logging.getLogger(__name__)
 
 
 class PollItem:
-    def __init__(self, executor: BlockProviderExecutor, dfk: "parsl.dataflow.dflow.DataFlowKernel"):
+    def __init__(self, executor: BlockProviderExecutor, dfk: Optional["parsl.dataflow.dflow.DataFlowKernel"] = None):
         self._executor = executor
         self._dfk = dfk
         self._interval = executor.status_polling_interval
@@ -26,7 +26,7 @@ class PollItem:
 
         # Create a ZMQ channel to send poll status to monitoring
         self.monitoring_enabled = False
-        if self._dfk.monitoring is not None:
+        if self._dfk and self._dfk.monitoring is not None:
             self.monitoring_enabled = True
             hub_address = self._dfk.hub_address
             hub_port = self._dfk.hub_interchange_port
@@ -100,11 +100,12 @@ class PollItem:
 
 
 class JobStatusPoller(Timer):
-    def __init__(self, dfk: "parsl.dataflow.dflow.DataFlowKernel") -> None:
+    def __init__(self, strategy: Optional[str] = None, max_idletime: float = 0.0,
+                 dfk: Optional["parsl.dataflow.dflow.DataFlowKernel"] = None) -> None:
         self._poll_items = []  # type: List[PollItem]
         self.dfk = dfk
-        self._strategy = Strategy(strategy=dfk.config.strategy,
-                                  max_idletime=dfk.config.max_idletime)
+        self._strategy = Strategy(strategy=strategy,
+                                  max_idletime=max_idletime)
         super().__init__(self.poll, interval=5, name="JobStatusPoller")
 
     def poll(self) -> None:

{parsl-2024.1.8 → parsl-2024.1.15}/parsl/providers/errors.py

@@ -1,5 +1,7 @@
 from parsl.errors import ParslError
 
+import warnings
+
 
 class ExecutionProviderException(ParslError):
     """ Base class for all exceptions
@@ -46,18 +48,23 @@ class ScriptPathError(ExecutionProviderException):
 
 
 class SubmitException(ExecutionProviderException):
-    '''Raised by the submit() method of a provider if there is an error in launching a task.
+    '''Raised by the submit() method of a provider if there is an error in launching a job.
     '''
 
-    def __init__(self, task_name, message, stdout=None, stderr=None):
-        self.task_name = task_name
+    def __init__(self, job_name, message, stdout=None, stderr=None):
+        self.job_name = job_name
         self.message = message
         self.stdout = stdout
         self.stderr = stderr
 
+    @property
+    def task_name(self) -> str:
+        warnings.warn("task_name is deprecated; use .job_name instead. This will be removed after 2024-06.", DeprecationWarning)
+        return self.job_name
+
     def __str__(self):
         # TODO: make this more user-friendly
-        return "Cannot launch task {0}: {1}; stdout={2}, stderr={3}".format(self.task_name,
-                                                                            self.message,
-                                                                            self.stdout,
-                                                                            self.stderr)
+        return "Cannot launch job {0}: {1}; stdout={2}, stderr={3}".format(self.job_name,
+                                                                           self.message,
+                                                                           self.stdout,
+                                                                           self.stderr)

{parsl-2024.1.8 → parsl-2024.1.15}/parsl/tests/conftest.py

@@ -22,6 +22,7 @@ import _pytest.runner as runner
 
 import parsl
 from parsl.dataflow.dflow import DataFlowKernelLoader
+from parsl.utils import RepresentationMixin
 
 logger = logging.getLogger(__name__)
 
@@ -157,6 +158,8 @@ def load_dfk_session(request, pytestconfig, tmpd_cwd_session):
     load_dfk_local_module for module-level configuration management.
     """
 
+    RepresentationMixin._validate_repr = True
+
     config = pytestconfig.getoption('config')[0]
 
     if config != 'local':
@@ -203,6 +206,7 @@ def load_dfk_local_module(request, pytestconfig, tmpd_cwd_session):
     be used to perform more interesting DFK initialisation not possible with
     local_config.
     """
+    RepresentationMixin._validate_repr = True
 
     config = pytestconfig.getoption('config')[0]
 

parsl-2024.1.15/parsl/tests/test_providers/test_submiterror_deprecation.py

@@ -0,0 +1,21 @@
+import pytest
+import random
+import string
+
+from parsl.providers.errors import SubmitException
+
+
+@pytest.mark.local
+def test_submit_exception_task_name_deprecation():
+    """This tests the deprecation warning of task_name in SubmitException
+    """
+    j = "the_name-" + "".join(random.sample(string.ascii_lowercase, 10))
+
+    ex = SubmitException(j, "m")
+
+    # the new behaviour
+    assert ex.job_name == j
+
+    # the old behaviour
+    with pytest.deprecated_call():
+        assert ex.task_name == j

parsl-2024.1.15/parsl/tests/test_utils/test_representation_mixin.py

@@ -0,0 +1,68 @@
+import pytest
+
+from parsl.utils import RepresentationMixin
+
+
+class GoodRepr(RepresentationMixin):
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+
+
+class BadRepr(RepresentationMixin):
+    """This class incorrectly subclasses RepresentationMixin.
+    It does not store the parameter x on self.
+    """
+    def __init__(self, x, y):
+        self.y = y
+
+
+@pytest.mark.local
+def test_repr_good():
+    p1 = "parameter 1"
+    p2 = "the second parameter"
+
+    # repr should not raise an exception
+    r = repr(GoodRepr(p1, p2))
+
+    # representation should contain both values supplied
+    # at object creation.
+    assert p1 in r
+    assert p2 in r
+
+
+@pytest.mark.local
+def test_repr_bad():
+    p1 = "parameter 1"
+    p2 = "the second parameter"
+
+    # repr should raise an exception
+    with pytest.raises(AttributeError):
+        repr(BadRepr(p1, p2))
+
+
+class NonValidatingRepresentationMixin(RepresentationMixin):
+    """This will override the process level RepresentationMixin which can
+    be set to validating mode by pytest fixtures"""
+    _validate_repr = False
+
+
+class BadReprNonValidating(NonValidatingRepresentationMixin):
+    """This class incorrectly subclasses RepresentationMixin.
+    It does not store the parameter x on self.
+    """
+    def __init__(self, x, y):
+        self.y = y
+
+
+@pytest.mark.local
+def test_repr_bad_unvalidated():
+    p1 = "parameter 1"
+    p2 = "the second parameter"
+
+    # repr should not raise an exception
+    r = repr(BadReprNonValidating(p1, p2))
+    # parameter 2 should be found in the representation, but not
+    # parameter 1
+    assert p1 not in r
+    assert p2 in r

{parsl-2024.1.8 → parsl-2024.1.15}/parsl/utils.py

@@ -191,6 +191,8 @@ class RepresentationMixin:
     """
     __max_width__ = 80
 
+    _validate_repr = False
+
     def __repr__(self) -> str:
         init = self.__init__  # type: ignore[misc]
 
@@ -211,18 +213,21 @@ class RepresentationMixin:
         else:
             defaults = {}
 
-        for arg in argspec.args[1:]:
-            if not hasattr(self, arg):
-                template = (f'class {self.__class__.__name__} uses {arg} in the'
-                            f' constructor, but does not define it as an '
-                            f'attribute')
-                raise AttributeError(template)
+        if self._validate_repr:
+            for arg in argspec.args[1:]:
+                if not hasattr(self, arg):
+                    template = (f'class {self.__class__.__name__} uses {arg} in the'
+                                f' constructor, but does not define it as an '
+                                f'attribute')
+                    raise AttributeError(template)
+
+        default = "<unrecorded>"
 
         if len(defaults) != 0:
-            args = [getattr(self, a) for a in argspec.args[1:-len(defaults)]]
+            args = [getattr(self, a, default) for a in argspec.args[1:-len(defaults)]]
         else:
-            args = [getattr(self, a) for a in argspec.args[1:]]
-        kwargs = {key: getattr(self, key) for key in defaults}
+            args = [getattr(self, a, default) for a in argspec.args[1:]]
+        kwargs = {key: getattr(self, key, default) for key in defaults}
 
         def assemble_multiline(args: List[str], kwargs: Dict[str, object]) -> str:
             def indent(text: str) -> str:

{parsl-2024.1.8 → parsl-2024.1.15}/parsl/version.py

@@ -3,4 +3,4 @@
 Year.Month.Day[alpha/beta/..]
 Alphas will be numbered like this -> 2024.12.10a0
 """
-VERSION = '2024.01.08'
+VERSION = '2024.01.15'

{parsl-2024.1.8 → parsl-2024.1.15/parsl.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: parsl
-Version: 2024.1.8
+Version: 2024.1.15
 Summary: Simple data dependent workflows in Python
 Home-page: https://github.com/Parsl/parsl
-Download-URL: https://github.com/Parsl/parsl/archive/2024.01.08.tar.gz
+Download-URL: https://github.com/Parsl/parsl/archive/2024.01.15.tar.gz
 Author: The Parsl Team
 Author-email: parsl@googlegroups.com
 License: Apache 2.0

{parsl-2024.1.8 → parsl-2024.1.15}/parsl.egg-info/SOURCES.txt

@@ -360,6 +360,7 @@ parsl/tests/test_monitoring/test_viz_colouring.py
 parsl/tests/test_providers/__init__.py
 parsl/tests/test_providers/test_local_provider.py
 parsl/tests/test_providers/test_slurm_instantiate.py
+parsl/tests/test_providers/test_submiterror_deprecation.py
 parsl/tests/test_python_apps/__init__.py
 parsl/tests/test_python_apps/test_arg_input_types.py
 parsl/tests/test_python_apps/test_basic.py
@@ -422,5 +423,7 @@ parsl/tests/test_staging/test_staging_https.py
 parsl/tests/test_threads/__init__.py
 parsl/tests/test_threads/test_configs.py
 parsl/tests/test_threads/test_lazy_errors.py
+parsl/tests/test_utils/__init__.py
+parsl/tests/test_utils/test_representation_mixin.py
 parsl/usage_tracking/__init__.py
 parsl/usage_tracking/usage.py