From 8bb6dc31417d2807dd6fe6c97d6fff60ca88335e Mon Sep 17 00:00:00 2001 From: Hennzau Date: Fri, 30 Aug 2024 22:39:43 +0200 Subject: [PATCH 1/2] new syntax for dataflow examples --- examples/benchmark/dataflow.yml | 23 +++++----- examples/c++-dataflow/dataflow.yml | 24 +++++----- examples/c++-ros2-dataflow/dataflow.yml | 11 ++--- examples/c-dataflow/dataflow.yml | 20 ++++---- examples/cmake-dataflow/dataflow.yml | 24 +++++----- examples/multiple-daemons/dataflow.yml | 24 +++++----- examples/python-ros2-dataflow/dataflow.yml | 24 +++++----- examples/rust-dataflow-url/dataflow.yml | 22 ++++----- examples/rust-dataflow/dataflow.yml | 18 ++++---- examples/rust-dataflow/dataflow_dynamic.yml | 51 ++++++++++----------- examples/rust-dataflow/dataflow_socket.yml | 23 +++++----- examples/rust-ros2-dataflow/dataflow.yml | 15 +++--- 12 files changed, 138 insertions(+), 141 deletions(-) diff --git a/examples/benchmark/dataflow.yml b/examples/benchmark/dataflow.yml index b24a4b7b6..41546151f 100644 --- a/examples/benchmark/dataflow.yml +++ b/examples/benchmark/dataflow.yml @@ -1,15 +1,14 @@ nodes: - id: rust-node - custom: - build: cargo build -p benchmark-example-node --release - source: ../../target/release/benchmark-example-node - outputs: - - latency - - throughput + build: cargo build -p benchmark-example-node --release + path: ../../target/release/benchmark-example-node + outputs: + - latency + - throughput + - id: rust-sink - custom: - build: cargo build -p benchmark-example-sink --release - source: ../../target/release/benchmark-example-sink - inputs: - latency: rust-node/latency - throughput: rust-node/throughput + build: cargo build -p benchmark-example-sink --release + path: ../../target/release/benchmark-example-sink + inputs: + latency: rust-node/latency + throughput: rust-node/throughput diff --git a/examples/c++-dataflow/dataflow.yml b/examples/c++-dataflow/dataflow.yml index d2186dd89..00e7ec470 100644 --- a/examples/c++-dataflow/dataflow.yml +++ b/examples/c++-dataflow/dataflow.yml @@ -1,18 +1,17 @@ nodes: - id: cxx-node-rust-api - custom: - source: build/node_rust_api - inputs: - tick: dora/timer/millis/300 - outputs: - - counter + path: build/node_rust_api + inputs: + tick: dora/timer/millis/300 + outputs: + - counter + - id: cxx-node-c-api - custom: - source: build/node_c_api - inputs: - tick: cxx-node-rust-api/counter - outputs: - - counter + path: build/node_c_api + inputs: + tick: cxx-node-rust-api/counter + outputs: + - counter - id: runtime-node-1 operators: @@ -23,6 +22,7 @@ nodes: counter_2: cxx-node-rust-api/counter outputs: - status + - id: runtime-node-2 operators: - id: operator-c-api diff --git a/examples/c++-ros2-dataflow/dataflow.yml b/examples/c++-ros2-dataflow/dataflow.yml index 7639c6036..0a729e812 100644 --- a/examples/c++-ros2-dataflow/dataflow.yml +++ b/examples/c++-ros2-dataflow/dataflow.yml @@ -1,8 +1,7 @@ nodes: - id: cxx-node-rust-api - custom: - source: build/node_rust_api - inputs: - tick: dora/timer/millis/500 - outputs: - - pose + path: build/node_rust_api + inputs: + tick: dora/timer/millis/500 + outputs: + - pose diff --git a/examples/c-dataflow/dataflow.yml b/examples/c-dataflow/dataflow.yml index 96d5da2f3..d800c4abe 100644 --- a/examples/c-dataflow/dataflow.yml +++ b/examples/c-dataflow/dataflow.yml @@ -1,11 +1,11 @@ nodes: - id: c_node - custom: - source: build/c_node - inputs: - timer: dora/timer/millis/50 - outputs: - - message + path: build/c_node + inputs: + timer: dora/timer/millis/50 + outputs: + - message + - id: runtime-node operators: - id: c_operator @@ -14,8 +14,8 @@ nodes: message: c_node/message outputs: - counter + - id: c_sink - custom: - source: build/c_sink - inputs: - counter: runtime-node/c_operator/counter + path: build/c_sink + inputs: + counter: runtime-node/c_operator/counter diff --git a/examples/cmake-dataflow/dataflow.yml b/examples/cmake-dataflow/dataflow.yml index d6eac623c..3c756c0d2 100644 --- a/examples/cmake-dataflow/dataflow.yml +++ b/examples/cmake-dataflow/dataflow.yml @@ -1,18 +1,17 @@ nodes: - id: cxx-node-rust-api - custom: - source: bin/node_rust_api - inputs: - tick: dora/timer/millis/300 - outputs: - - counter + path: bin/node_rust_api + inputs: + tick: dora/timer/millis/300 + outputs: + - counter + - id: cxx-node-c-api - custom: - source: bin/node_c_api - inputs: - tick: dora/timer/millis/300 - outputs: - - counter + path: bin/node_c_api + inputs: + tick: dora/timer/millis/300 + outputs: + - counter - id: runtime-node-1 operators: @@ -23,6 +22,7 @@ nodes: counter_2: cxx-node-rust-api/counter outputs: - status + - id: runtime-node-2 operators: - id: operator-c-api diff --git a/examples/multiple-daemons/dataflow.yml b/examples/multiple-daemons/dataflow.yml index 363b98bba..b255ff9f2 100644 --- a/examples/multiple-daemons/dataflow.yml +++ b/examples/multiple-daemons/dataflow.yml @@ -2,13 +2,13 @@ nodes: - id: rust-node _unstable_deploy: machine: A - custom: - build: cargo build -p multiple-daemons-example-node - source: ../../target/debug/multiple-daemons-example-node - inputs: - tick: dora/timer/millis/10 - outputs: - - random + path: cargo build -p multiple-daemons-example-node + source: ../../target/debug/multiple-daemons-example-node + inputs: + tick: dora/timer/millis/10 + outputs: + - random + - id: runtime-node _unstable_deploy: machine: A @@ -21,11 +21,11 @@ nodes: random: rust-node/random outputs: - status + - id: rust-sink _unstable_deploy: machine: B - custom: - build: cargo build -p multiple-daemons-example-sink - source: ../../target/debug/multiple-daemons-example-sink - inputs: - message: runtime-node/rust-operator/status + build: cargo build -p multiple-daemons-example-sink + path: ../../target/debug/multiple-daemons-example-sink + inputs: + message: runtime-node/rust-operator/status diff --git a/examples/python-ros2-dataflow/dataflow.yml b/examples/python-ros2-dataflow/dataflow.yml index 809c8d950..074fb1b94 100644 --- a/examples/python-ros2-dataflow/dataflow.yml +++ b/examples/python-ros2-dataflow/dataflow.yml @@ -1,17 +1,15 @@ nodes: - id: turtle - custom: - source: ./random_turtle.py - inputs: - direction: control/direction - outputs: - - turtle_pose + path: ./random_turtle.py + inputs: + direction: control/direction + outputs: + - turtle_pose - id: control - custom: - source: ./control_node.py - inputs: - turtle_pose: turtle/turtle_pose - tick: dora/timer/millis/500 - outputs: - - direction + path: ./control_node.py + inputs: + turtle_pose: turtle/turtle_pose + tick: dora/timer/millis/500 + outputs: + - direction diff --git a/examples/rust-dataflow-url/dataflow.yml b/examples/rust-dataflow-url/dataflow.yml index b5777685d..a66eab7e7 100644 --- a/examples/rust-dataflow-url/dataflow.yml +++ b/examples/rust-dataflow-url/dataflow.yml @@ -1,11 +1,11 @@ nodes: - id: rust-node - custom: - source: https://github.com/dora-rs/dora/releases/download/v0.0.0-test.4/rust-dataflow-example-node - inputs: - tick: dora/timer/millis/300 - outputs: - - random + path: https://github.com/dora-rs/dora/releases/download/v0.0.0-test.4/rust-dataflow-example-node + inputs: + tick: dora/timer/millis/300 + outputs: + - random + - id: runtime-node operators: - id: rust-operator @@ -15,9 +15,9 @@ nodes: random: rust-node/random outputs: - status + - id: rust-sink - custom: - build: cargo build -p rust-dataflow-example-sink - source: ../../target/debug/rust-dataflow-url-example-sink - inputs: - message: runtime-node/rust-operator/status + build: cargo build -p rust-dataflow-example-sink + path: ../../target/debug/rust-dataflow-url-example-sink + inputs: + message: runtime-node/rust-operator/status diff --git a/examples/rust-dataflow/dataflow.yml b/examples/rust-dataflow/dataflow.yml index 30c01ced1..49dd55c8c 100644 --- a/examples/rust-dataflow/dataflow.yml +++ b/examples/rust-dataflow/dataflow.yml @@ -6,20 +6,22 @@ nodes: tick: dora/timer/millis/10 outputs: - random + - id: rust-status-node - custom: - build: cargo build -p rust-dataflow-example-status-node - source: ../../target/debug/rust-dataflow-example-status-node - inputs: - tick: dora/timer/millis/100 - random: rust-node/random - outputs: - - status + build: cargo build -p rust-dataflow-example-status-node + path: ../../target/debug/rust-dataflow-example-status-node + inputs: + tick: dora/timer/millis/100 + random: rust-node/random + outputs: + - status + - id: rust-sink build: cargo build -p rust-dataflow-example-sink path: ../../target/debug/rust-dataflow-example-sink inputs: message: rust-status-node/status + - id: dora-record build: cargo build -p dora-record path: ../../target/debug/dora-record diff --git a/examples/rust-dataflow/dataflow_dynamic.yml b/examples/rust-dataflow/dataflow_dynamic.yml index 78be0f191..5e7f007ce 100644 --- a/examples/rust-dataflow/dataflow_dynamic.yml +++ b/examples/rust-dataflow/dataflow_dynamic.yml @@ -1,31 +1,30 @@ nodes: - id: rust-node - custom: - build: cargo build -p rust-dataflow-example-node - source: ../../target/debug/rust-dataflow-example-node - inputs: - tick: dora/timer/millis/100 - outputs: - - random + build: cargo build -p rust-dataflow-example-node + path: ../../target/debug/rust-dataflow-example-node + inputs: + tick: dora/timer/millis/100 + outputs: + - random + - id: rust-status-node - custom: - build: cargo build -p rust-dataflow-example-status-node - source: ../../target/debug/rust-dataflow-example-status-node - inputs: - tick: dora/timer/millis/100 - random: rust-node/random - outputs: - - status + build: cargo build -p rust-dataflow-example-status-node + path: ../../target/debug/rust-dataflow-example-status-node + inputs: + tick: dora/timer/millis/100 + random: rust-node/random + outputs: + - status + - id: rust-sink-dynamic - custom: - build: cargo build -p rust-dataflow-example-sink-dynamic - source: dynamic - inputs: - message: rust-status-node/status + build: cargo build -p rust-dataflow-example-sink-dynamic + path: dynamic + inputs: + message: rust-status-node/status + - id: dora-record - custom: - build: cargo build -p dora-record - source: ../../target/debug/dora-record - inputs: - message: rust-status-node/status - random: rust-node/random + build: cargo build -p dora-record + path: ../../target/debug/dora-record + inputs: + message: rust-status-node/status + random: rust-node/random diff --git a/examples/rust-dataflow/dataflow_socket.yml b/examples/rust-dataflow/dataflow_socket.yml index ce998a8ca..5a3b956ef 100644 --- a/examples/rust-dataflow/dataflow_socket.yml +++ b/examples/rust-dataflow/dataflow_socket.yml @@ -1,7 +1,6 @@ communication: - _unstable_local: - UnixDomain - + _unstable_local: UnixDomain + nodes: - id: rust-node build: cargo build -p rust-dataflow-example-node @@ -10,20 +9,22 @@ nodes: tick: dora/timer/millis/10 outputs: - random + - id: rust-status-node - custom: - build: cargo build -p rust-dataflow-example-status-node - source: ../../target/debug/rust-dataflow-example-status-node - inputs: - tick: dora/timer/millis/100 - random: rust-node/random - outputs: - - status + build: cargo build -p rust-dataflow-example-status-node + path: ../../target/debug/rust-dataflow-example-status-node + inputs: + tick: dora/timer/millis/100 + random: rust-node/random + outputs: + - status + - id: rust-sink build: cargo build -p rust-dataflow-example-sink path: ../../target/debug/rust-dataflow-example-sink inputs: message: rust-status-node/status + - id: dora-record build: cargo build -p dora-record path: ../../target/debug/dora-record diff --git a/examples/rust-ros2-dataflow/dataflow.yml b/examples/rust-ros2-dataflow/dataflow.yml index 080f1f5d6..3b263522f 100644 --- a/examples/rust-ros2-dataflow/dataflow.yml +++ b/examples/rust-ros2-dataflow/dataflow.yml @@ -1,10 +1,9 @@ nodes: - id: rust-node - custom: - build: cargo build -p rust-ros2-dataflow-example-node --features ros2 - source: ../../target/debug/rust-ros2-dataflow-example-node - inputs: - tick: dora/timer/millis/500 - service_timer: dora/timer/secs/1 - outputs: - - pose + build: cargo build -p rust-ros2-dataflow-example-node --features ros2 + path: ../../target/debug/rust-ros2-dataflow-example-node + inputs: + tick: dora/timer/millis/500 + service_timer: dora/timer/secs/1 + outputs: + - pose From 0f949a5e5a242ce63f097a0948fd8761c9cbd993 Mon Sep 17 00:00:00 2001 From: Hennzau Date: Fri, 30 Aug 2024 23:00:10 +0200 Subject: [PATCH 2/2] fix failed to replace source with path --- examples/multiple-daemons/dataflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/multiple-daemons/dataflow.yml b/examples/multiple-daemons/dataflow.yml index b255ff9f2..2fb318b5d 100644 --- a/examples/multiple-daemons/dataflow.yml +++ b/examples/multiple-daemons/dataflow.yml @@ -2,8 +2,8 @@ nodes: - id: rust-node _unstable_deploy: machine: A - path: cargo build -p multiple-daemons-example-node - source: ../../target/debug/multiple-daemons-example-node + build: cargo build -p multiple-daemons-example-node + path: ../../target/debug/multiple-daemons-example-node inputs: tick: dora/timer/millis/10 outputs: