diff --git a/executorlib/interfaces/flux.py b/executorlib/interfaces/flux.py index aef96410..2aadc3e2 100644 --- a/executorlib/interfaces/flux.py +++ b/executorlib/interfaces/flux.py @@ -11,7 +11,6 @@ check_oversubscribe, check_plot_dependency_graph, check_pmi, - check_pysqa_config_directory, check_refresh_rate, validate_number_of_cores, ) @@ -396,8 +395,7 @@ def __new__( init_function=init_function, disable_dependencies=disable_dependencies, ) - elif not disable_dependencies: - check_pysqa_config_directory(pysqa_config_directory=pysqa_config_directory) + else: return ExecutorWithDependencies( executor=create_flux_executor( max_workers=max_workers, @@ -417,23 +415,6 @@ def __new__( plot_dependency_graph=plot_dependency_graph, plot_dependency_graph_filename=plot_dependency_graph_filename, ) - else: - check_pysqa_config_directory(pysqa_config_directory=pysqa_config_directory) - check_plot_dependency_graph(plot_dependency_graph=plot_dependency_graph) - check_refresh_rate(refresh_rate=refresh_rate) - return create_flux_executor( - max_workers=max_workers, - cache_directory=cache_directory, - max_cores=max_cores, - resource_dict=resource_dict, - flux_executor=None, - flux_executor_pmi_mode=None, - flux_executor_nesting=False, - flux_log_files=False, - hostname_localhost=hostname_localhost, - block_allocation=block_allocation, - init_function=init_function, - ) def create_flux_executor( diff --git a/executorlib/interfaces/slurm.py b/executorlib/interfaces/slurm.py index afde3b2f..c1132866 100644 --- a/executorlib/interfaces/slurm.py +++ b/executorlib/interfaces/slurm.py @@ -12,7 +12,6 @@ from executorlib.standalone.inputcheck import ( check_init_function, check_plot_dependency_graph, - check_pysqa_config_directory, check_refresh_rate, validate_number_of_cores, ) @@ -188,8 +187,7 @@ def __new__( init_function=init_function, disable_dependencies=disable_dependencies, ) - elif not disable_dependencies: - check_pysqa_config_directory(pysqa_config_directory=pysqa_config_directory) + else: return ExecutorWithDependencies( executor=create_slurm_executor( max_workers=max_workers, @@ -205,19 +203,6 @@ def __new__( plot_dependency_graph=plot_dependency_graph, plot_dependency_graph_filename=plot_dependency_graph_filename, ) - else: - check_pysqa_config_directory(pysqa_config_directory=pysqa_config_directory) - check_plot_dependency_graph(plot_dependency_graph=plot_dependency_graph) - check_refresh_rate(refresh_rate=refresh_rate) - return create_slurm_executor( - max_workers=max_workers, - cache_directory=cache_directory, - max_cores=max_cores, - resource_dict=resource_dict, - hostname_localhost=hostname_localhost, - block_allocation=block_allocation, - init_function=init_function, - ) class SlurmAllocationExecutor: