From f541a1f9addffb74f8b5cc60ccde261f4b543f54 Mon Sep 17 00:00:00 2001 From: singularitti Date: Fri, 16 Jun 2023 06:07:33 -0400 Subject: [PATCH 1/2] Change `prepare!` for `AbstractJob` instead of `Executor`s --- EasyJobsBase/src/run.jl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/EasyJobsBase/src/run.jl b/EasyJobsBase/src/run.jl index f92cf89..aba4c96 100644 --- a/EasyJobsBase/src/run.jl +++ b/EasyJobsBase/src/run.jl @@ -119,15 +119,15 @@ function _run!(job::AbstractJob) # Do not export! return job end -prepare!(::Executor) = nothing # No op -function prepare!(exec::Executor{ArgDependentJob}) +prepare!(::AbstractJob) = nothing # No op +function prepare!(job::ArgDependentJob) # Use previous results as arguments - args = if countparents(exec.job) == 1 - something(getresult(only(eachparent(exec.job)))) + args = if countparents(job) == 1 + something(getresult(only(eachparent(job)))) else # > 1 - Set(something(getresult(parent)) for parent in eachparent(exec.job)) + Set(something(getresult(parent)) for parent in eachparent(job)) end - setargs!(exec.job.core, args) + setargs!(job.core, args) return nothing end From a95d8ba603e4af6cdf2d3afe39d3f33a903b6d00 Mon Sep 17 00:00:00 2001 From: singularitti Date: Fri, 16 Jun 2023 06:07:43 -0400 Subject: [PATCH 2/2] Change `shouldrun` for `AbstractJob` instead of `Executor`s --- EasyJobsBase/src/run.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EasyJobsBase/src/run.jl b/EasyJobsBase/src/run.jl index aba4c96..0325010 100644 --- a/EasyJobsBase/src/run.jl +++ b/EasyJobsBase/src/run.jl @@ -131,9 +131,9 @@ function prepare!(job::ArgDependentJob) return nothing end -shouldrun(::Executor) = true -shouldrun(exec::Executor{ConditionalJob}) = - countparents(exec.job) >= 1 && all(issucceeded(parent) for parent in exec.job.parents) +shouldrun(::AbstractJob) = true +shouldrun(job::ConditionalJob) = + countparents(job) >= 1 && all(issucceeded(parent) for parent in eachparent(job)) """ kill!(exec::Executor)