Skip to content

Commit

Permalink
Use required arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
JMGaljaard committed Sep 18, 2022
1 parent 22f4aba commit 652d459
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
13 changes: 6 additions & 7 deletions fltk/launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def exec_distributed_client(task_id: str, conf: DistributedConfig = None,
print(epoch_data)


def get_arrival_generator_args(conf: DistributedConfig, replication: int) -> Tuple[List[Any], Dict[str, Any]]:
def get_arrival_generator_args(conf: DistributedConfig, replication: int) -> List[Any]:
"""
Function to get arrival generator arguments based on current configuration of Orchestrator.
@param conf:
Expand All @@ -74,10 +74,10 @@ def get_arrival_generator_args(conf: DistributedConfig, replication: int) -> Tup
@return: Configuration for args and kwargs for the generator.
@rtype: Tuple[List[Any], Dict[str, Any]]
"""
args, kwargs = [conf.get_duration()], {}
args = [conf.get_duration()]
if conf.cluster_config.orchestrator.orchestrator_type == OrchestratorType.BATCH:
kwargs['seed'] = conf.execution_config.reproducibility.seeds[replication]
return args, kwargs
args.append(conf.execution_config.reproducibility.seeds[replication])
return args


def exec_orchestrator(args: Namespace = None, conf: DistributedConfig = None, replication: int = 0):
Expand Down Expand Up @@ -116,8 +116,8 @@ def exec_orchestrator(args: Namespace = None, conf: DistributedConfig = None, re
pool.apply(cluster_manager.start)

logging.info("Starting arrival generator")
arv_gen_args, arv_gen_kwargs = get_arrival_generator_args(conf, replication)
pool.apply_async(arrival_generator.start, args=arv_gen_args, kwds=arv_gen_kwargs)
arv_gen_args = get_arrival_generator_args(conf, replication)
pool.apply_async(arrival_generator.start, args=arv_gen_args)
logging.info("Starting orchestrator")
pool.apply(orchestrator.run, kwds={"experiment_replication": replication})

Expand Down Expand Up @@ -294,7 +294,6 @@ def launch_remote(arg_path: Path, conf_path: Path, rank: Rank, nic: Optional[NIC
rank=rank,
world_size=r_conf.world_size,
rpc_backend_options=options

)
federator_node = Federator('federator', 0, r_conf.world_size, r_conf)
federator_node.run()
Expand Down
9 changes: 5 additions & 4 deletions fltk/util/task/generator/arrival_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def load_config(self):
self.job_dict = collections.OrderedDict(
{f'train_job_{indx}': item for indx, item in enumerate(experiment_descriptions.train_tasks)})

def start(self, args: List[Any], kwds: Dict[str, Any]):
def start(self, duration, seed):
"""
Function to start arrival generator, requires to
@param args: List of arguments to pass to the arrival generator at generation time.
Expand All @@ -61,7 +61,7 @@ def start(self, args: List[Any], kwds: Dict[str, Any]):
self.set_logger()
self.logger.info("Starting execution of arrival generator.")
self.alive = True
self.run(*args, **kwds)
self.run(duration, seed)

def stop(self) -> None:
"""
Expand All @@ -73,7 +73,7 @@ def stop(self) -> None:
self.alive = False

@abstractmethod
def run(self, duration: float, seed: Optional[int] = None) -> None:
def run(self, duration: float, seed: int) -> None:
"""
Abstract function to run experiment generator for a specified time duration.
@param duration: Time in seconds to run experiment generation.
Expand Down Expand Up @@ -270,10 +270,11 @@ def run(self, duration: float, seed: Optional[int] = None) -> None:
replication_name = f"{job_name}_{repl}_{seed}"
train_task = TrainTask(identity=replication_name,
job_parameters=job_class_param,
priority=description.priority,
priority=None,
replication=repl,
experiment_type=description.experiment_type,
seed=seed)

arrival = Arrival(None, train_task, job_name)
self.logger.info(f"(Sequentially) generate experiment: {replication_name}")
self.arrivals.put(arrival)

0 comments on commit 652d459

Please sign in to comment.