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

Update/api-name #285

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Update/api-name #285

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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ int main() {
// Input is set by calling Node::operator().
n1(input);

// Parameter can be set by Node::set_param();
n1.set_param(ion::Param("v", 40));
// Parameter can be set by Node::set_params();
n1.set_params(ion::Param("v", 40));

// Method chain can be used to make it simple.
auto n2 = b.add("my_filter")(n1["output"]).set_param(ion::Param("v", 2));
auto n2 = b.add("my_filter")(n1["output"]).set_params(ion::Param("v", 2));

// Bind output buffer.
ion::Buffer<int32_t> output{size};
Expand Down
8 changes: 4 additions & 4 deletions app/realtime-captioning/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,20 @@ def init_pipeline(self):

# U3V camera
# params = [Param("num_devices", 1), Param("realtime_diaplay_mode", True)]
# n_img_cwh = self.b.add("image_io_u3v_cameraN_u8x3").set_param(params)
# n_img_cwh = self.b.add("image_io_u3v_cameraN_u8x3").set_params(params)

# UVC camera
params = [Param("width", self.camera_width), Param("height", self.camera_height)]
n_img_whc = self.b.add("image_io_camera").set_param(params)
n_img_whc = self.b.add("image_io_camera").set_params(params)
params = [Param("dim0", 2), Param("dim1", 0), Param("dim2", 1)]
n_img_cwh = self.b.add("base_reorder_buffer_3d_uint8").set_iport([n_img_whc.get_port("output")]).set_param(params);
n_img_cwh = self.b.add("base_reorder_buffer_3d_uint8").set_iport([n_img_whc.get_port("output")]).set_params(params);

self.prompt_buf = Buffer(array=self.prompt)
prompt_port = Port(name="prompt", type=Type(TypeCode.Int, 8, 1), dim=1)
prompt_port.bind(self.prompt_buf)

params = [Param("width", self.camera_width), Param("height", self.camera_height)]
n_txt = self.b.add("llm_llava").set_iport([n_img_cwh.get_port("output")[0], prompt_port]).set_param(params)
n_txt = self.b.add("llm_llava").set_iport([n_img_cwh.get_port("output")[0], prompt_port]).set_params(params)

for i in range(self.camera_height):
for j in range(self.camera_width):
Expand Down
28 changes: 14 additions & 14 deletions example/demo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@ int main(int argc, char *argv[]) {
for (int i = 0; i < 6; i++) {
// IMX219
Node imx = b.add("image_io_imx219")
.set_param(Param("index", i),
.set_params(Param("index", i),
Param("url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.png"));

// ISP
Node downscale = b.add("image_processing_bayer_downscale_uint16")
.set_param(
.set_params(
Param("input_width", raw_width),
Param("input_height", raw_height),
Param("downscale_factor", downscale_factor))(
imx["output"]);
Node normalize = b.add("image_processing_normalize_raw_image")
.set_param(
.set_params(
Param("bit_width", bit_width),
Param("bit_shift", bit_shift))(
downscale["output"]);
Expand All @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) {
&offset_b,
normalize["output"]);
Node shading_correction = b.add("image_processing_lens_shading_correction_linear")
.set_param(
.set_params(
Param("width", width),
Param("height", height))(
&shading_correction_slope_r,
Expand All @@ -104,12 +104,12 @@ int main(int argc, char *argv[]) {
&gain_b,
shading_correction["output"]);
Node demosaic = b.add("image_processing_bayer_demosaic_simple")
.set_param(
.set_params(
Param("width", width),
Param("height", height))(
white_balance["output"]);
Node resize = b.add("image_processing_resize_bilinear_3d")
.set_param(
.set_params(
Param("width", half_width),
Param("height", half_height),
Param("scale", scale))(
Expand All @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) {

// DNN
Node fit_image = b.add("image_processing_fit_image_to_center_3d_float")
.set_param(
.set_params(
Param("input_width", scaled_width),
Param("input_height", scaled_height),
Param("output_width", output_width),
Expand All @@ -129,13 +129,13 @@ int main(int argc, char *argv[]) {
Node reorder_channel = b.add("image_processing_reorder_color_channel_3d_float")(
fit_image["output"]);
Node reorder_chw2hwc = b.add("base_reorder_buffer_3d_float")
.set_param(
.set_params(
Param("dim0", 2),
Param("dim1", 0),
Param("dim2", 1))(
reorder_channel["output"]);
Node extended = b.add("base_extend_dimension_3d_float")
.set_param(
.set_params(
Param("new_dim", 3))(
reorder_chw2hwc["output"]);

Expand All @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) {
Port packed_dnn_input = dnn_inputs[0];
for (int i = 1; i < 6; i++) {
packed_dnn_input = b.add("base_concat_buffer_4d_float")
.set_param(
.set_params(
Param("dim", 3),
Param("input0_extent", i))(
packed_dnn_input,
Expand All @@ -157,7 +157,7 @@ int main(int argc, char *argv[]) {
Port dnn_outputs[6];
for (int i = 0; i < 6; i++) {
dnn_outputs[i] = b.add("base_extract_buffer_4d_float")
.set_param(
.set_params(
Param("dim", 3),
Param("index", i))(
object_detection["output"])["output"];
Expand All @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) {
horizontal_tiled_image[i] = dnn_outputs[i * 3];
for (int j = 1; j < 3; j++) {
horizontal_tiled_image[i] = b.add("image_processing_tile_image_horizontal_3d_float")
.set_param(
.set_params(
Param("x_dim", 1),
Param("y_dim", 2),
Param("input0_width", output_width * j),
Expand All @@ -181,7 +181,7 @@ int main(int argc, char *argv[]) {
}

Port tiled_image = b.add("image_processing_tile_image_vertical_3d_float")
.set_param(
.set_params(
Param("x_dim", 1),
Param("y_dim", 2),
Param("input0_width", output_width * 3),
Expand All @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) {
auto d435 = b.add("image_io_d435");

// SGM
auto sgm = b.add("sgm_sgm")(d435["output_l"], d435["output_r"]).set_param(Param("disp", disp), Param("width", d435_width), Param("height", d435_height));
auto sgm = b.add("sgm_sgm")(d435["output_l"], d435["output_r"]).set_params(Param("disp", disp), Param("width", d435_width), Param("height", d435_height));

b.save("demo.json");

Expand Down
28 changes: 14 additions & 14 deletions example/demo_compile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ int main(int argc, char *argv[]) {
for (int i = 0; i < 6; i++) {
// IMX219
Node imx = b.add("image_io_imx219")
.set_param(Param{"index", std::to_string(i)},
.set_params(Param{"index", std::to_string(i)},
Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.png"});

// ISP
Node downscale = b.add("image_processing_bayer_downscale_uint16")
.set_param(
.set_params(
Param{"input_width", std::to_string(raw_width)},
Param{"input_height", std::to_string(raw_height)},
Param{"downscale_factor", std::to_string(downscale_factor)})(
imx["output"]);
Node normalize = b.add("image_processing_normalize_raw_image")
.set_param(
.set_params(
Param{"bit_width", std::to_string(bit_width)},
Param{"bit_shift", std::to_string(bit_shift)})(
downscale["output"]);
Expand All @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) {
offset_b,
normalize["output"]);
Node shading_correction = b.add("image_processing_lens_shading_correction_linear")
.set_param(
.set_params(
Param{"width", std::to_string(width)},
Param{"height", std::to_string(height)})(
shading_correction_slope_r,
Expand All @@ -93,12 +93,12 @@ int main(int argc, char *argv[]) {
gain_b,
shading_correction["output"]);
Node demosaic = b.add("image_processing_bayer_demosaic_simple")
.set_param(
.set_params(
Param{"width", std::to_string(width)},
Param{"height", std::to_string(height)})(
white_balance["output"]);
Node resize = b.add("image_processing_resize_bilinear_3d")
.set_param(
.set_params(
Param{"width", std::to_string(half_width)},
Param{"height", std::to_string(half_height)},
Param{"scale", std::to_string(scale)})(
Expand All @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) {

// DNN
Node fit_image = b.add("image_processing_fit_image_to_center_3d_float")
.set_param(
.set_params(
Param{"input_width", std::to_string(scaled_width)},
Param{"input_height", std::to_string(scaled_height)},
Param{"output_width", std::to_string(output_width)},
Expand All @@ -118,13 +118,13 @@ int main(int argc, char *argv[]) {
Node reorder_channel = b.add("image_processing_reorder_color_channel_3d_float")(
fit_image["output"]);
Node reorder_chw2hwc = b.add("base_reorder_buffer_3d_float")
.set_param(
.set_params(
Param{"dim0", "2"},
Param{"dim1", "0"},
Param{"dim2", "1"})(
reorder_channel["output"]);
Node extended = b.add("base_extend_dimension_3d_float")
.set_param(
.set_params(
Param{"new_dim", "3"})(
reorder_chw2hwc["output"]);

Expand All @@ -134,7 +134,7 @@ int main(int argc, char *argv[]) {
Port packed_dnn_input = dnn_inputs[0];
for (int i = 1; i < 6; i++) {
packed_dnn_input = b.add("base_concat_buffer_4d_float")
.set_param(
.set_params(
Param{"dim", "3"},
Param{"input0_extent", std::to_string(i)})(
packed_dnn_input,
Expand All @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) {
Port dnn_outputs[6];
for (int i = 0; i < 6; i++) {
dnn_outputs[i] = b.add("base_extract_buffer_4d_float")
.set_param(
.set_params(
Param{"dim", "3"},
Param{"index", std::to_string(i)})(
object_detection["output"])["output"];
Expand All @@ -157,7 +157,7 @@ int main(int argc, char *argv[]) {
horizontal_tiled_image[i] = dnn_outputs[i * 3];
for (int j = 1; j < 3; j++) {
horizontal_tiled_image[i] = b.add("image_processing_tile_image_horizontal_3d_float")
.set_param(
.set_params(
Param{"x_dim", "1"},
Param{"y_dim", "2"},
Param{"input0_width", std::to_string(output_width * j)},
Expand All @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) {
}

Port tiled_image = b.add("image_processing_tile_image_vertical_3d_float")
.set_param(
.set_params(
Param{"x_dim", "1"},
Param{"y_dim", "2"},
Param{"input0_width", std::to_string(output_width * 3)},
Expand All @@ -186,7 +186,7 @@ int main(int argc, char *argv[]) {
auto d435 = b.add("image_io_d435");

// SGM
auto sgm = b.add("sgm_sgm")(d435["output_l"], d435["output_r"]).set_param(Param{"disp", std::to_string(disp)}, Param{"width", std::to_string(d435_width)}, Param{"height", std::to_string(d435_height)});
auto sgm = b.add("sgm_sgm")(d435["output_l"], d435["output_r"]).set_params(Param{"disp", std::to_string(disp)}, Param{"width", std::to_string(d435_width)}, Param{"height", std::to_string(d435_height)});

b.compile("demo");
b.save("demo.json");
Expand Down
4 changes: 2 additions & 2 deletions example/dnn.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ int main(int argc, char *argv[]) {
b.with_bb_module("ion-bb");

Node n;
n = b.add("image_io_color_data_loader").set_param(Param("url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.png"), Param("width", width), Param("height", height));
n = b.add("image_io_color_data_loader").set_params(Param("url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.png"), Param("width", width), Param("height", height));
n = b.add("base_normalize_3d_uint8")(n["output"]);
n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_param(Param("dim0", 2), Param("dim1", 0), Param("dim2", 1)); // CHW -> HWC
n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_params(Param("dim0", 2), Param("dim1", 0), Param("dim2", 1)); // CHW -> HWC
n = b.add("dnn_object_detection")(n["output"]);
n = b.add("base_denormalize_3d_uint8")(n["output"]);

Expand Down
4 changes: 2 additions & 2 deletions example/dnn_compile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ int main(int argc, char *argv[]) {
b.with_bb_module("ion-bb");

Node n;
n = b.add("image_io_color_data_loader").set_param(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.png"}, Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)});
n = b.add("image_io_color_data_loader").set_params(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.png"}, Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)});
n = b.add("base_normalize_3d_uint8")(n["output"]);
n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_param(Param{"dim0", "2"}, Param{"dim1", "0"}, Param{"dim2", "1"}); // CHW -> HWC
n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_params(Param{"dim0", "2"}, Param{"dim1", "0"}, Param{"dim2", "1"}); // CHW -> HWC
n = b.add("dnn_object_detection")(n["output"]);
n = b.add("base_denormalize_3d_uint8")(n["output"]);

Expand Down
4 changes: 2 additions & 2 deletions example/fpga_dnn.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ int main(int argc, char *argv[]) {
b.set_target(Halide::get_target_from_environment());

Node n;
n = b.add("image_io_color_data_loader").set_param(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.jpg"});
n = b.add("image_io_color_data_loader").set_params(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.jpg"});
n = b.add("base_normalize_3d_uint8")(n["output"]);
n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_param(Param{"dim0", "2"}, Param{"dim1", "0"}, Param{"dim2", "1"}); // CHW -> HWC
n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_params(Param{"dim0", "2"}, Param{"dim1", "0"}, Param{"dim2", "1"}); // CHW -> HWC
n = b.add("dnn_object_detection")(n["output"]);
n = b.add("base_denormalize_3d_uint8")(n["output"]);

Expand Down
6 changes: 3 additions & 3 deletions example/fpga_dnn_compile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ int main(int argc, char *argv[]) {
// b.set_target(Halide::Target("arm-64-linux"));

Node n;
n = b.add("image_io_color_data_loader").set_param(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.jpg"});
n = b.add("image_io_color_data_loader").set_params(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.jpg"});
n = b.add("fpga_normalize_3d_chw_uint8")
.set_param(
.set_params(
Param{"width", "512"},
Param{"height", "512"}
)(n["output"]);
n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_param(Param{"dim0", "2"}, Param{"dim1", "0"}, Param{"dim2", "1"}); // CHW -> HWC
n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_params(Param{"dim0", "2"}, Param{"dim1", "0"}, Param{"dim2", "1"}); // CHW -> HWC
n = b.add("dnn_object_detection")(n["output"]);
n = b.add("base_denormalize_3d_uint8")(n["output"]);

Expand Down
Loading
Loading