parsl 2024.1.1__tar.gz → 2024.1.8__tar.gz

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

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

{parsl-2024.1.1 → parsl-2024.1.8}/parsl/addresses.py

@@ -72,8 +72,9 @@ def address_by_hostname() -> str:
     """
     logger.debug("Finding address by using local hostname")
     addr = platform.node()
-    logger.debug("Address found: {}".format(addr))
-    return addr
+    ip_addr = socket.gethostbyname(addr)
+    logger.debug("Address found: {}".format(ip_addr))
+    return ip_addr
 
 
 @typeguard.typechecked

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

@@ -526,9 +526,7 @@ class DataFlowKernel:
         # or do nothing?
         if self.checkpoint_mode == 'task_exit':
             self.checkpoint(tasks=[task_record])
-        elif self.checkpoint_mode == 'manual' or \
-                self.checkpoint_mode == 'periodic' or \
-                self.checkpoint_mode == 'dfk_exit':
+        elif self.checkpoint_mode in ('manual', 'periodic', 'dfk_exit'):
             with self.checkpoint_lock:
                 self.checkpointable_tasks.append(task_record)
         elif self.checkpoint_mode is None:
@@ -1298,11 +1296,7 @@ class DataFlowKernel:
                         hashsum = task_record['hashsum']
                         if not hashsum:
                             continue
-                        t = {'hash': hashsum,
-                             'exception': None,
-                             'result': None}
-
-                        t['result'] = app_fu.result()
+                        t = {'hash': hashsum, 'exception': None, 'result': app_fu.result()}
 
                         # We are using pickle here since pickle dumps to a file in 'ab'
                         # mode behave like a incremental log.

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

@@ -3,6 +3,8 @@ import itertools
 import logging
 import os
 import pathlib
+import re
+import shutil
 import time
 import types
 import signal
@@ -44,17 +46,46 @@ def pytest_sessionstart(session):
 
 
 @pytest.fixture(scope="session")
-def tmpd_cwd_session():
-    n = datetime.now().strftime('%Y%m%d.%H%I%S')
-    with tempfile.TemporaryDirectory(dir=os.getcwd(), prefix=f".pytest-{n}-") as tmpd:
-        yield pathlib.Path(tmpd)
+def tmpd_cwd_session(pytestconfig):
+    config = re.sub(r"[^A-z0-9_-]+", "_", pytestconfig.getoption('config')[0])
+    cwd = pathlib.Path(os.getcwd())
+    pytest_dir = cwd / ".pytest"
+    pytest_dir.mkdir(mode=0o700, parents=True, exist_ok=True)
+
+    test_dir_prefix = "parsltest-"
+    link = pytest_dir / f"{test_dir_prefix}current"
+    link.unlink(missing_ok=True)
+    n = datetime.now().strftime('%Y%m%d.%H%M%S')
+    tmpd = tempfile.mkdtemp(dir=pytest_dir, prefix=f"{test_dir_prefix}{n}-{config}-")
+    tmpd = pathlib.Path(tmpd)
+    link.symlink_to(tmpd.name)
+    yield link
+
+    try:
+        preserve = int(os.getenv("PARSL_TEST_PRESERVE_NUM_RUNS", "3"))
+    except Exception:
+        preserve = 3
+
+    test_runs = sorted(
+        d for d in pytest_dir.glob(f"{test_dir_prefix}*")
+        if d.is_dir() and not d.is_symlink()
+    )
+    for run_to_remove in test_runs[:-preserve]:
+        run_to_remove.chmod(0o700)
+        for root, subdirnames, fnames in os.walk(run_to_remove):
+            rpath = pathlib.Path(root)
+            for d in subdirnames:
+                (rpath / d).lchmod(0o700)
+            for f in fnames:
+                (rpath / f).lchmod(0o600)
+        shutil.rmtree(run_to_remove)
 
 
 @pytest.fixture
 def tmpd_cwd(tmpd_cwd_session, request):
     prefix = f"{request.node.name}-"
-    with tempfile.TemporaryDirectory(dir=tmpd_cwd_session, prefix=prefix) as tmpd:
-        yield pathlib.Path(tmpd)
+    tmpd = tempfile.mkdtemp(dir=tmpd_cwd_session, prefix=prefix)
+    yield pathlib.Path(tmpd)
 
 
 def pytest_addoption(parser):
@@ -118,7 +149,7 @@ def pytest_configure(config):
 
 
 @pytest.fixture(autouse=True, scope='session')
-def load_dfk_session(request, pytestconfig):
+def load_dfk_session(request, pytestconfig, tmpd_cwd_session):
     """Load a dfk around entire test suite, except in local mode.
 
     The special path `local` indicates that configuration will not come
