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

Cardinality example test with inspect #1097

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Cardinality example test with inspect #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 17 additions & 13 deletions .../tests/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_dot.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,43 @@ digraph {
n1v1 [label="(n1v1) union()", shape=invhouse, fillcolor="#88aaff"]
n2v1 [label="(n2v1) map(|v| (v, ()))", shape=invhouse, fillcolor="#88aaff"]
n3v1 [label="(n3v1) source_iter(vec![0])", shape=invhouse, fillcolor="#88aaff"]
n4v1 [label="(n4v1) join()", shape=invhouse, fillcolor="#88aaff"]
n5v1 [label="(n5v1) map(|(_src, ((), dst))| dst)", shape=invhouse, fillcolor="#88aaff"]
n6v1 [label="(n6v1) tee()", shape=house, fillcolor="#ffff88"]
n7v1 [label="(n7v1) source_stream(pairs_recv)", shape=invhouse, fillcolor="#88aaff"]
n8v1 [label="(n8v1) for_each(|x| println!(\"Reached: {}\", x))", shape=house, fillcolor="#ffff88"]
n9v1 [label="(n9v1) handoff", shape=parallelogram, fillcolor="#ddddff"]
n4v1 [label="(n4v1) join::<'static, 'static>()", shape=invhouse, fillcolor="#88aaff"]
n5v1 [label="(n5v1) inspect(|_| { my_card_inner.set(1 + my_card_inner.get()) })", shape=invhouse, fillcolor="#88aaff"]
n6v1 [label="(n6v1) map(|(_src, ((), dst))| dst)", shape=invhouse, fillcolor="#88aaff"]
n7v1 [label="(n7v1) tee()", shape=house, fillcolor="#ffff88"]
n8v1 [label="(n8v1) source_stream(pairs_recv)", shape=invhouse, fillcolor="#88aaff"]
n9v1 [label="(n9v1) for_each(|x| println!(\"Reached: {}\", x))", shape=house, fillcolor="#ffff88"]
n10v1 [label="(n10v1) handoff", shape=parallelogram, fillcolor="#ddddff"]
n1v1 -> n2v1
n3v1 -> n1v1 [label="0"]
n6v1 -> n7v1
n5v1 -> n6v1
n4v1 -> n5v1
n2v1 -> n4v1 [label="0"]
n7v1 -> n4v1 [label="1"]
n6v1 -> n9v1 [label="0"]
n6v1 -> n8v1 [label="1"]
n9v1 -> n1v1 [label="1"]
n8v1 -> n4v1 [label="1"]
n7v1 -> n10v1 [label="0"]
n7v1 -> n9v1 [label="1"]
n10v1 -> n1v1 [label="1"]
subgraph "cluster n1v1" {
fillcolor="#dddddd"
style=filled
label = "sg_1v1\nstratum 0"
n9v1
n10v1
n3v1
n1v1
n2v1
n7v1
n8v1
n4v1
n5v1
n6v1
n8v1
n7v1
n9v1
subgraph "cluster_sg_1v1_var_my_join_tee" {
label="var my_join_tee"
n4v1
n5v1
n6v1
n7v1
}
subgraph "cluster_sg_1v1_var_reached_vertices" {
label="var reached_vertices"
Expand Down
30 changes: 17 additions & 13 deletions ...ts/snapshots/surface_codegen__surface_syntax_reachability_generated@graphvis_mermaid.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,39 @@ linkStyle default stroke:#aaa
1v1[\"(1v1) <code>union()</code>"/]:::pullClass
2v1[\"(2v1) <code>map(|v| (v, ()))</code>"/]:::pullClass
3v1[\"(3v1) <code>source_iter(vec![0])</code>"/]:::pullClass
4v1[\"(4v1) <code>join()</code>"/]:::pullClass
5v1[\"(5v1) <code>map(|(_src, ((), dst))| dst)</code>"/]:::pullClass
6v1[/"(6v1) <code>tee()</code>"\]:::pushClass
7v1[\"(7v1) <code>source_stream(pairs_recv)</code>"/]:::pullClass
8v1[/"(8v1) <code>for_each(|x| println!(&quot;Reached: {}&quot;, x))</code>"\]:::pushClass
9v1["(9v1) <code>handoff</code>"]:::otherClass
4v1[\"(4v1) <code>join::&lt;'static, 'static&gt;()</code>"/]:::pullClass
5v1[\"(5v1) <code>inspect(|_| { my_card_inner.set(1 + my_card_inner.get()) })</code>"/]:::pullClass
6v1[\"(6v1) <code>map(|(_src, ((), dst))| dst)</code>"/]:::pullClass
7v1[/"(7v1) <code>tee()</code>"\]:::pushClass
8v1[\"(8v1) <code>source_stream(pairs_recv)</code>"/]:::pullClass
9v1[/"(9v1) <code>for_each(|x| println!(&quot;Reached: {}&quot;, x))</code>"\]:::pushClass
10v1["(10v1) <code>handoff</code>"]:::otherClass
1v1-->2v1
3v1-->|0|1v1
6v1-->7v1
5v1-->6v1
4v1-->5v1
2v1-->|0|4v1
7v1-->|1|4v1
6v1-->|0|9v1
6v1-->|1|8v1
9v1-->|1|1v1
8v1-->|1|4v1
7v1-->|0|10v1
7v1-->|1|9v1
10v1-->|1|1v1
subgraph sg_1v1 ["sg_1v1 stratum 0"]
9v1
10v1
3v1
1v1
2v1
7v1
8v1
4v1
5v1
6v1
8v1
7v1
9v1
subgraph sg_1v1_var_my_join_tee ["var <tt>my_join_tee</tt>"]
4v1
5v1
6v1
7v1
end
subgraph sg_1v1_var_reached_vertices ["var <tt>reached_vertices</tt>"]
1v1
Expand Down
21 changes: 20 additions & 1 deletion hydroflow/tests/surface_codegen.rs
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,18 @@ pub fn test_surface_syntax_reachability_generated() {
// An edge in the input data = a pair of `usize` vertex IDs.
let (pairs_send, pairs_recv) = hydroflow::util::unbounded_channel::<(usize, usize)>();

let my_card = std::rc::Rc::new(std::cell::Cell::new(0));
let my_card_inner = std::rc::Rc::clone(&my_card);

let mut df: Hydroflow = hydroflow_syntax! {
reached_vertices = union() -> map(|v| (v, ()));
source_iter(vec![0]) -> [0]reached_vertices;

my_join_tee = join() -> map(|(_src, ((), dst))| dst) -> tee();
my_join_tee = join::<'static, 'static>()
-> inspect(|_| {
my_card_inner.set(1 + my_card_inner.get())
})
-> map(|(_src, ((), dst))| dst) -> tee();
reached_vertices -> [0]my_join_tee;
source_stream(pairs_recv) -> [1]my_join_tee;

Expand All @@ -588,22 +595,34 @@ pub fn test_surface_syntax_reachability_generated() {
assert_graphvis_snapshots!(df);
df.run_available();

println!("{} {} {}", line!(), df.current_tick(), my_card.get());

pairs_send.send((0, 1)).unwrap();
df.run_available();

println!("{} {} {}", line!(), df.current_tick(), my_card.get());

pairs_send.send((2, 4)).unwrap();
pairs_send.send((3, 4)).unwrap();
df.run_available();

println!("{} {} {}", line!(), df.current_tick(), my_card.get());

pairs_send.send((1, 2)).unwrap();
df.run_available();

println!("{} {} {}", line!(), df.current_tick(), my_card.get());

pairs_send.send((0, 3)).unwrap();
df.run_available();

println!("{} {} {}", line!(), df.current_tick(), my_card.get());

pairs_send.send((0, 3)).unwrap();
df.run_available();

println!("{} {} {}", line!(), df.current_tick(), my_card.get());

// Reached: 1
// Reached: 2
// Reached: 4
Expand Down
Loading