From 113061dde91f736488159ac3701f680990efcb00 Mon Sep 17 00:00:00 2001 From: Ben Clifford Date: Wed, 4 Dec 2024 15:32:35 +0000 Subject: [PATCH] Remove channel classes and parameters (#3716) Before this PR, all channel functionality was removed and the channel classes and config parameters remained as stubs waiting to be removed. This PR removes them. # Changed Behaviour Any place that a user is specifying `channel=LocalChannel()` in their configuration will now break. That option can be removed by the user because that option should not have any effect in the codebase immediately prior to this PR. ## Type of change - Code maintenance/cleanup --- parsl/channels/__init__.py | 4 ---- parsl/channels/base.py | 5 ----- parsl/channels/local/__init__.py | 0 parsl/channels/local/local.py | 10 ---------- parsl/configs/cc_in2p3.py | 2 -- parsl/configs/frontera.py | 2 -- parsl/configs/htex_local.py | 2 -- parsl/providers/cluster_provider.py | 4 ---- parsl/providers/condor/condor.py | 7 ------- parsl/providers/grid_engine/grid_engine.py | 5 ----- parsl/providers/local/local.py | 3 --- parsl/providers/lsf/lsf.py | 5 ----- parsl/providers/pbspro/pbspro.py | 7 +------ parsl/providers/slurm/slurm.py | 6 ------ parsl/providers/torque/torque.py | 6 ------ parsl/tests/configs/cc_in2p3.py | 2 -- parsl/tests/configs/frontera.py | 2 -- parsl/tests/configs/htex_local.py | 2 -- parsl/tests/configs/htex_local_alternate.py | 2 -- parsl/tests/configs/htex_local_intask_staging.py | 2 -- parsl/tests/configs/htex_local_rsync_staging.py | 2 -- parsl/tests/configs/slurm_local.py | 2 -- parsl/tests/manual_tests/htex_local.py | 2 -- parsl/tests/manual_tests/test_memory_limits.py | 2 -- parsl/tests/scaling_tests/htex_local.py | 2 -- parsl/tests/sites/test_affinity.py | 2 -- parsl/tests/sites/test_worker_info.py | 2 -- parsl/tests/test_htex/test_drain.py | 2 -- .../tests/test_htex/test_manager_selector_by_block.py | 2 -- .../test_htex_init_blocks_vs_monitoring.py | 2 -- parsl/tests/test_providers/test_local_provider.py | 3 +-- parsl/tests/test_providers/test_pbspro_template.py | 3 +-- parsl/tests/test_providers/test_slurm_template.py | 3 +-- parsl/tests/test_scaling/test_regression_1621.py | 2 -- .../test_regression_3568_scaledown_vs_MISSING.py | 1 - parsl/tests/test_scaling/test_scale_down.py | 2 -- .../test_scaling/test_scale_down_htex_auto_scale.py | 2 -- .../test_scaling/test_scale_down_htex_unregistered.py | 2 -- parsl/tests/test_scaling/test_shutdown_scalein.py | 2 -- .../test_worker_interchange_bad_messages_3262.py | 2 -- parsl/tests/test_staging/test_zip_in.py | 1 - parsl/tests/test_staging/test_zip_out.py | 1 - parsl/tests/test_staging/test_zip_to_zip.py | 1 - 43 files changed, 4 insertions(+), 119 deletions(-) delete mode 100644 parsl/channels/__init__.py delete mode 100644 parsl/channels/base.py delete mode 100644 parsl/channels/local/__init__.py delete mode 100644 parsl/channels/local/local.py diff --git a/parsl/channels/__init__.py b/parsl/channels/__init__.py deleted file mode 100644 index c81f6a8bf1..0000000000 --- a/parsl/channels/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from parsl.channels.base import Channel -from parsl.channels.local.local import LocalChannel - -__all__ = ['Channel', 'LocalChannel'] diff --git a/parsl/channels/base.py b/parsl/channels/base.py deleted file mode 100644 index 4ba3b4e02c..0000000000 --- a/parsl/channels/base.py +++ /dev/null @@ -1,5 +0,0 @@ -from abc import ABCMeta - - -class Channel(metaclass=ABCMeta): - pass diff --git a/parsl/channels/local/__init__.py b/parsl/channels/local/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/parsl/channels/local/local.py b/parsl/channels/local/local.py deleted file mode 100644 index 61d8dea17a..0000000000 --- a/parsl/channels/local/local.py +++ /dev/null @@ -1,10 +0,0 @@ -import logging - -from parsl.channels.base import Channel -from parsl.utils import RepresentationMixin - -logger = logging.getLogger(__name__) - - -class LocalChannel(Channel, RepresentationMixin): - pass diff --git a/parsl/configs/cc_in2p3.py b/parsl/configs/cc_in2p3.py index 631d76f9f5..f0140da55a 100644 --- a/parsl/configs/cc_in2p3.py +++ b/parsl/configs/cc_in2p3.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.providers import GridEngineProvider @@ -10,7 +9,6 @@ label='cc_in2p3_htex', max_workers_per_node=2, provider=GridEngineProvider( - channel=LocalChannel(), nodes_per_block=1, init_blocks=2, max_blocks=2, diff --git a/parsl/configs/frontera.py b/parsl/configs/frontera.py index a7b6f27b6c..25682bbe86 100644 --- a/parsl/configs/frontera.py +++ b/parsl/configs/frontera.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SrunLauncher @@ -15,7 +14,6 @@ max_workers_per_node=1, # Set number of workers per node provider=SlurmProvider( cmd_timeout=60, # Add extra time for slow scheduler responses - channel=LocalChannel(), nodes_per_block=2, init_blocks=1, min_blocks=1, diff --git a/parsl/configs/htex_local.py b/parsl/configs/htex_local.py index 721dea767e..57549a4728 100644 --- a/parsl/configs/htex_local.py +++ b/parsl/configs/htex_local.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.providers import LocalProvider @@ -10,7 +9,6 @@ label="htex_local", cores_per_worker=1, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=1, ), diff --git a/parsl/providers/cluster_provider.py b/parsl/providers/cluster_provider.py index f2feb2ddf3..db7ef9eaac 100644 --- a/parsl/providers/cluster_provider.py +++ b/parsl/providers/cluster_provider.py @@ -18,8 +18,6 @@ class ClusterProvider(ExecutionProvider): ---------- label : str Label for this provider. - channel : Channel - Channel for accessing this provider. walltime : str Walltime requested per block in HH:MM:SS. launcher : Launcher @@ -45,7 +43,6 @@ class ClusterProvider(ExecutionProvider): def __init__(self, label, - channel, nodes_per_block, init_blocks, min_blocks, @@ -56,7 +53,6 @@ def __init__(self, cmd_timeout=10): self._label = label - self.channel = channel self.nodes_per_block = nodes_per_block self.init_blocks = init_blocks self.min_blocks = min_blocks diff --git a/parsl/providers/condor/condor.py b/parsl/providers/condor/condor.py index 72fd5aa243..150c72dfe7 100644 --- a/parsl/providers/condor/condor.py +++ b/parsl/providers/condor/condor.py @@ -5,7 +5,6 @@ import typeguard -from parsl.channels import LocalChannel from parsl.jobs.states import JobState, JobStatus from parsl.launchers import SingleNodeLauncher from parsl.launchers.base import Launcher @@ -18,8 +17,6 @@ from typing import Dict, List, Optional -from parsl.channels.base import Channel - # See http://pages.cs.wisc.edu/~adesmet/status.html translate_table = { '1': JobState.PENDING, @@ -36,8 +33,6 @@ class CondorProvider(RepresentationMixin, ClusterProvider): Parameters ---------- - channel : Channel - Channel for accessing this provider. nodes_per_block : int Nodes to provision per block. cores_per_slot : int @@ -79,7 +74,6 @@ class CondorProvider(RepresentationMixin, ClusterProvider): """ @typeguard.typechecked def __init__(self, - channel: Channel = LocalChannel(), nodes_per_block: int = 1, cores_per_slot: Optional[int] = None, mem_per_slot: Optional[float] = None, @@ -100,7 +94,6 @@ def __init__(self, label = 'condor' super().__init__(label, - channel, nodes_per_block, init_blocks, min_blocks, diff --git a/parsl/providers/grid_engine/grid_engine.py b/parsl/providers/grid_engine/grid_engine.py index 795f1946b4..b01e86cd5d 100644 --- a/parsl/providers/grid_engine/grid_engine.py +++ b/parsl/providers/grid_engine/grid_engine.py @@ -2,7 +2,6 @@ import os import time -from parsl.channels import LocalChannel from parsl.jobs.states import JobState, JobStatus from parsl.launchers import SingleNodeLauncher from parsl.providers.cluster_provider import ClusterProvider @@ -36,8 +35,6 @@ class GridEngineProvider(ClusterProvider, RepresentationMixin): Parameters ---------- - channel : Channel - Channel for accessing this provider. nodes_per_block : int Nodes to provision per block. min_blocks : int @@ -62,7 +59,6 @@ class GridEngineProvider(ClusterProvider, RepresentationMixin): """ def __init__(self, - channel=LocalChannel(), nodes_per_block=1, init_blocks=1, min_blocks=0, @@ -76,7 +72,6 @@ def __init__(self, queue=None): label = 'grid_engine' super().__init__(label, - channel, nodes_per_block, init_blocks, min_blocks, diff --git a/parsl/providers/local/local.py b/parsl/providers/local/local.py index 6357c85cba..55994c31c3 100644 --- a/parsl/providers/local/local.py +++ b/parsl/providers/local/local.py @@ -2,7 +2,6 @@ import os import time -from parsl.channels import LocalChannel from parsl.jobs.states import JobState, JobStatus from parsl.launchers import SingleNodeLauncher from parsl.providers.base import ExecutionProvider @@ -37,7 +36,6 @@ class LocalProvider(ExecutionProvider, RepresentationMixin): """ def __init__(self, - channel=LocalChannel(), nodes_per_block=1, launcher=SingleNodeLauncher(), init_blocks=1, @@ -46,7 +44,6 @@ def __init__(self, worker_init='', cmd_timeout=30, parallelism=1): - self.channel = channel self._label = 'local' self.nodes_per_block = nodes_per_block self.launcher = launcher diff --git a/parsl/providers/lsf/lsf.py b/parsl/providers/lsf/lsf.py index dced93831b..f2d3f88652 100644 --- a/parsl/providers/lsf/lsf.py +++ b/parsl/providers/lsf/lsf.py @@ -3,7 +3,6 @@ import os import time -from parsl.channels import LocalChannel from parsl.jobs.states import JobState, JobStatus from parsl.launchers import SingleNodeLauncher from parsl.providers.cluster_provider import ClusterProvider @@ -32,8 +31,6 @@ class LSFProvider(ClusterProvider, RepresentationMixin): Parameters ---------- - channel : Channel - Channel for accessing this provider. nodes_per_block : int Nodes to provision per block. When request_by_nodes is False, it is computed by cores_per_block / cores_per_node. @@ -77,7 +74,6 @@ class LSFProvider(ClusterProvider, RepresentationMixin): """ def __init__(self, - channel=LocalChannel(), nodes_per_block=1, cores_per_block=None, cores_per_node=None, @@ -96,7 +92,6 @@ def __init__(self, launcher=SingleNodeLauncher()): label = 'LSF' super().__init__(label, - channel, nodes_per_block, init_blocks, min_blocks, diff --git a/parsl/providers/pbspro/pbspro.py b/parsl/providers/pbspro/pbspro.py index b02237a226..aa2e5e2f54 100644 --- a/parsl/providers/pbspro/pbspro.py +++ b/parsl/providers/pbspro/pbspro.py @@ -3,7 +3,6 @@ import os import time -from parsl.channels import LocalChannel from parsl.jobs.states import JobState, JobStatus from parsl.launchers import SingleNodeLauncher from parsl.providers.pbspro.template import template_string @@ -17,8 +16,6 @@ class PBSProProvider(TorqueProvider): Parameters ---------- - channel : Channel - Channel for accessing this provider. account : str Account the job will be charged against. queue : str @@ -51,7 +48,6 @@ class PBSProProvider(TorqueProvider): :class:`~parsl.launchers.SingleNodeLauncher`. """ def __init__(self, - channel=LocalChannel(), account=None, queue=None, scheduler_options='', @@ -66,8 +62,7 @@ def __init__(self, launcher=SingleNodeLauncher(), walltime="00:20:00", cmd_timeout=120): - super().__init__(channel, - account, + super().__init__(account, queue, scheduler_options, worker_init, diff --git a/parsl/providers/slurm/slurm.py b/parsl/providers/slurm/slurm.py index 92f1a31ad6..cf50058522 100644 --- a/parsl/providers/slurm/slurm.py +++ b/parsl/providers/slurm/slurm.py @@ -7,8 +7,6 @@ import typeguard -from parsl.channels import LocalChannel -from parsl.channels.base import Channel from parsl.jobs.states import JobState, JobStatus from parsl.launchers import SingleNodeLauncher from parsl.launchers.base import Launcher @@ -73,8 +71,6 @@ class SlurmProvider(ClusterProvider, RepresentationMixin): clusters : str Slurm cluster name, or comma seperated cluster list, used to choose between different clusters in a federated Slurm instance. If unspecified or ``None``, no slurm directive for clusters will be added. - channel : Channel - Channel for accessing this provider. nodes_per_block : int Nodes to provision per block. cores_per_node : int @@ -119,7 +115,6 @@ def __init__(self, qos: Optional[str] = None, constraint: Optional[str] = None, clusters: Optional[str] = None, - channel: Channel = LocalChannel(), nodes_per_block: int = 1, cores_per_node: Optional[int] = None, mem_per_node: Optional[int] = None, @@ -136,7 +131,6 @@ def __init__(self, launcher: Launcher = SingleNodeLauncher()): label = 'slurm' super().__init__(label, - channel, nodes_per_block, init_blocks, min_blocks, diff --git a/parsl/providers/torque/torque.py b/parsl/providers/torque/torque.py index c1c778a42a..6958c8348a 100644 --- a/parsl/providers/torque/torque.py +++ b/parsl/providers/torque/torque.py @@ -2,7 +2,6 @@ import os import time -from parsl.channels import LocalChannel from parsl.jobs.states import JobState, JobStatus from parsl.launchers import AprunLauncher from parsl.providers.cluster_provider import ClusterProvider @@ -33,8 +32,6 @@ class TorqueProvider(ClusterProvider, RepresentationMixin): Parameters ---------- - channel : Channel - Channel for accessing this provider. account : str Account the job will be charged against. queue : str @@ -65,7 +62,6 @@ class TorqueProvider(ClusterProvider, RepresentationMixin): """ def __init__(self, - channel=LocalChannel(), account=None, queue=None, scheduler_options='', @@ -80,7 +76,6 @@ def __init__(self, cmd_timeout=120): label = 'torque' super().__init__(label, - channel, nodes_per_block, init_blocks, min_blocks, @@ -170,7 +165,6 @@ def submit(self, command, tasks_per_node, job_name="parsl.torque"): tasks_per_node) job_config = {} - # TODO : script_path might need to change to accommodate script dir set via channels job_config["submit_script_dir"] = self.script_dir job_config["nodes"] = self.nodes_per_block job_config["task_blocks"] = self.nodes_per_block * tasks_per_node diff --git a/parsl/tests/configs/cc_in2p3.py b/parsl/tests/configs/cc_in2p3.py index 38c817cccd..5d9edf9d0c 100644 --- a/parsl/tests/configs/cc_in2p3.py +++ b/parsl/tests/configs/cc_in2p3.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.providers import GridEngineProvider @@ -14,7 +13,6 @@ def fresh_config(): max_workers_per_node=1, encrypted=True, provider=GridEngineProvider( - channel=LocalChannel(), nodes_per_block=2, init_blocks=2, max_blocks=2, diff --git a/parsl/tests/configs/frontera.py b/parsl/tests/configs/frontera.py index 537d6f78e0..41e2985e41 100644 --- a/parsl/tests/configs/frontera.py +++ b/parsl/tests/configs/frontera.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SrunLauncher @@ -20,7 +19,6 @@ def fresh_config(): encrypted=True, provider=SlurmProvider( cmd_timeout=60, # Add extra time for slow scheduler responses - channel=LocalChannel(), nodes_per_block=2, init_blocks=1, min_blocks=1, diff --git a/parsl/tests/configs/htex_local.py b/parsl/tests/configs/htex_local.py index 3dae57b758..712570b628 100644 --- a/parsl/tests/configs/htex_local.py +++ b/parsl/tests/configs/htex_local.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SimpleLauncher @@ -15,7 +14,6 @@ def fresh_config(): cores_per_worker=1, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=1, launcher=SimpleLauncher(), diff --git a/parsl/tests/configs/htex_local_alternate.py b/parsl/tests/configs/htex_local_alternate.py index 5667f3ff8c..cc69d56186 100644 --- a/parsl/tests/configs/htex_local_alternate.py +++ b/parsl/tests/configs/htex_local_alternate.py @@ -17,7 +17,6 @@ import os -from parsl.channels import LocalChannel from parsl.config import Config from parsl.data_provider.file_noop import NoOpFileStaging from parsl.data_provider.ftp import FTPInTaskStaging @@ -48,7 +47,6 @@ def fresh_config(): poll_period=100, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=0, min_blocks=0, max_blocks=5, diff --git a/parsl/tests/configs/htex_local_intask_staging.py b/parsl/tests/configs/htex_local_intask_staging.py index eef88ea2e1..69649b2bcb 100644 --- a/parsl/tests/configs/htex_local_intask_staging.py +++ b/parsl/tests/configs/htex_local_intask_staging.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.data_provider.file_noop import NoOpFileStaging from parsl.data_provider.ftp import FTPInTaskStaging @@ -15,7 +14,6 @@ cores_per_worker=1, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=1, launcher=SimpleLauncher(), diff --git a/parsl/tests/configs/htex_local_rsync_staging.py b/parsl/tests/configs/htex_local_rsync_staging.py index 044d2b9f89..d24b1da66b 100644 --- a/parsl/tests/configs/htex_local_rsync_staging.py +++ b/parsl/tests/configs/htex_local_rsync_staging.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.data_provider.ftp import FTPInTaskStaging from parsl.data_provider.http import HTTPInTaskStaging @@ -16,7 +15,6 @@ working_dir="./rsync-workdir/", encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=1, launcher=SimpleLauncher(), diff --git a/parsl/tests/configs/slurm_local.py b/parsl/tests/configs/slurm_local.py index 2a63f68e51..c0281cf340 100644 --- a/parsl/tests/configs/slurm_local.py +++ b/parsl/tests/configs/slurm_local.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SrunLauncher @@ -13,7 +12,6 @@ def fresh_config(): encrypted=True, provider=SlurmProvider( cmd_timeout=60, # Add extra time for slow scheduler responses - channel=LocalChannel(), nodes_per_block=1, init_blocks=1, min_blocks=1, diff --git a/parsl/tests/manual_tests/htex_local.py b/parsl/tests/manual_tests/htex_local.py index bcfdbf34ec..e85da878b1 100644 --- a/parsl/tests/manual_tests/htex_local.py +++ b/parsl/tests/manual_tests/htex_local.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor @@ -15,7 +14,6 @@ cores_per_worker=1, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=1, # tasks_per_node=1, # For HighThroughputExecutor, this option should in most cases be 1 diff --git a/parsl/tests/manual_tests/test_memory_limits.py b/parsl/tests/manual_tests/test_memory_limits.py index b353ba0929..f98a779e82 100644 --- a/parsl/tests/manual_tests/test_memory_limits.py +++ b/parsl/tests/manual_tests/test_memory_limits.py @@ -5,7 +5,6 @@ import parsl from parsl.app.app import python_app # , bash_app -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SingleNodeLauncher @@ -30,7 +29,6 @@ def test_simple(mem_per_worker): suppress_failure=True, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=1, launcher=SingleNodeLauncher(), diff --git a/parsl/tests/scaling_tests/htex_local.py b/parsl/tests/scaling_tests/htex_local.py index f2bcf86963..f16f46af23 100644 --- a/parsl/tests/scaling_tests/htex_local.py +++ b/parsl/tests/scaling_tests/htex_local.py @@ -1,4 +1,3 @@ -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.providers import LocalProvider @@ -12,7 +11,6 @@ max_workers_per_node=8, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=1, ), diff --git a/parsl/tests/sites/test_affinity.py b/parsl/tests/sites/test_affinity.py index 50d08ce830..792d490e03 100644 --- a/parsl/tests/sites/test_affinity.py +++ b/parsl/tests/sites/test_affinity.py @@ -5,7 +5,6 @@ import pytest from parsl import python_app -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.providers import LocalProvider @@ -22,7 +21,6 @@ def local_config(): available_accelerators=2, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=1, ), diff --git a/parsl/tests/sites/test_worker_info.py b/parsl/tests/sites/test_worker_info.py index 4d9865da84..e55064a507 100644 --- a/parsl/tests/sites/test_worker_info.py +++ b/parsl/tests/sites/test_worker_info.py @@ -3,7 +3,6 @@ import pytest from parsl import python_app -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.providers import LocalProvider @@ -18,7 +17,6 @@ def local_config(): max_workers_per_node=4, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=1, ), diff --git a/parsl/tests/test_htex/test_drain.py b/parsl/tests/test_htex/test_drain.py index efd0405863..663978f4c8 100644 --- a/parsl/tests/test_htex/test_drain.py +++ b/parsl/tests/test_htex/test_drain.py @@ -3,7 +3,6 @@ import pytest import parsl -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SimpleLauncher @@ -28,7 +27,6 @@ def local_config(): cores_per_worker=1, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, min_blocks=0, max_blocks=0, diff --git a/parsl/tests/test_htex/test_manager_selector_by_block.py b/parsl/tests/test_htex/test_manager_selector_by_block.py index 0933b581ff..1b2a4ee1f7 100644 --- a/parsl/tests/test_htex/test_manager_selector_by_block.py +++ b/parsl/tests/test_htex/test_manager_selector_by_block.py @@ -4,7 +4,6 @@ import parsl from parsl.app.app import bash_app, python_app -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.executors.high_throughput.manager_selector import ( @@ -31,7 +30,6 @@ def test_block_id_selection(try_assert): max_workers_per_node=1, manager_selector=BlockIdManagerSelector(), provider=LocalProvider( - channel=LocalChannel(), init_blocks=BLOCK_COUNT, max_blocks=BLOCK_COUNT, min_blocks=BLOCK_COUNT, diff --git a/parsl/tests/test_monitoring/test_htex_init_blocks_vs_monitoring.py b/parsl/tests/test_monitoring/test_htex_init_blocks_vs_monitoring.py index c54486f011..67db42671c 100644 --- a/parsl/tests/test_monitoring/test_htex_init_blocks_vs_monitoring.py +++ b/parsl/tests/test_monitoring/test_htex_init_blocks_vs_monitoring.py @@ -5,7 +5,6 @@ import pytest import parsl -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SimpleLauncher @@ -22,7 +21,6 @@ def fresh_config(run_dir, strategy, db_url): cores_per_worker=1, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, # min and max are set to 0 to ensure that we don't get # a block from ongoing strategy scaling, only from diff --git a/parsl/tests/test_providers/test_local_provider.py b/parsl/tests/test_providers/test_local_provider.py index 8d56d89ddf..c750814463 100644 --- a/parsl/tests/test_providers/test_local_provider.py +++ b/parsl/tests/test_providers/test_local_provider.py @@ -11,7 +11,6 @@ import pytest -from parsl.channels import LocalChannel from parsl.jobs.states import JobState from parsl.launchers import SingleNodeLauncher from parsl.providers import LocalProvider @@ -63,7 +62,7 @@ def _run_tests(p: LocalProvider): def test_local_channel(): with tempfile.TemporaryDirectory() as script_dir: script_dir = tempfile.mkdtemp() - p = LocalProvider(channel=LocalChannel(), launcher=SingleNodeLauncher(debug=False)) + p = LocalProvider(launcher=SingleNodeLauncher(debug=False)) p.script_dir = script_dir _run_tests(p) diff --git a/parsl/tests/test_providers/test_pbspro_template.py b/parsl/tests/test_providers/test_pbspro_template.py index ef9a642541..1264731120 100644 --- a/parsl/tests/test_providers/test_pbspro_template.py +++ b/parsl/tests/test_providers/test_pbspro_template.py @@ -3,7 +3,6 @@ import pytest -from parsl.channels import LocalChannel from parsl.providers import PBSProProvider @@ -12,7 +11,7 @@ def test_submit_script_basic(tmp_path): """Test slurm resources table""" provider = PBSProProvider( - queue="debug", channel=LocalChannel() + queue="debug" ) provider.script_dir = tmp_path job_id = str(random.randint(55000, 59000)) diff --git a/parsl/tests/test_providers/test_slurm_template.py b/parsl/tests/test_providers/test_slurm_template.py index ceedfa5ee8..55074fefe3 100644 --- a/parsl/tests/test_providers/test_slurm_template.py +++ b/parsl/tests/test_providers/test_slurm_template.py @@ -4,7 +4,6 @@ import pytest -from parsl.channels import LocalChannel from parsl.providers import SlurmProvider @@ -13,7 +12,7 @@ def test_submit_script_basic(tmp_path): """Test slurm resources table""" provider = SlurmProvider( - partition="debug", channel=LocalChannel() + partition="debug" ) provider.script_dir = tmp_path job_id = str(random.randint(55000, 59000)) diff --git a/parsl/tests/test_scaling/test_regression_1621.py b/parsl/tests/test_scaling/test_regression_1621.py index 5aec750068..ea7d8f2631 100644 --- a/parsl/tests/test_scaling/test_regression_1621.py +++ b/parsl/tests/test_scaling/test_regression_1621.py @@ -3,7 +3,6 @@ import pytest import parsl -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SimpleLauncher @@ -43,7 +42,6 @@ def test_one_block(tmpd_cwd): one app is invoked. this is a regression test. """ oneshot_provider = OneShotLocalProvider( - channel=LocalChannel(), init_blocks=0, min_blocks=0, max_blocks=10, diff --git a/parsl/tests/test_scaling/test_regression_3568_scaledown_vs_MISSING.py b/parsl/tests/test_scaling/test_regression_3568_scaledown_vs_MISSING.py index a56b53af10..0c4a474b19 100644 --- a/parsl/tests/test_scaling/test_regression_3568_scaledown_vs_MISSING.py +++ b/parsl/tests/test_scaling/test_regression_3568_scaledown_vs_MISSING.py @@ -3,7 +3,6 @@ import pytest import parsl -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import WrappedLauncher diff --git a/parsl/tests/test_scaling/test_scale_down.py b/parsl/tests/test_scaling/test_scale_down.py index 7fb72ba507..a53630374f 100644 --- a/parsl/tests/test_scaling/test_scale_down.py +++ b/parsl/tests/test_scaling/test_scale_down.py @@ -5,7 +5,6 @@ import parsl from parsl import File, python_app -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SingleNodeLauncher @@ -29,7 +28,6 @@ def local_config(): max_workers_per_node=1, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=0, max_blocks=_max_blocks, min_blocks=_min_blocks, diff --git a/parsl/tests/test_scaling/test_scale_down_htex_auto_scale.py b/parsl/tests/test_scaling/test_scale_down_htex_auto_scale.py index 016a51dc48..831bdf82af 100644 --- a/parsl/tests/test_scaling/test_scale_down_htex_auto_scale.py +++ b/parsl/tests/test_scaling/test_scale_down_htex_auto_scale.py @@ -4,7 +4,6 @@ import parsl from parsl import File, python_app -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SingleNodeLauncher @@ -26,7 +25,6 @@ def local_config(): max_workers_per_node=1, encrypted=True, provider=LocalProvider( - channel=LocalChannel(), init_blocks=0, max_blocks=_max_blocks, min_blocks=_min_blocks, diff --git a/parsl/tests/test_scaling/test_scale_down_htex_unregistered.py b/parsl/tests/test_scaling/test_scale_down_htex_unregistered.py index 529877eac7..90a9b9ff1b 100644 --- a/parsl/tests/test_scaling/test_scale_down_htex_unregistered.py +++ b/parsl/tests/test_scaling/test_scale_down_htex_unregistered.py @@ -5,7 +5,6 @@ import parsl from parsl import File, python_app -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.jobs.states import TERMINAL_STATES, JobState @@ -31,7 +30,6 @@ def local_config(): encrypted=True, launch_cmd="sleep inf", provider=LocalProvider( - channel=LocalChannel(), init_blocks=1, max_blocks=_max_blocks, min_blocks=_min_blocks, diff --git a/parsl/tests/test_scaling/test_shutdown_scalein.py b/parsl/tests/test_scaling/test_shutdown_scalein.py index 1d1557ebb1..2505c79aca 100644 --- a/parsl/tests/test_scaling/test_shutdown_scalein.py +++ b/parsl/tests/test_scaling/test_shutdown_scalein.py @@ -4,7 +4,6 @@ import pytest import parsl -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SimpleLauncher @@ -47,7 +46,6 @@ def test_shutdown_scalein_blocks(tmpd_cwd, try_assert): scaled in at DFK shutdown. """ accumulating_provider = AccumulatingLocalProvider( - channel=LocalChannel(), init_blocks=BLOCK_COUNT, min_blocks=0, max_blocks=0, diff --git a/parsl/tests/test_scaling/test_worker_interchange_bad_messages_3262.py b/parsl/tests/test_scaling/test_worker_interchange_bad_messages_3262.py index eee128634e..414f67cab6 100644 --- a/parsl/tests/test_scaling/test_worker_interchange_bad_messages_3262.py +++ b/parsl/tests/test_scaling/test_worker_interchange_bad_messages_3262.py @@ -6,7 +6,6 @@ import zmq import parsl -from parsl.channels import LocalChannel from parsl.config import Config from parsl.executors import HighThroughputExecutor from parsl.launchers import SimpleLauncher @@ -24,7 +23,6 @@ def fresh_config(): cores_per_worker=1, encrypted=False, provider=LocalProvider( - channel=LocalChannel(), init_blocks=0, min_blocks=0, max_blocks=0, diff --git a/parsl/tests/test_staging/test_zip_in.py b/parsl/tests/test_staging/test_zip_in.py index 1f74f7e11b..9d43a4ab49 100644 --- a/parsl/tests/test_staging/test_zip_in.py +++ b/parsl/tests/test_staging/test_zip_in.py @@ -4,7 +4,6 @@ import pytest import parsl -from parsl.channels import LocalChannel from parsl.config import Config from parsl.data_provider.files import File from parsl.data_provider.zip import ZipAuthorityError, ZipFileStaging diff --git a/parsl/tests/test_staging/test_zip_out.py b/parsl/tests/test_staging/test_zip_out.py index e369031033..79fbb504d5 100644 --- a/parsl/tests/test_staging/test_zip_out.py +++ b/parsl/tests/test_staging/test_zip_out.py @@ -3,7 +3,6 @@ import pytest import parsl -from parsl.channels import LocalChannel from parsl.config import Config from parsl.data_provider.data_manager import default_staging from parsl.data_provider.files import File diff --git a/parsl/tests/test_staging/test_zip_to_zip.py b/parsl/tests/test_staging/test_zip_to_zip.py index 2c78e3bec2..3fea42167c 100644 --- a/parsl/tests/test_staging/test_zip_to_zip.py +++ b/parsl/tests/test_staging/test_zip_to_zip.py @@ -4,7 +4,6 @@ import pytest import parsl -from parsl.channels import LocalChannel from parsl.config import Config from parsl.data_provider.files import File from parsl.data_provider.zip import ZipAuthorityError, ZipFileStaging