@@ -137,12 +168,19 @@ def load_dfk_session(request, pytestconfig):
             raise RuntimeError("DFK didn't start as None - there was a DFK from somewhere already")
 
         if hasattr(module, 'config'):
-            dfk = parsl.load(module.config)
+            parsl_conf = module.config
         elif hasattr(module, 'fresh_config'):
-            dfk = parsl.load(module.fresh_config())
+            parsl_conf = module.fresh_config()
         else:
             raise RuntimeError("Config module does not define config or fresh_config")
 
+        if parsl_conf.run_dir == "runinfo":  # the default
+            parsl_conf.run_dir = tmpd_cwd_session / parsl_conf.run_dir
+        dfk = parsl.load(parsl_conf)
+
+        for ex in dfk.executors.values():
+            ex.working_dir = tmpd_cwd_session
+
         yield
 
         if parsl.dfk() != dfk:
@@ -154,7 +192,7 @@ def load_dfk_session(request, pytestconfig):
 
 
 @pytest.fixture(autouse=True, scope='module')
-def load_dfk_local_module(request, pytestconfig):
+def load_dfk_local_module(request, pytestconfig, tmpd_cwd_session):
     """Load the dfk around test modules, in local mode.
 
     If local_config is specified in the test module, it will be loaded using
@@ -177,8 +215,15 @@ def load_dfk_local_module(request, pytestconfig):
             assert callable(local_config)
             c = local_config()
             assert isinstance(c, parsl.Config)
+
+            if c.run_dir == "runinfo":  # the default
+                c.run_dir = tmpd_cwd_session / c.run_dir
+
             dfk = parsl.load(c)
 
+            for ex in dfk.executors.values():
+                ex.working_dir = tmpd_cwd_session
+
         if callable(local_setup):
             local_setup()
 

parsl-2024.1.8/parsl/tests/test_checkpointing/test_python_checkpoint_1.py

@@ -0,0 +1,33 @@
+import os
+import pytest
+
+import parsl
+from parsl import python_app
+from parsl.tests.configs.local_threads import fresh_config
+
+
+def local_config():
+    config = fresh_config()
+    config.checkpoint_mode = "manual"
+    return config
+
+
+@python_app(cache=True)
+def uuid_app():
+    import uuid
+    return uuid.uuid4()
+
+
+@pytest.mark.local
+def test_initial_checkpoint_write():
+    """1. Launch a few apps and write the checkpoint once a few have completed
+    """
+    uuid_app().result()
+
+    cpt_dir = parsl.dfk().checkpoint()
+
+    cptpath = cpt_dir + '/dfk.pkl'
+    assert os.path.exists(cptpath), f"DFK checkpoint missing: {cptpath}"
+
+    cptpath = cpt_dir + '/tasks.pkl'
+    assert os.path.exists(cptpath), f"Tasks checkpoint missing: {cptpath}"

parsl-2024.1.8/parsl/tests/test_checkpointing/test_python_checkpoint_2.py

@@ -0,0 +1,42 @@
+import contextlib
+import os
+import pytest
+import parsl
+from parsl import python_app
+
+from parsl.tests.configs.local_threads_checkpoint import fresh_config
+
+
+@contextlib.contextmanager
+def parsl_configured(run_dir, **kw):
+    c = fresh_config()
+    c.run_dir = run_dir
+    for config_attr, config_val in kw.items():
+        setattr(c, config_attr, config_val)
+    dfk = parsl.load(c)
+    for ex in dfk.executors.values():
+        ex.working_dir = run_dir
+    yield dfk
+
+    parsl.dfk().cleanup()
+    parsl.clear()
+
+
+@python_app(cache=True)
+def uuid_app():
+    import uuid
+    return uuid.uuid4()
+
+
+@pytest.mark.local
+def test_loading_checkpoint(tmpd_cwd):
+    """Load memoization table from previous checkpoint
+    """
+    with parsl_configured(tmpd_cwd, checkpoint_mode="task_exit"):
+        checkpoint_files = [os.path.join(parsl.dfk().run_dir, "checkpoint")]
+        result = uuid_app().result()
+
+    with parsl_configured(tmpd_cwd, checkpoint_files=checkpoint_files):
+        relaunched = uuid_app().result()
+
+    assert result == relaunched, "Expected following call to uuid_app to return cached uuid"

{parsl-2024.1.1 → parsl-2024.1.8}/parsl/tests/test_radical/test_mpi_funcs.py

@@ -5,7 +5,7 @@ from parsl.tests.configs.local_radical_mpi import fresh_config as local_config
 
 
 @parsl.python_app
-def test_mpi_func(msg, sleep, comm=None, parsl_resource_specification={}):
+def some_mpi_func(msg, sleep, comm=None, parsl_resource_specification={}):
     import time
     msg = 'hello %d/%d: %s' % (comm.rank, comm.size, msg)
     time.sleep(sleep)
@@ -17,11 +17,12 @@ apps = []
 
 
 @pytest.mark.local
+@pytest.mark.radical
 def test_radical_mpi(n=7):
     # rank size should be > 1 for the
     # radical runtime system to run this function in MPI env
     for i in range(2, n):
         spec = {'ranks': i}
-        t = test_mpi_func(msg='mpi.func.%06d' % i, sleep=1, comm=None, parsl_resource_specification=spec)
+        t = some_mpi_func(msg='mpi.func.%06d' % i, sleep=1, comm=None, parsl_resource_specification=spec)
         apps.append(t)
     assert [len(app.result()) for app in apps] == list(range(2, n))

parsl-2024.1.8/parsl/tests/test_staging/__init__.py

@@ -0,0 +1,7 @@
+def read_sort_write(in_path, out_path):
+    with open(in_path) as u:
+        strs = u.read().split()
+        strs.sort()
+    with open(out_path, 'w') as s:
+        for e in strs:
+            print(e, file=s)

{parsl-2024.1.1 → parsl-2024.1.8}/parsl/tests/test_staging/test_elaborate_noop_file.py

@@ -20,8 +20,8 @@ logger = logging.getLogger(__name__)
 
 
 @bash_app
-def touch(filename, inputs=[], outputs=[]):
-    return "touch {}".format(filename)
+def touch(filename, outputs=()):
+    return f"touch {filename}"
 
 
 @python_app
@@ -31,52 +31,47 @@ def app_test_in(file):
     pass
 
 
+@pytest.fixture
+def storage_access_parsl():
+    def _setup_config(*args, **kwargs):
+        tpe = ThreadPoolExecutor(
+            label='local_threads',
+            storage_access=[NoOpTestingFileStaging(*args, **kwargs)]
+        )
+        config = Config(executors=[tpe])
+        parsl.load(config)
+
+    yield _setup_config
+
+    parsl.dfk().cleanup()
+    parsl.clear()
+
+
 @pytest.mark.local
-def test_regression_stage_out_does_not_stage_in():
-    no_stageout_config = Config(
-        executors=[
-            ThreadPoolExecutor(
-                label='local_threads',
-                storage_access=[NoOpTestingFileStaging(allow_stage_in=False)]
-            )
-        ]
-    )
-
-    parsl.load(no_stageout_config)
+def test_regression_stage_out_does_not_stage_in(storage_access_parsl, tmpd_cwd):
+    storage_access_parsl(allow_stage_in=False)
 
     # Test that the helper app runs with no staging
-    touch("test.1", outputs=[]).result()
+    touch(str(tmpd_cwd / "test.1"), outputs=[]).result()
 
-    # Test with stage-out, checking that provider stage in is never
-    # invoked. If stage-in is invoked, the the NoOpTestingFileStaging
+    # Test with stage-out, checking that provider stage-in is never
+    # invoked. If stage-in is invoked, then the NoOpTestingFileStaging
     # provider will raise an exception, which should propagate to
     # .result() here.
-    touch("test.2", outputs=[File("test.2")]).result()
+    fpath = tmpd_cwd / "test.2"
+    touch(str(fpath), outputs=[File(fpath)]).result()
 
     # Test that stage-in exceptions propagate out to user code.
     with pytest.raises(NoOpError):
         touch("test.3", inputs=[File("test.3")]).result()
 
-    parsl.dfk().cleanup()
-    parsl.clear()
-
 
 @pytest.mark.local
-def test_regression_stage_in_does_not_stage_out():
-    no_stageout_config = Config(
-        executors=[
-            ThreadPoolExecutor(
-                label='local_threads',
-                storage_access=[NoOpTestingFileStaging(allow_stage_out=False)]
-            )
-        ],
-    )
-
-    parsl.load(no_stageout_config)
-
-    f = open("test.4", "a")
-    f.write("test")
-    f.close()
+def test_regression_stage_in_does_not_stage_out(storage_access_parsl, tmpd_cwd):
+    storage_access_parsl(allow_stage_out=False)
+
+    fpath = tmpd_cwd / "test.4"
+    fpath.write_text("test")
 
     # Test that stage in does not invoke stage out. If stage out is
     # attempted, then the NoOpTestingFileStaging provider will raise
@@ -86,6 +81,3 @@ def test_regression_stage_in_does_not_stage_out():
     # Test that stage out exceptions propagate to user code.
     with pytest.raises(NoOpError):
         touch("test.5", outputs=[File("test.5")]).result()
-
-    parsl.dfk().cleanup()
-    parsl.clear()

parsl-2024.1.8/parsl/tests/test_staging/test_staging_https.py

@@ -0,0 +1,103 @@
+import parsl
+from parsl.app.app import python_app
+from parsl.data_provider.files import File
+
+import pytest
+
+# This config is for the local test which will adding an executor.
+# Most tests in this file should be non-local and use the configuration
+# specificed with --config, not this one.
+from parsl.tests.configs.htex_local import fresh_config as local_config
+
+"""
+Test staging for an http file
+
+Create a remote input file (https) that points to unsorted.txt, then
+a local file for output data (sorted.txt).
+"""
+
+_unsorted_url = (
+    'https://gist.githubusercontent.com/yadudoc/7f21dd15e64a421990a46766bfa5359c/'
+    'raw/7fe04978ea44f807088c349f6ecb0f6ee350ec49/unsorted.txt'
+)
+_exp_sorted = sorted(f"{i}\n" for i in range(1, 101))[:20]
+
+
+@python_app
+def sort_strings(inputs=(), outputs=()):
+    from parsl.tests.test_staging import read_sort_write
+    read_sort_write(inputs[0].filepath, outputs[0].filepath)
+
+
+@python_app
+def sort_strings_kw(*, x=None, outputs=()):
+    from parsl.tests.test_staging import read_sort_write
+    read_sort_write(x.filepath, outputs[0].filepath)
+
+
+@python_app
+def sort_strings_arg(x, /, outputs=()):
+    from parsl.tests.test_staging import read_sort_write
+    read_sort_write(x.filepath, outputs[0].filepath)
+
+
+@python_app(executors=['other'])
+def sort_strings_additional_executor(inputs=(), outputs=()):
+    from parsl.tests.test_staging import read_sort_write
+    read_sort_write(inputs[0].filepath, outputs[0].filepath)
+
+
+@pytest.mark.cleannet
+def test_staging_https_cleannet(tmpd_cwd):
+    unsorted_file = File(_unsorted_url)
+    sorted_file = File(tmpd_cwd / 'sorted.txt')
+
+    sort_strings(inputs=[unsorted_file], outputs=[sorted_file]).result()
+    with open(sorted_file) as f:
+        assert all(a == b for a, b in zip(f.readlines(), _exp_sorted))
+
+
+@pytest.mark.local
+def test_staging_https_local(tmpd_cwd):
+    unsorted_file = File(_unsorted_url)
+    sorted_file = File(tmpd_cwd / 'sorted.txt')
+
+    sort_strings(inputs=[unsorted_file], outputs=[sorted_file]).result()
+    with open(sorted_file) as f:
+        assert all(a == b for a, b in zip(f.readlines(), _exp_sorted))
+
+
+@pytest.mark.cleannet
+def test_staging_https_kwargs(tmpd_cwd):
+    unsorted_file = File(_unsorted_url)
+    sorted_file = File(tmpd_cwd / 'sorted.txt')
+
+    sort_strings_kw(x=unsorted_file, outputs=[sorted_file]).result()
+    with open(sorted_file) as f:
+        assert all(a == b for a, b in zip(f.readlines(), _exp_sorted))
+
+
+@pytest.mark.cleannet
+def test_staging_https_args(tmpd_cwd):
+    unsorted_file = File(_unsorted_url)
+    sorted_file = File(tmpd_cwd / 'sorted.txt')
+
+    sort_strings_arg(unsorted_file, outputs=[sorted_file]).result()
+    with open(sorted_file) as f:
+        assert all(a == b for a, b in zip(f.readlines(), _exp_sorted))
+
+
+@pytest.mark.cleannet
+@pytest.mark.local
+def test_staging_https_additional_executor(tmpd_cwd):
+    unsorted_file = File(_unsorted_url)
+    sorted_file = File(tmpd_cwd / 'sorted.txt')
+
+    other_executor = parsl.ThreadPoolExecutor(label='other')
+    other_executor.working_dir = tmpd_cwd
+
+    parsl.dfk().add_executors([other_executor])
+
+    sort_strings_additional_executor(inputs=[unsorted_file], outputs=[sorted_file]).result()
+    with open(sorted_file) as f:
+        assert all(a == b for a, b in zip(f.readlines(), _exp_sorted))

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

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

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

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

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

@@ -419,7 +419,6 @@ parsl/tests/test_staging/test_staging_ftp.py
 parsl/tests/test_staging/test_staging_ftp_in_task.py
 parsl/tests/test_staging/test_staging_globus.py
 parsl/tests/test_staging/test_staging_https.py
-parsl/tests/test_staging/test_staging_https_in_task.py
 parsl/tests/test_threads/__init__.py
 parsl/tests/test_threads/test_configs.py
 parsl/tests/test_threads/test_lazy_errors.py

parsl-2024.1.1/parsl/tests/test_checkpointing/test_python_checkpoint_1.py

@@ -1,53 +0,0 @@
-import argparse
-import os
-import pytest
-
-import parsl
-from parsl import python_app
-from parsl.tests.configs.local_threads import fresh_config
-
-
-@python_app(cache=True)
-def random_app(i):
-    import random
-    return random.randint(i, 100000)
-
-
-def launch_n_random(n=2):
-    """1. Launch a few apps and write the checkpoint once a few have completed
-    """
-
-    d = [random_app(i) for i in range(0, n)]
-    print("Done launching")
-
-    # Block till done
-    return [i.result() for i in d]
-
-
-@pytest.mark.local
-def test_initial_checkpoint_write(n=2):
-    """1. Launch a few apps and write the checkpoint once a few have completed
-    """
-    config = fresh_config()
-    config.checkpoint_mode = 'manual'
-    parsl.load(config)
-    results = launch_n_random(n)
-
-    cpt_dir = parsl.dfk().checkpoint()
-
-    cptpath = cpt_dir + '/dfk.pkl'
-    print("Path exists : ", os.path.exists(cptpath))
-    assert os.path.exists(
-        cptpath), "DFK checkpoint missing: {0}".format(cptpath)
-
-    cptpath = cpt_dir + '/tasks.pkl'
-    print("Path exists : ", os.path.exists(cptpath))
-    assert os.path.exists(
-        cptpath), "Tasks checkpoint missing: {0}".format(cptpath)
-
-    run_dir = parsl.dfk().run_dir
-
-    parsl.dfk().cleanup()
-    parsl.clear()
-
-    return run_dir, results

parsl-2024.1.1/parsl/tests/test_checkpointing/test_python_checkpoint_2.py

@@ -1,45 +0,0 @@
-import argparse
-import os
-import pytest
-import parsl
-from parsl import python_app
-
-from parsl.tests.configs.local_threads import config
-from parsl.tests.configs.local_threads_checkpoint import fresh_config
-
-
-@python_app(cache=True)
-def random_app(i):
-    import random
-    return random.randint(i, 100000)
-
-
-def launch_n_random(n=2):
-    """1. Launch a few apps and write the checkpoint once a few have completed
-    """
-    d = [random_app(i) for i in range(0, n)]
-    return [i.result() for i in d]
-
-
-@pytest.mark.local
-def test_loading_checkpoint(n=2):
-    """Load memoization table from previous checkpoint
-    """
-    config.checkpoint_mode = 'task_exit'
-    parsl.load(config)
-    results = launch_n_random(n)
-    rundir = parsl.dfk().run_dir
-    parsl.dfk().cleanup()
-    parsl.clear()
-
-    local_config = fresh_config()
-    local_config.checkpoint_files = [os.path.join(rundir, 'checkpoint')]
-    parsl.load(local_config)
-
-    relaunched = launch_n_random(n)
-    assert len(relaunched) == len(results) == n, "Expected all results to have n items"
-
-    for i in range(n):
-        assert relaunched[i] == results[i], "Expected relaunched to contain cached results from first run"
-    parsl.dfk().cleanup()
-    parsl.clear()