Faster loop enumeration#177
Merged
Merged
Conversation
Co-authored-by: Matt Fishman <mtfishman@users.noreply.github.com>
Co-authored-by: Matt Fishman <mtfishman@users.noreply.github.com>
Co-authored-by: Matt Fishman <mtfishman@users.noreply.github.com>
Co-authored-by: Matt Fishman <mtfishman@users.noreply.github.com>
Co-authored-by: Matt Fishman <mtfishman@users.noreply.github.com>
…aphs.jl into mf/partitionsgraphview
PartitionsGraphView update
for more information, see https://pre-commit.ci
Member
|
Your PR no longer requires formatting changes. Thank you for your contribution! |
mtfishman
reviewed
Jul 13, 2026
Comment on lines
+16
to
+33
| mutable struct NoLeafSubgraphSearch | ||
| # Endpoints of each edge, as integer vertex indices (indexed by edge index). | ||
| const edge_src::Vector{Int} | ||
| const edge_dst::Vector{Int} | ||
| # Line-graph adjacency: `edge_neighbours[i]` lists the edges sharing a vertex with edge `i`. | ||
| const edge_neighbours::Vector{Vector{Int}} | ||
| const max_edges::Int | ||
| # Induced degree of each vertex within the current edge set. | ||
| const vertex_degree::Vector{Int} | ||
| # Number of vertices whose induced degree is exactly 1 (i.e. leaves of the current set). | ||
| num_leaves::Int | ||
| # `marked[u]` is true while edge `u` is in the current set or already queued for it. | ||
| const marked::Vector{Bool} | ||
| # The current edge set, used as a stack. | ||
| const current_edges::Vector{Int} | ||
| # Completed leaf-free edge sets (each a vector of edge indices). | ||
| const results::Vector{Vector{Int}} | ||
| end |
Member
There was a problem hiding this comment.
Since most of the fields are set to const anyway, it might be better to make the type not mutable and then make the field num_leaves::Base.RefValue{Int}. Then you can update it with search.num_leaves[] += 1 and access it with search.num_leaves[].
mtfishman
reviewed
Jul 13, 2026
| name = "NamedGraphs" | ||
| uuid = "678767b0-92e7-4007-89e4-4527a8725b19" | ||
| version = "0.12.2" | ||
| version = "0.12.3" |
Member
There was a problem hiding this comment.
Since we are deleting unique_simplecycles_limited_length I think we'll need to mark this as breaking, i.e. v0.13. I guess the idea is that function is just not very useful so we may as well not support it any more?
Collaborator
Author
There was a problem hiding this comment.
Yeah it was only being used inside the previous version of edgeinduced_subgraphs_no_leaves so seems no point in supporting it. Will bump it
Member
|
@JoeyT1994 what do you think of the name |
Collaborator
Author
|
@mtfishman Yeah that's a slightly simpler name, I'll change to that |
mtfishman
enabled auto-merge (squash)
July 13, 2026 18:31
This was referenced Jul 13, 2026
mtfishman
added a commit
to ITensor/DataGraphs.jl
that referenced
this pull request
Jul 13, 2026
## Summary Widen the `NamedGraphs` compat to allow v0.13 (ITensor/NamedGraphs.jl#177). That release rewrites the leaf-free edge-induced subgraph enumeration and drops the old internal cycle-enumeration helpers, none of which DataGraphs uses, so it stays compatible with both v0.12 and v0.13.
mtfishman
added a commit
to ITensor/ITensorNetworks.jl
that referenced
this pull request
Jul 13, 2026
## Summary Widen the `NamedGraphs` compat to allow v0.13 (ITensor/NamedGraphs.jl#177). That release rewrites the leaf-free edge-induced subgraph enumeration and drops the old internal cycle-enumeration helpers, none of which ITensorNetworks uses, so it stays compatible with both v0.12 and v0.13.
mtfishman
added a commit
to ITensor/ITensorNetworksNext.jl
that referenced
this pull request
Jul 13, 2026
## Summary Widen the `NamedGraphs` compat to allow v0.13 (ITensor/NamedGraphs.jl#177). That release rewrites the leaf-free edge-induced subgraph enumeration and drops the old internal cycle-enumeration helpers, none of which ITensorNetworksNext uses, so it stays compatible with both v0.12 and v0.13.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR replaces the
edgeinduced_subgraphs_no_leaves(g::AbstractGraph, max_edges::Integer)function with a much faster and fully correct implementation.The function takes a graph
gand enumerates all connected, edge induced subgraphs with up tomax_edgeswhich contain no leaf (degree 1) vertices. This induced graphs are the basis of a cluster expansion.The function is now completely correct (the previous version missed out subgraphs with bridges) and much much faster (many hundreds of times on large graphs).
Tests are updated to reflect this and check the expansion.