From d553fe8ffc9931201f8d41d795b089d0cdeeb3a0 Mon Sep 17 00:00:00 2001 From: Anton Reinhard Date: Mon, 19 Aug 2024 14:54:34 +0200 Subject: [PATCH] Reenable ABC Model --- src/MetagraphOptimization.jl | 5 +---- src/QEDprocesses_patch.jl | 12 ------------ src/models/physics_models/abc/compute.jl | 6 ------ src/models/physics_models/qed/utility.jl | 14 ++++++++++++++ src/node/validate.jl | 6 ------ 5 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 src/QEDprocesses_patch.jl create mode 100644 src/models/physics_models/qed/utility.jl diff --git a/src/MetagraphOptimization.jl b/src/MetagraphOptimization.jl index 6c1ff9d..891474a 100644 --- a/src/MetagraphOptimization.jl +++ b/src/MetagraphOptimization.jl @@ -110,8 +110,6 @@ import Base.delete! import Base.insert! import Base.collect -include("QEDprocesses_patch.jl") - include("devices/interface.jl") include("task/type.jl") include("node/type.jl") @@ -171,7 +169,6 @@ include("models/print.jl") include("models/physics_models/interface.jl") -#= include("models/physics_models/abc/types.jl") include("models/physics_models/abc/particle.jl") include("models/physics_models/abc/compute.jl") @@ -179,8 +176,8 @@ include("models/physics_models/abc/create.jl") include("models/physics_models/abc/properties.jl") include("models/physics_models/abc/parse.jl") include("models/physics_models/abc/print.jl") -=# +include("models/physics_models/qed/utility.jl") include("models/physics_models/qed/types.jl") include("models/physics_models/qed/particle.jl") include("models/physics_models/qed/diagrams.jl") diff --git a/src/QEDprocesses_patch.jl b/src/QEDprocesses_patch.jl deleted file mode 100644 index b982467..0000000 --- a/src/QEDprocesses_patch.jl +++ /dev/null @@ -1,12 +0,0 @@ -# patch QEDprocesses -# see issue https://github.com/QEDjl-project/QEDprocesses.jl/issues/77 -@inline function QEDprocesses.number_particles( - proc_def::QEDbase.AbstractProcessDefinition, ::Type{PS} -) where { - DIR<:QEDbase.ParticleDirection, - PT<:QEDbase.AbstractParticleType, - EL<:AbstractFourMomentum, - PS<:ParticleStateful{DIR,PT,EL}, -} - return QEDprocesses.number_particles(proc_def, DIR(), PT()) -end diff --git a/src/models/physics_models/abc/compute.jl b/src/models/physics_models/abc/compute.jl index 8e21a4e..9641e8a 100644 --- a/src/models/physics_models/abc/compute.jl +++ b/src/models/physics_models/abc/compute.jl @@ -85,12 +85,6 @@ Linearly many FLOP with growing data. """ function compute(::ComputeTaskABC_Sum, data...)::Float64 return sum_kbn([data...]) - - #=s = 0.0im - for d in data - s += d - end - return s=# end function compute(::ComputeTaskABC_Sum, data::AbstractArray)::Float64 diff --git a/src/models/physics_models/qed/utility.jl b/src/models/physics_models/qed/utility.jl new file mode 100644 index 0000000..1d175ae --- /dev/null +++ b/src/models/physics_models/qed/utility.jl @@ -0,0 +1,14 @@ +using QEDprocesses + +# add type overload for number_particles function +@inline function QEDprocesses.number_particles( + proc_def::QEDbase.AbstractProcessDefinition, + ::Type{PS}, +) where { + DIR <: QEDbase.ParticleDirection, + PT <: QEDbase.AbstractParticleType, + EL <: AbstractFourMomentum, + PS <: ParticleStateful{DIR, PT, EL}, +} + return QEDprocesses.number_particles(proc_def, DIR(), PT()) +end diff --git a/src/node/validate.jl b/src/node/validate.jl index 9fec759..54e4907 100644 --- a/src/node/validate.jl +++ b/src/node/validate.jl @@ -29,12 +29,6 @@ function is_valid_node(graph::DAG, node::Node) @assert is_valid(graph, node.nodeSplit) end=# - # every child must be in some input of the task - for child in node.children - str = Symbol(to_var_name(child.id)) - @assert (str in task(node).t1_inputs) || (str in task(node).t2_inputs) "$str was not in any of the tasks' inputs\nt1_inputs: $(task(node).t1_inputs)\nt2_inputs: $(task(node).t2_inputs)" - end - return true end