Skip to content

fix: repair duplicate form-constraint @warn (UndefVarError opt) #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bvdmitri merged 2 commits into from
Sep 21, 2026
Merged

fix: repair duplicate form-constraint @warn (UndefVarError opt) #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
438519a
fix: repair duplicate form-constraint @warn (UndefVarError opt)
docxology Aug 2, 2026
4b15a8e
fix: report the existing constraint in the duplicate-form-constraint …
bvdmitri Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/plugins/variational_constraints/variational_constraints_engine.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ function apply_constraints!(
applicable_nodes = unroll_nocreate(context[getvariables(marginal_constraint)])
for node in applicable_nodes
if hasextra(model[node], VariationalConstraintsMarginalFormConstraintKey)
@warn lazy"Node $node already has functional form constraint $(opt[:q]) applied, therefore $constraint_data will not be applied"
@warn lazy"Node $node already has functional form constraint $(getextra(model[node], VariationalConstraintsMarginalFormConstraintKey)) applied, therefore $(getconstraint(marginal_constraint)) will not be applied"
else
setextra!(model[node], VariationalConstraintsMarginalFormConstraintKey, getconstraint(marginal_constraint))
end
Expand All @@ -966,7 +966,7 @@ function apply_constraints!(model::Model, context::Context, message_constraint::
applicable_nodes = unroll_nocreate(context[getvariables(message_constraint)])
for node in applicable_nodes
if hasextra(model[node], VariationalConstraintsMessagesFormConstraintKey)
@warn lazy"Node $node already has functional form constraint $(opt[:q]) applied, therefore $constraint_data will not be applied"
@warn lazy"Node $node already has functional form constraint $(getextra(model[node], VariationalConstraintsMessagesFormConstraintKey)) applied, therefore $(getconstraint(message_constraint)) will not be applied"
else
setextra!(model[node], VariationalConstraintsMessagesFormConstraintKey, getconstraint(message_constraint))
end
Expand Down
46 changes: 46 additions & 0 deletions test/plugins/variational_constraints/variational_constraints_engine_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,52 @@ end
end
end


@testitem "Applying a second form constraint warns and preserves the original" begin
import GraphPPL:
create_model,
MarginalFormConstraint,
MessageFormConstraint,
IndexedVariable,
apply_constraints!,
getextra,
VariationalConstraintsMarginalFormConstraintKey,
VariationalConstraintsMessagesFormConstraintKey

include("../../testutils.jl")

using .TestUtils.ModelZoo

struct FirstArbitraryFormConstraint end
struct SecondArbitraryFormConstraint end

# A node that already carries a marginal form constraint must warn (not throw) and keep the first one
model = create_model(simple_model())
context = GraphPPL.getcontext(model)
apply_constraints!(model, context, MarginalFormConstraint(IndexedVariable(:x, nothing), FirstArbitraryFormConstraint()))

@test_logs (:warn, r"already has functional form constraint") match_mode = :any apply_constraints!(
model, context, MarginalFormConstraint(IndexedVariable(:x, nothing), SecondArbitraryFormConstraint())
)

for node in filter(GraphPPL.as_variable(:x), model)
@test getextra(model[node], VariationalConstraintsMarginalFormConstraintKey) == FirstArbitraryFormConstraint()
end

# ... and the same for message form constraints
model = create_model(simple_model())
context = GraphPPL.getcontext(model)
apply_constraints!(model, context, MessageFormConstraint(IndexedVariable(:x, nothing), FirstArbitraryFormConstraint()))

@test_logs (:warn, r"already has functional form constraint") match_mode = :any apply_constraints!(
model, context, MessageFormConstraint(IndexedVariable(:x, nothing), SecondArbitraryFormConstraint())
)

for node in filter(GraphPPL.as_variable(:x), model)
@test getextra(model[node], VariationalConstraintsMessagesFormConstraintKey) == FirstArbitraryFormConstraint()
end
end

@testitem "save constraints with constants via `mean_field_constraint!`" begin
using BitSetTuples
import GraphPPL:
Expand Down
Loading