Skip to content
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

Jump to bottom

Wma/fix608 #629

Merged
merged 25 commits into from
Nov 6, 2024
Merged

Wma/fix608 #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
aa5b594
first step: begin converting furlable to explicit stateful structs
willow-ahrens Oct 29, 2024
d7fa128
fix
willow-ahrens Oct 29, 2024
921de6d
many masks fixed
willow-ahrens Oct 29, 2024
34ba000
fix
willow-ahrens Oct 30, 2024
72f3564
fix
willow-ahrens Oct 30, 2024
1855fa8
fix
willow-ahrens Oct 30, 2024
d858e77
fix
willow-ahrens Oct 30, 2024
d71b4c9
all set with that
willow-ahrens Oct 30, 2024
9837713
sparsearrays
willow-ahrens Oct 31, 2024
0a81203
fixed last furlable
willow-ahrens Oct 31, 2024
b5b2b7d
thread the needle
willow-ahrens Oct 31, 2024
4acb509
intermediate fix (sortof works sometimes)
willow-ahrens Nov 4, 2024
ddc882c
quick rename for sanity
willow-ahrens Nov 4, 2024
2a62e0c
rename again
willow-ahrens Nov 4, 2024
bb9defc
some reorg
willow-ahrens Nov 4, 2024
77dc13b
cleanup
willow-ahrens Nov 5, 2024
26cffbc
fix
willow-ahrens Nov 5, 2024
a5105bb
things are a little broken
willow-ahrens Nov 5, 2024
9d759f3
okay
willow-ahrens Nov 5, 2024
3d79e6f
close
willow-ahrens Nov 5, 2024
71c054d
fixes
willow-ahrens Nov 5, 2024
d38f766
all set
willow-ahrens Nov 5, 2024
f632432
fixes
willow-ahrens Nov 5, 2024
8739fc5
Regenerate test output
willow-bot Nov 5, 2024
dfb4934
fix docs
willow-ahrens Nov 6, 2024
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
20 changes: 10 additions & 10 deletions docs/src/guides/optimization_tips.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,25 +271,25 @@ quote
C_val = (Main).f(0.0, val) + C_val
end
A_lvl_3_val = A_lvl_2_val[A_lvl_2_q]
val = B[A_lvl_2_i, j_4]
C_val += (Main).f(A_lvl_3_val, val)
val_2 = B[A_lvl_2_i, j_4]
C_val += (Main).f(A_lvl_3_val, val_2)
A_lvl_2_q += 1
i = A_lvl_2_i + 1
else
phase_stop_3 = min(phase_stop, A_lvl_2_i)
if A_lvl_2_i == phase_stop_3
for i_8 = i:-1 + phase_stop_3
val = B[i_8, j_4]
C_val += (Main).f(0.0, val)
val_3 = B[i_8, j_4]
C_val += (Main).f(0.0, val_3)
end
A_lvl_3_val = A_lvl_2_val[A_lvl_2_q]
val = B[phase_stop_3, j_4]
C_val += (Main).f(A_lvl_3_val, val)
val_4 = B[phase_stop_3, j_4]
C_val += (Main).f(A_lvl_3_val, val_4)
A_lvl_2_q += 1
else
for i_10 = i:phase_stop_3
val = B[i_10, j_4]
C_val += (Main).f(0.0, val)
val_5 = B[i_10, j_4]
C_val += (Main).f(0.0, val_5)
end
end
i = phase_stop_3 + 1
Expand All @@ -300,8 +300,8 @@ quote
phase_start_3 = max(1, 1 + A_lvl_2_i1)
if B_mode1_stop >= phase_start_3
for i_12 = phase_start_3:B_mode1_stop
val = B[i_12, j_4]
C_val += (Main).f(0.0, val)
val_6 = B[i_12, j_4]
C_val += (Main).f(0.0, val_6)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion docs/src/reference/internals/tensor_interface.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ The `AbstractTensor` interface (defined in `src/abstract_tensor.jl`) is the inte

