Skip to content

Commit 113061d

Browse files
authored
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
1 parent 63387f1 commit 113061d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+4
-119
lines changed

parsl/channels/__init__.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

parsl/channels/base.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

parsl/channels/local/__init__.py

Whitespace-only changes.

parsl/channels/local/local.py

Lines changed: 0 additions & 10 deletions
This file was deleted.

parsl/configs/cc_in2p3.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from parsl.channels import LocalChannel
21
from parsl.config import Config
32
from parsl.executors import HighThroughputExecutor
43
from parsl.providers import GridEngineProvider
@@ -10,7 +9,6 @@
109
label='cc_in2p3_htex',
1110
max_workers_per_node=2,
1211
provider=GridEngineProvider(
13-
channel=LocalChannel(),
1412
nodes_per_block=1,
1513
init_blocks=2,
1614
max_blocks=2,

parsl/configs/frontera.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from parsl.channels import LocalChannel
21
from parsl.config import Config
32
from parsl.executors import HighThroughputExecutor
43
from parsl.launchers import SrunLauncher
@@ -15,7 +14,6 @@
1514
max_workers_per_node=1, # Set number of workers per node
1615
provider=SlurmProvider(
1716
cmd_timeout=60, # Add extra time for slow scheduler responses
18-
channel=LocalChannel(),
1917
nodes_per_block=2,
2018
init_blocks=1,
2119
min_blocks=1,

parsl/configs/htex_local.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from parsl.channels import LocalChannel
21
from parsl.config import Config
32
from parsl.executors import HighThroughputExecutor
43
from parsl.providers import LocalProvider
@@ -10,7 +9,6 @@
109
label="htex_local",
1110
cores_per_worker=1,
1211
provider=LocalProvider(
13-
channel=LocalChannel(),
1412
init_blocks=1,
1513
max_blocks=1,
1614
),

parsl/providers/cluster_provider.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ class ClusterProvider(ExecutionProvider):
1818
----------
1919
label : str
2020
Label for this provider.
21-
channel : Channel
22-
Channel for accessing this provider.
2321
walltime : str
2422
Walltime requested per block in HH:MM:SS.
2523
launcher : Launcher
@@ -45,7 +43,6 @@ class ClusterProvider(ExecutionProvider):
4543

4644
def __init__(self,
4745
label,
48-
channel,
4946
nodes_per_block,
5047
init_blocks,
5148
min_blocks,
@@ -56,7 +53,6 @@ def __init__(self,
5653
cmd_timeout=10):
5754

5855
self._label = label
59-
self.channel = channel
6056
self.nodes_per_block = nodes_per_block
6157
self.init_blocks = init_blocks
6258
self.min_blocks = min_blocks

parsl/providers/condor/condor.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import typeguard
77

8-
from parsl.channels import LocalChannel
98
from parsl.jobs.states import JobState, JobStatus
109
from parsl.launchers import SingleNodeLauncher
1110
from parsl.launchers.base import Launcher
@@ -18,8 +17,6 @@
1817

1918
from typing import Dict, List, Optional
2019

21-
from parsl.channels.base import Channel
22-
2320
# See http://pages.cs.wisc.edu/~adesmet/status.html
2421
translate_table = {
2522
'1': JobState.PENDING,
@@ -36,8 +33,6 @@ class CondorProvider(RepresentationMixin, ClusterProvider):
3633
3734
Parameters
3835
----------
39-
channel : Channel
40-
Channel for accessing this provider.
4136
nodes_per_block : int
4237
Nodes to provision per block.
4338
cores_per_slot : int
@@ -79,7 +74,6 @@ class CondorProvider(RepresentationMixin, ClusterProvider):
7974
"""
8075
@typeguard.typechecked
8176
def __init__(self,
82-
channel: Channel = LocalChannel(),
8377
nodes_per_block: int = 1,
8478
cores_per_slot: Optional[int] = None,
8579
mem_per_slot: Optional[float] = None,
@@ -100,7 +94,6 @@ def __init__(self,
10094

10195
label = 'condor'
10296
super().__init__(label,
103-
channel,
10497
nodes_per_block,
10598
init_blocks,
10699
min_blocks,

parsl/providers/grid_engine/grid_engine.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import os
33
import time
44

5-
from parsl.channels import LocalChannel
65
from parsl.jobs.states import JobState, JobStatus
76
from parsl.launchers import SingleNodeLauncher
87
from parsl.providers.cluster_provider import ClusterProvider
@@ -36,8 +35,6 @@ class GridEngineProvider(ClusterProvider, RepresentationMixin):
3635
3736
Parameters
3837
----------
39-
channel : Channel
40-
Channel for accessing this provider.
4138
nodes_per_block : int
4239
Nodes to provision per block.
4340
min_blocks : int
@@ -62,7 +59,6 @@ class GridEngineProvider(ClusterProvider, RepresentationMixin):
6259
"""
6360

6461
def __init__(self,
65-
channel=LocalChannel(),
6662
nodes_per_block=1,
6763
init_blocks=1,
6864
min_blocks=0,
@@ -76,7 +72,6 @@ def __init__(self,
7672
queue=None):
7773
label = 'grid_engine'
7874
super().__init__(label,
79-
channel,
8075
nodes_per_block,
8176
init_blocks,
8277
min_blocks,

0 commit comments

Comments
 (0)