Skip to content

fix: default_node_type should not prescribe degree #133

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
merged 3 commits into from
Jun 24, 2025
Merged

fix: default_node_type should not prescribe degree #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60bbf7b
fix: `default_node_type` should not prescribe degree
MilesCranmer Jun 24, 2025
52a1bf8
test: fix issue where test eval fails due to incomplete eval
MilesCranmer Jun 24, 2025
679bb40
test: declare instabilities
MilesCranmer Jun 24, 2025
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
2 changes: 1 addition & 1 deletion src/Expression.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function max_degree(::Union{E,Type{E}}) where {E<:AbstractExpression}
return has_node_type(E) ? max_degree(node_type(E)) : max_degree(Node)
end
@unstable default_node_type(_) = Node
default_node_type(::Type{N}) where {T,N<:AbstractExpression{T}} = Node{T,max_degree(N)}
@unstable default_node_type(::Type{N}) where {T,N<:AbstractExpression{T}} = Node{T}

########################################################
# Abstract interface ###################################
Expand Down
4 changes: 3 additions & 1 deletion src/Interfaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ using ..NodeModule:
with_type_parameters,
with_max_degree,
max_degree,
has_max_degree,
unsafe_get_children,
get_children,
leaf_copy,
Expand Down Expand Up @@ -144,7 +145,8 @@ function _check_default_node(ex::AbstractExpression{T}) where {T}
ET = typeof(ex)
E = Base.typename(ET).wrapper
return default_node_type(E) <: AbstractExpressionNode &&
default_node_type(ET) <: AbstractExpressionNode{T}
default_node_type(ET) <: AbstractExpressionNode{T} &&
!has_max_degree(default_node_type(ET))
end
function _check_constructorof(ex::AbstractExpression)
return constructorof(typeof(ex)) isa Base.Callable
Expand Down
9 changes: 3 additions & 6 deletions src/ParametricExpression.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,9 @@
# Abstract expression node interface ##########################################
###############################################################################
@unstable constructorof(::Type{<:ParametricExpression}) = ParametricExpression
@unstable function default_node_type(::Type{<:ParametricExpression})
return with_default_max_degree(ParametricNode)
end
function default_node_type(::Type{N}) where {T,N<:ParametricExpression{T}}
return ParametricNode{T,max_degree(N)}
end
@unstable default_node_type(::Type{<:ParametricExpression}) = ParametricNode

Check warning on line 122 in src/ParametricExpression.jl

View check run for this annotation

Codecov / codecov/patch

src/ParametricExpression.jl#L122 

Added line #L122 was not covered by tests
@unstable default_node_type(::Type{N}) where {T,N<:ParametricExpression{T}} =
ParametricNode{T}
preserve_sharing(::Union{Type{<:ParametricNode},ParametricNode}) = false # COV_EXCL_LINE
function leaf_copy(t::ParametricNode{T}) where {T}
if t.constant
Expand Down
11 changes: 7 additions & 4 deletions test/test_buffered_evaluation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,11 @@ end

for turbo in (false, true), i in 1:100
# Generate a random tree with varying size (1-10 nodes)
n_nodes = rand(1:10)
tree = gen_random_tree_fixed_size(n_nodes, operators, size(X, 1), Float64, Node)
rng = Random.MersenneTwister(i)
n_nodes = rand(rng, 1:10)
tree = gen_random_tree_fixed_size(
n_nodes, operators, size(X, 1), Float64, Node, rng
)

# Regular evaluation
eval_options_no_buffer = EvalOptions(; turbo)
Expand All @@ -142,12 +145,12 @@ end

# Buffer evaluation
buffer = Array{Float64}(undef, 2n_nodes, size(X, 2))
buffer_ref = Ref(rand(1:10)) # Random starting index (will be reset)
buffer_ref = Ref(rand(rng, 1:10)) # Random starting index (will be reset)
eval_options = EvalOptions(; turbo, buffer=ArrayBuffer(buffer, buffer_ref))
result2, ok2 = eval_tree_array(tree, X, operators; eval_options)

# Results should be identical
@test isapprox(result1, result2; atol=1e-10)
@test isapprox(result1, result2; atol=1e-10) || (!ok1 && !ok2)
@test ok1 == ok2
end
end
Loading