```@docs
declare!
instantiate
freeze!
thaw!
unfurl
instantiate
fill_value
virtual_eltype
virtual_fill_value
Expand Down
2 changes: 1 addition & 1 deletion docs/src/reference/internals/virtualization.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ different inputs, but the same program type. We can run our program using

```jldoctest example1; filter=r"Finch\.FinchNotation\."
julia> typeof(prgm)
Finch.FinchNotation.BlockInstance{Tuple{Finch.FinchNotation.DeclareInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:C}, Tensor{SparseListLevel{Int64, Vector{Int64}, Vector{Int64}, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}, Finch.FinchNotation.LiteralInstance{0}}, Finch.FinchNotation.LoopInstance{Finch.FinchNotation.IndexInstance{:i}, Finch.FinchNotation.Dimensionless, Finch.FinchNotation.AssignInstance{Finch.FinchNotation.AccessInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:C}, Tensor{SparseListLevel{Int64, Vector{Int64}, Vector{Int64}, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}, Finch.FinchNotation.LiteralInstance{Finch.FinchNotation.Updater()}, Tuple{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:i}, Finch.FinchNotation.IndexInstance{:i}}}}, Finch.FinchNotation.LiteralInstance{Finch.FinchNotation.initwrite}, Finch.FinchNotation.CallInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:*}, Finch.FinchNotation.LiteralInstance{*}}, Tuple{Finch.FinchNotation.AccessInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:A}, Tensor{SparseListLevel{Int64, Vector{Int64}, Vector{Int64}, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}, Finch.FinchNotation.LiteralInstance{Finch.FinchNotation.Reader()}, Tuple{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:i}, Finch.FinchNotation.IndexInstance{:i}}}}, Finch.FinchNotation.AccessInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:B}, Tensor{DenseLevel{Int64, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}, Finch.FinchNotation.LiteralInstance{Finch.FinchNotation.Reader()}, Tuple{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:i}, Finch.FinchNotation.IndexInstance{:i}}}}}}}}, Finch.FinchNotation.YieldBindInstance{Tuple{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:C}, Tensor{SparseListLevel{Int64, Vector{Int64}, Vector{Int64}, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}}}}}
Finch.FinchNotation.BlockInstance{Tuple{Finch.FinchNotation.DeclareInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:C}, Tensor{SparseListLevel{Int64, Vector{Int64}, Vector{Int64}, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}, Finch.FinchNotation.LiteralInstance{0}}, Finch.FinchNotation.LoopInstance{Finch.FinchNotation.IndexInstance{:i}, Finch.FinchNotation.Dimensionless, Finch.FinchNotation.AssignInstance{Finch.FinchNotation.AccessInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:C}, Tensor{SparseListLevel{Int64, Vector{Int64}, Vector{Int64}, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}, Finch.FinchNotation.LiteralInstance{Finch.FinchNotation.Updater()}, Tuple{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:i}, Finch.FinchNotation.IndexInstance{:i}}}}, Finch.FinchNotation.LiteralInstance{initwrite}, Finch.FinchNotation.CallInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:*}, Finch.FinchNotation.LiteralInstance{*}}, Tuple{Finch.FinchNotation.AccessInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:A}, Tensor{SparseListLevel{Int64, Vector{Int64}, Vector{Int64}, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}, Finch.FinchNotation.LiteralInstance{Finch.FinchNotation.Reader()}, Tuple{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:i}, Finch.FinchNotation.IndexInstance{:i}}}}, Finch.FinchNotation.AccessInstance{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:B}, Tensor{DenseLevel{Int64, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}, Finch.FinchNotation.LiteralInstance{Finch.FinchNotation.Reader()}, Tuple{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:i}, Finch.FinchNotation.IndexInstance{:i}}}}}}}}, Finch.FinchNotation.YieldBindInstance{Tuple{Finch.FinchNotation.TagInstance{Finch.FinchNotation.VariableInstance{:C}, Tensor{SparseListLevel{Int64, Vector{Int64}, Vector{Int64}, ElementLevel{0, Int64, Int64, Vector{Int64}}}}}}}}}

julia> C = Finch.execute(prgm).C
5-Tensor
Expand Down
Loading
Loading