diff --git a/README.md b/README.md index 2d70ec2a..a5f35f96 100644 --- a/README.md +++ b/README.md @@ -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 output{size}; diff --git a/app/realtime-captioning/main.py b/app/realtime-captioning/main.py index d7c9f3b9..5242a3c3 100644 --- a/app/realtime-captioning/main.py +++ b/app/realtime-captioning/main.py @@ -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): diff --git a/example/demo.cc b/example/demo.cc index 10e37a4b..981a6027 100644 --- a/example/demo.cc +++ b/example/demo.cc @@ -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"]); @@ -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, @@ -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))( @@ -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), @@ -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"]); @@ -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, @@ -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"]; @@ -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), @@ -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), @@ -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"); diff --git a/example/demo_compile.cc b/example/demo_compile.cc index 51829b07..ecd04ef8 100644 --- a/example/demo_compile.cc +++ b/example/demo_compile.cc @@ -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"]); @@ -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, @@ -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)})( @@ -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)}, @@ -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"]); @@ -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, @@ -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"]; @@ -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)}, @@ -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)}, @@ -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"); diff --git a/example/dnn.cc b/example/dnn.cc index 630a4eb8..db9d79f7 100644 --- a/example/dnn.cc +++ b/example/dnn.cc @@ -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"]); diff --git a/example/dnn_compile.cc b/example/dnn_compile.cc index cab344d3..f1d86953 100644 --- a/example/dnn_compile.cc +++ b/example/dnn_compile.cc @@ -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"]); diff --git a/example/fpga_dnn.cc b/example/fpga_dnn.cc index e1c1fbfe..e02ea061 100644 --- a/example/fpga_dnn.cc +++ b/example/fpga_dnn.cc @@ -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"]); diff --git a/example/fpga_dnn_compile.cc b/example/fpga_dnn_compile.cc index 957b945b..18ae6f49 100644 --- a/example/fpga_dnn_compile.cc +++ b/example/fpga_dnn_compile.cc @@ -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"]); diff --git a/example/fpga_isp_compile.cc b/example/fpga_isp_compile.cc index 4f06fe16..b3b30758 100644 --- a/example/fpga_isp_compile.cc +++ b/example/fpga_isp_compile.cc @@ -12,19 +12,19 @@ int main(int argc, char *argv[]) { b.set_target(Halide::get_target_from_environment()); Node imx219 = b.add("image_io_imx219") - .set_param( + .set_params( Param{"force_sim_mode", "true"}, Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.jpg"}); Node downscale = b.add("image_processing_bayer_downscale_uint16") - .set_param( + .set_params( Param{"input_width", "3264"}, Param{"input_height", "2464"}, Param{"downscale_factor", "2"})( imx219["output"]); Node isp = b.add("fpga_simple_isp_with_unsharp_mask") - .set_param( + .set_params( Param{"bayer_pattern", "0"}, Param{"width", "1632"}, Param{"height", "1232"}, @@ -41,14 +41,14 @@ int main(int argc, char *argv[]) { downscale["output"]); Node reorder = b.add("base_reorder_buffer_3d_uint8") - .set_param( + .set_params( Param{"dim0", "1"}, Param{"dim1", "2"}, Param{"dim2", "0"})( isp["output"]); Node output = b.add("image_io_image_saver") - .set_param( + .set_params( Param{"width", "816"}, Param{"height", "616"}, Param{"path", "out.png"})( diff --git a/example/gender_count.cc b/example/gender_count.cc index 501e48f5..3fcdebb7 100644 --- a/example/gender_count.cc +++ b/example/gender_count.cc @@ -17,21 +17,21 @@ int main(int argc, char *argv[]) { b.with_bb_module("ion-bb"); Node n; - n = b.add("image_io_camera").set_param(wparam, hparam); + n = b.add("image_io_camera").set_params(wparam, hparam); 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 auto img = n["output"]; n = b.add("dnn_tlt_peoplenet")(img); - n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_param(Param("dim0", 1), Param("dim1", 2), Param("dim2", 0)); // HWC -> CHW + n = b.add("base_reorder_buffer_3d_float")(n["output"]).set_params(Param("dim0", 1), Param("dim1", 2), Param("dim2", 0)); // HWC -> CHW n = b.add("base_denormalize_3d_uint8")(n["output"]); - n = b.add("image_io_gui_display")(n["output"]).set_param(wparam, hparam); + n = b.add("image_io_gui_display")(n["output"]).set_params(wparam, hparam); Port out_p1 = n["output"]; - n = b.add("dnn_tlt_peoplenet_md")(img).set_param(wparam, hparam); - n = b.add("dnn_classify_gender")(img, n["output"]).set_param(wparam, hparam); - n = b.add("dnn_json_dict_average_regulator")(n["output"]).set_param(Param("period_in_sec", 10)); - n = b.add("dnn_ifttt_webhook_uploader")(n["output"]).set_param(Param("ifttt_webhook_url", "http://maker.ifttt.com/trigger/gender_count/with/key/buf--6AoUjTGu868Pva_Q9")); + n = b.add("dnn_tlt_peoplenet_md")(img).set_params(wparam, hparam); + n = b.add("dnn_classify_gender")(img, n["output"]).set_params(wparam, hparam); + n = b.add("dnn_json_dict_average_regulator")(n["output"]).set_params(Param("period_in_sec", 10)); + n = b.add("dnn_ifttt_webhook_uploader")(n["output"]).set_params(Param("ifttt_webhook_url", "http://maker.ifttt.com/trigger/gender_count/with/key/buf--6AoUjTGu868Pva_Q9")); Port out_p2 = n["output"]; Halide::Buffer out1 = Halide::Buffer::make_scalar(); diff --git a/example/imx219_isp_display.cc b/example/imx219_isp_display.cc index 2a4e7991..4bd7c877 100644 --- a/example/imx219_isp_display.cc +++ b/example/imx219_isp_display.cc @@ -29,16 +29,16 @@ int main(int argc, char *argv[]) { Node n; Node ns[num]; for (int i=0; i::make_scalar(); diff --git a/example/isp.cc b/example/isp.cc index adbfe5bb..98161813 100644 --- a/example/isp.cc +++ b/example/isp.cc @@ -79,19 +79,19 @@ int main(int argc, char *argv[]) { Node debug_output; loader = b.add("image_io_grayscale_data_loader") - .set_param( + .set_params( Param("width", 3264), Param("height", 2464), Param("url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/IMX219-3264x2464-RG10.raw")); normalize = b.add("image_processing_normalize_raw_image") - .set_param( + .set_params( Param("bit_width", 10), Param("bit_shift", 0))( loader["output"]); offset = b.add("image_processing_bayer_offset") - .set_param( + .set_params( bayer_pattern)( &offset_r, &offset_g, @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) { normalize["output"]); shading_correction = b.add("image_processing_lens_shading_correction_linear") - .set_param( + .set_params( bayer_pattern, Param("width", width), Param("height", height))( @@ -111,29 +111,29 @@ int main(int argc, char *argv[]) { &shading_correction_offset_b, offset["output"]); white_balance = b.add("image_processing_bayer_white_balance") - .set_param( + .set_params( bayer_pattern)( &gain_r, &gain_g, &gain_b, shading_correction["output"]); demosaic = b.add("image_processing_bayer_demosaic_filter") - .set_param( + .set_params( bayer_pattern, Param("width", width), Param("height", height))( white_balance["output"]); luminance = b.add("image_processing_calc_luminance") - .set_param( + .set_params( Param("luminance_method", "Average"))( demosaic["output"]); luminance_filter = b.add("base_constant_buffer_2d_float") - .set_param( + .set_params( Param("values", 0.04), Param("extent0", 5), Param("extent1", 5)); filtered_luminance = b.add("image_processing_convolution_2d") - .set_param( + .set_params( Param("boundary_conditions_method", "MirrorInterior"), Param("window_size", 2), Param("width", width), @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) { luminance_filter["output"], luminance["output"]); noise_reduction = b.add("image_processing_bilateral_filter_3d") - .set_param( + .set_params( Param("color_difference_method", "Average"), Param("window_size", 2), Param("width", width), @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) { filtered_luminance["output"], demosaic["output"]); color_matrix = b.add("base_constant_buffer_2d_float") - .set_param( + .set_params( Param{"values", "2.20213000 -1.27425000 0.07212000 " "-0.25650000 1.45961000 -0.20311000 " "0.07458000 -1.35791000 2.28333000"}, @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) { color_matrix["output"], noise_reduction["output"]); distortion_correction = b.add("image_processing_lens_distortion_correction_model_3d") - .set_param( + .set_params( Param("width", width), Param("height", height))( &k1, @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) { &output_scale, color_conversion["output"]); resize = b.add("image_processing_resize_area_average_3d") - .set_param( + .set_params( Param("width", width), Param("height", height), Param("scale", resize_scale))( diff --git a/example/isp_and_sgm.cc b/example/isp_and_sgm.cc index 600bb22c..6ad3f77b 100644 --- a/example/isp_and_sgm.cc +++ b/example/isp_and_sgm.cc @@ -94,19 +94,19 @@ int main(int argc, char *argv[]) { Node color_matrix_r, color_conversion_r, gamma_correction_r, distortion_lut_r, distortion_correction_r, resize_r, final_luminance_r; loader = b.add("image_io_grayscale_data_loader") - .set_param( + .set_params( Param("width", raw_width), Param("height", raw_height), Param("url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/OV5647x2-5184x1944-GB10.raw")); normalize = b.add("image_processing_normalize_raw_image") - .set_param( + .set_params( Param("bit_width", "10"), Param("bit_shift", "6"))( loader["output"]); crop_l = b.add("image_processing_crop_image_2d_float") - .set_param( + .set_params( Param("x_dim", "0"), Param("y_dim", "1"), Param("input_width", "0"), @@ -117,14 +117,14 @@ int main(int argc, char *argv[]) { Param("output_height", buffer_height))( normalize["output"]); offset_l = b.add("image_processing_bayer_offset") - .set_param( + .set_params( bayer_pattern_l)( &offset_r_l, &offset_g_l, &offset_b_l, normalize["output"]); shading_correction_l = b.add("image_processing_lens_shading_correction_linear") - .set_param( + .set_params( bayer_pattern_l, Param("width", buffer_width), Param("height", buffer_height))( @@ -136,29 +136,29 @@ int main(int argc, char *argv[]) { &shading_correction_offset_b_l, offset_l["output"]); white_balance_l = b.add("image_processing_bayer_white_balance") - .set_param( + .set_params( bayer_pattern_l)( &gain_r_l, &gain_g_l, &gain_b_l, shading_correction_l["output"]); demosaic_l = b.add("image_processing_bayer_demosaic_filter") - .set_param( + .set_params( bayer_pattern_l, Param("width", buffer_width), Param("height", buffer_height))( white_balance_l["output"]); luminance_l = b.add("image_processing_calc_luminance") - .set_param( + .set_params( Param("luminance_method", "Average"))( demosaic_l["output"]); luminance_filter_l = b.add("base_constant_buffer_2d_float") - .set_param( + .set_params( Param("values", "0.04"), Param("extent0", "5"), Param("extent1", "5")); filtered_luminance_l = b.add("image_processing_convolution_2d") - .set_param( + .set_params( Param("boundary_conditions_method", "MirrorInterior"), Param("window_size", "2"), Param("width", buffer_width), @@ -166,7 +166,7 @@ int main(int argc, char *argv[]) { luminance_filter_l["output"], luminance_l["output"]); noise_reduction_l = b.add("image_processing_bilateral_filter_3d") - .set_param( + .set_params( Param("color_difference_method", "Average"), Param("window_size", "2"), Param("width", buffer_width), @@ -176,7 +176,7 @@ int main(int argc, char *argv[]) { filtered_luminance_l["output"], demosaic_l["output"]); color_matrix_l = b.add("base_constant_buffer_2d_float") - .set_param( + .set_params( Param{"values", "1.5 -0.25 -0.25 " "-0.25 1.5 -0.25 " "-0.25 -0.25 1.5"}, @@ -186,7 +186,7 @@ int main(int argc, char *argv[]) { color_matrix_l["output"], noise_reduction_l["output"]); distortion_correction_l = b.add("image_processing_lens_distortion_correction_model_3d") - .set_param( + .set_params( Param("width", buffer_width), Param("height", buffer_height))( &k1_l, @@ -201,13 +201,13 @@ int main(int argc, char *argv[]) { &output_scale_l, color_conversion_l["output"]); resize_l = b.add("image_processing_resize_area_average_3d") - .set_param( + .set_params( Param("width", buffer_width), Param("height", buffer_height), Param("scale", resize_scale_l))( distortion_correction_l["output"]); final_luminance_l = b.add("image_processing_calc_luminance") - .set_param( + .set_params( Param("luminance_method", "Y"))( resize_l["output"]); gamma_correction_l = b.add("image_processing_gamma_correction_2d")( @@ -215,7 +215,7 @@ int main(int argc, char *argv[]) { final_luminance_l["output"]); crop_r = b.add("image_processing_crop_image_2d_float") - .set_param( + .set_params( Param("x_dim", "0"), Param("y_dim", "1"), Param("input_width", "0"), @@ -226,14 +226,14 @@ int main(int argc, char *argv[]) { Param("output_height", buffer_height))( normalize["output"]); offset_r = b.add("image_processing_bayer_offset") - .set_param( + .set_params( bayer_pattern_r)( &offset_r_r, &offset_g_r, &offset_b_r, normalize["output"]); shading_correction_r = b.add("image_processing_lens_shading_correction_linear") - .set_param( + .set_params( bayer_pattern_r, Param("width", buffer_width), Param("height", buffer_height))( @@ -245,29 +245,29 @@ int main(int argc, char *argv[]) { &shading_correction_offset_b_r, offset_r["output"]); white_balance_r = b.add("image_processing_bayer_white_balance") - .set_param( + .set_params( bayer_pattern_r)( &gain_r_r, &gain_g_r, &gain_b_r, shading_correction_r["output"]); demosaic_r = b.add("image_processing_bayer_demosaic_filter") - .set_param( + .set_params( bayer_pattern_r, Param("width", buffer_width), Param("height", buffer_height))( white_balance_r["output"]); luminance_r = b.add("image_processing_calc_luminance") - .set_param( + .set_params( Param("luminance_method", "Average"))( demosaic_r["output"]); luminance_filter_r = b.add("base_constant_buffer_2d_float") - .set_param( + .set_params( Param("values", "0.04"), Param("extent0", "5"), Param("extent1", "5")); filtered_luminance_r = b.add("image_processing_convolution_2d") - .set_param( + .set_params( Param("boundary_conditions_method", "MirrorInterior"), Param("window_size", "2"), Param("width", buffer_width), @@ -275,7 +275,7 @@ int main(int argc, char *argv[]) { luminance_filter_r["output"], luminance_r["output"]); noise_reduction_r = b.add("image_processing_bilateral_filter_3d") - .set_param( + .set_params( Param("color_difference_method", "Average"), Param("window_size", "2"), Param("width", buffer_width), @@ -285,7 +285,7 @@ int main(int argc, char *argv[]) { filtered_luminance_r["output"], demosaic_r["output"]); color_matrix_r = b.add("base_constant_buffer_2d_float") - .set_param( + .set_params( Param{"values", "1.5 -0.25 -0.25 " "-0.25 1.5 -0.25 " "-0.25 -0.25 1.5"}, @@ -295,7 +295,7 @@ int main(int argc, char *argv[]) { color_matrix_r["output"], noise_reduction_r["output"]); distortion_correction_r = b.add("image_processing_lens_distortion_correction_model_3d") - .set_param( + .set_params( Param("width", buffer_width), Param("height", buffer_height))( &k1_r, @@ -310,13 +310,13 @@ int main(int argc, char *argv[]) { &output_scale_r, color_conversion_r["output"]); resize_r = b.add("image_processing_resize_area_average_3d") - .set_param( + .set_params( Param("width", buffer_width), Param("height", buffer_height), Param("scale", resize_scale_r))( distortion_correction_r["output"]); final_luminance_r = b.add("image_processing_calc_luminance") - .set_param( + .set_params( Param("luminance_method", "Y"))( resize_r["output"]); gamma_correction_r = b.add("image_processing_gamma_correction_2d")( @@ -324,20 +324,20 @@ int main(int argc, char *argv[]) { final_luminance_r["output"]); Node ln = b.add("base_denormalize_2d_uint8")(gamma_correction_l["output"]); - ln = b.add("sgm_census")(ln["output"]).set_param(Param("width", output_width), Param("height", output_height)); + ln = b.add("sgm_census")(ln["output"]).set_params(Param("width", output_width), Param("height", output_height)); Node rn = b.add("base_denormalize_2d_uint8")(gamma_correction_r["output"]); - rn = b.add("sgm_census")(rn["output"]).set_param(Param("width", output_width), Param("height", output_height)); + rn = b.add("sgm_census")(rn["output"]).set_params(Param("width", output_width), Param("height", output_height)); - Node n = b.add("sgm_matching_cost")(ln["output"], rn["output"]).set_param(Param("width", output_width), Param("height", output_height)); + Node n = b.add("sgm_matching_cost")(ln["output"], rn["output"]).set_params(Param("width", output_width), Param("height", output_height)); - Node up = b.add("sgm_scan_cost")(n["output"]).set_param(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("dx", 0), Param("dy", 1)); - Node lp = b.add("sgm_scan_cost")(n["output"]).set_param(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("dx", 1), Param("dy", 0)); - Node rp = b.add("sgm_scan_cost")(n["output"]).set_param(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("dx", -1), Param("dy", 0)); - Node dp = b.add("sgm_scan_cost")(n["output"]).set_param(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("dx", 0), Param("dy", -1)); + Node up = b.add("sgm_scan_cost")(n["output"]).set_params(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("dx", 0), Param("dy", 1)); + Node lp = b.add("sgm_scan_cost")(n["output"]).set_params(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("dx", 1), Param("dy", 0)); + Node rp = b.add("sgm_scan_cost")(n["output"]).set_params(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("dx", -1), Param("dy", 0)); + Node dp = b.add("sgm_scan_cost")(n["output"]).set_params(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("dx", 0), Param("dy", -1)); - n = b.add("sgm_add_cost4")(up["output"], lp["output"], rp["output"], dp["output"]).set_param(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("num", 4)); - n = b.add("sgm_disparity")(n["output"]).set_param(Param("width", output_width), Param("height", output_height), Param("disp", disp)); + n = b.add("sgm_add_cost4")(up["output"], lp["output"], rp["output"], dp["output"]).set_params(Param("width", output_width), Param("height", output_height), Param("disp", disp), Param("num", 4)); + n = b.add("sgm_disparity")(n["output"]).set_params(Param("width", output_width), Param("height", output_height), Param("disp", disp)); Halide::Buffer obuf(std::vector{output_width, output_height}); // Halide::Buffer obuf1(std::vector{output_width, output_height}); diff --git a/example/llm_llava.cc b/example/llm_llava.cc index f09b02fd..6ee874c9 100644 --- a/example/llm_llava.cc +++ b/example/llm_llava.cc @@ -23,13 +23,13 @@ int main(int argc, char *argv[]) { b.set_target(Halide::get_target_from_environment()); b.with_bb_module("ion-bb"); - auto n_img_cwh = b.add("image_io_color_data_loader").set_param(Param{"url", "http://www.onthejob.education/images/4th_level/Road_Worker/Road_Worker_Darwin.jpg"}, Param{"width", width}, Param{"height", height}); - auto n_img_whc = b.add("base_reorder_buffer_3d_uint8")(n_img_cwh["output"]).set_param(Param{"dim0", 2}, Param{"dim1", 0}, Param{"dim2", 1}); - // auto n_img_cwh = b.add("image_io_u3v_cameraN_u8x3").set_param(Param{"num_devices", "1"}, Param{"realtime_diaplay_mode", true}); - // auto n_img_whc = b.add("base_reorder_buffer_3d_uint8")(n_img_cwh["output"]).set_param(Param{"dim0", 1}, Param{"dim1", 2}, Param{"dim2", 0}); + auto n_img_cwh = b.add("image_io_color_data_loader").set_params(Param{"url", "http://www.onthejob.education/images/4th_level/Road_Worker/Road_Worker_Darwin.jpg"}, Param{"width", width}, Param{"height", height}); + auto n_img_whc = b.add("base_reorder_buffer_3d_uint8")(n_img_cwh["output"]).set_params(Param{"dim0", 2}, Param{"dim1", 0}, Param{"dim2", 1}); + // auto n_img_cwh = b.add("image_io_u3v_cameraN_u8x3").set_params(Param{"num_devices", "1"}, Param{"realtime_diaplay_mode", true}); + // auto n_img_whc = b.add("base_reorder_buffer_3d_uint8")(n_img_cwh["output"]).set_params(Param{"dim0", 1}, Param{"dim1", 2}, Param{"dim2", 0}); - auto n_disp = b.add("image_io_gui_display")(n_img_whc["output"][0]).set_param(Param{"width", width}, Param{"height", height}); - auto n_txt = b.add("llm_llava")(n_img_cwh["output"][0], prompt).set_param(Param{"width", width}, Param{"height", height}); + auto n_disp = b.add("image_io_gui_display")(n_img_whc["output"][0]).set_params(Param{"width", width}, Param{"height", height}); + auto n_txt = b.add("llm_llava")(n_img_cwh["output"][0], prompt).set_params(Param{"width", width}, Param{"height", height}); Buffer txt_output{1024}; n_txt["output"].bind(txt_output); diff --git a/example/sgm_compile.cc b/example/sgm_compile.cc index 743e52a8..ab613a16 100644 --- a/example/sgm_compile.cc +++ b/example/sgm_compile.cc @@ -15,21 +15,21 @@ int main() { b.set_target(Halide::get_target_from_environment()); b.with_bb_module("ion-bb"); - Node ln = b.add("image_io_color_data_loader").set_param(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/aloe_left.jpg"}, Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)}); + Node ln = b.add("image_io_color_data_loader").set_params(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/aloe_left.jpg"}, Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)}); ln = b.add("base_normalize_3d_uint8")(ln["output"]); - ln = b.add("image_processing_resize_nearest_3d")(ln["output"]).set_param(Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)}, Param{"scale", std::to_string(scale)}); - ln = b.add("base_schedule")(ln["output"]).set_param(Param{"output_name", "scaled_left"}, Param{"compute_level", "compute_root"}, Param("input.type", "float32"), Param("input.dim", 3)); - ln = b.add("image_processing_calc_luminance")(ln["output"]).set_param(Param{"luminance_method", "Average"}); + ln = b.add("image_processing_resize_nearest_3d")(ln["output"]).set_params(Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)}, Param{"scale", std::to_string(scale)}); + ln = b.add("base_schedule")(ln["output"]).set_params(Param{"output_name", "scaled_left"}, Param{"compute_level", "compute_root"}, Param("input.type", "float32"), Param("input.dim", 3)); + ln = b.add("image_processing_calc_luminance")(ln["output"]).set_params(Param{"luminance_method", "Average"}); ln = b.add("base_denormalize_2d_uint8")(ln["output"]); - Node rn = b.add("image_io_color_data_loader").set_param(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/aloe_right.jpg"}, Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)}); + Node rn = b.add("image_io_color_data_loader").set_params(Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/aloe_right.jpg"}, Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)}); rn = b.add("base_normalize_3d_uint8")(rn["output"]); - rn = b.add("image_processing_resize_nearest_3d")(rn["output"]).set_param(Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)}, Param{"scale", std::to_string(scale)}); - rn = b.add("base_schedule")(rn["output"]).set_param(Param{"output_name", "scaled_right"}, Param{"compute_level", "compute_root"}, Param("input.type", "float32"), Param("input.dim", 3)); - rn = b.add("image_processing_calc_luminance")(rn["output"]).set_param(Param{"luminance_method", "Average"}); + rn = b.add("image_processing_resize_nearest_3d")(rn["output"]).set_params(Param{"width", std::to_string(input_width)}, Param{"height", std::to_string(input_height)}, Param{"scale", std::to_string(scale)}); + rn = b.add("base_schedule")(rn["output"]).set_params(Param{"output_name", "scaled_right"}, Param{"compute_level", "compute_root"}, Param("input.type", "float32"), Param("input.dim", 3)); + rn = b.add("image_processing_calc_luminance")(rn["output"]).set_params(Param{"luminance_method", "Average"}); rn = b.add("base_denormalize_2d_uint8")(rn["output"]); - Node n = b.add("sgm_sgm")(ln["output"], rn["output"]).set_param(Param{"disp", std::to_string(disp)}, Param{"width", std::to_string(output_width)}, Param{"height", std::to_string(output_height)}); + Node n = b.add("sgm_sgm")(ln["output"], rn["output"]).set_params(Param{"disp", std::to_string(disp)}, Param{"width", std::to_string(output_width)}, Param{"height", std::to_string(output_height)}); b.compile("sgm"); } catch (const std::exception &e) { diff --git a/example/u3v.cc b/example/u3v.cc index 2b2fd20d..98d700c4 100644 --- a/example/u3v.cc +++ b/example/u3v.cc @@ -74,7 +74,7 @@ void display_and_save(int32_t width, int32_t height, std::string directory_path, // obtain sensor images auto n = b.add("image_io_u3v_camera2_u16x2")(dispose_camera, gain0_p, gain1_p, exposure0_p, exposure1_p) - .set_param( + .set_params( Param{"pixel_format_ptr", PIXEL_FORMAT}, Param{"frame_sync", "true"}, Param{"gain_key", FEATURE_GAIN_KEY}, @@ -84,26 +84,26 @@ void display_and_save(int32_t width, int32_t height, std::string directory_path, Port rp = n["output1"]; Port fcp = n["frame_count"]; - n = b.add("image_io_binarysaver")(rp, lp, fcp, dispose_writer, wp, hp).set_param( + n = b.add("image_io_binarysaver")(rp, lp, fcp, dispose_writer, wp, hp).set_params( Param{"output_directory", directory_path}, Param{"fps", "60.0"}); Port terminator = n["output"]; /* image processing on the iamge obtained from the left sensor */ - n = b.add("image_processing_normalize_raw_image")(lp).set_param(Param{"bit_width", "12"}, Param{"bit_shift", "0"}); - n = b.add("image_processing_bayer_white_balance")(r_gain0_p, g_gain0_p, b_gain0_p, n["output"]).set_param(Param{"bayer_pattern", "GBRG"}); - n = b.add("image_processing_bayer_demosaic_simple")(n["output"]).set_param( + n = b.add("image_processing_normalize_raw_image")(lp).set_params(Param{"bit_width", "12"}, Param{"bit_shift", "0"}); + n = b.add("image_processing_bayer_white_balance")(r_gain0_p, g_gain0_p, b_gain0_p, n["output"]).set_params(Param{"bayer_pattern", "GBRG"}); + n = b.add("image_processing_bayer_demosaic_simple")(n["output"]).set_params( Param{"bayer_pattern", "GBRG"}, Param{"width", std::to_string(width)}, Param{"height", std::to_string(height)} ); - n = b.add("image_processing_resize_bilinear_3d")(n["output"]).set_param( + n = b.add("image_processing_resize_bilinear_3d")(n["output"]).set_params( Param{"width", std::to_string(width)}, Param{"height", std::to_string(height)}, Param{"scale", std::to_string(2.0f)} ); n = b.add("base_denormalize_3d_uint8")(n["output"]); - n = b.add("image_processing_crop_image_3d_uint8")(n["output"]).set_param( + n = b.add("image_processing_crop_image_3d_uint8")(n["output"]).set_params( Param{"input_width", std::to_string(width)}, Param{"input_height", std::to_string(height)}, Param{"output_width", std::to_string(width)}, @@ -112,20 +112,20 @@ void display_and_save(int32_t width, int32_t height, std::string directory_path, lp = n["output"]; /* image processing on the iamge obtained from the right sensor */ - n = b.add("image_processing_normalize_raw_image")(rp).set_param(Param{"bit_width", "12"}, Param{"bit_shift", "0"}); - n = b.add("image_processing_bayer_white_balance")(r_gain1_p, g_gain1_p, b_gain1_p, n["output"]).set_param(Param{"bayer_pattern", "GBRG"}); - n = b.add("image_processing_bayer_demosaic_simple")(n["output"]).set_param( + n = b.add("image_processing_normalize_raw_image")(rp).set_params(Param{"bit_width", "12"}, Param{"bit_shift", "0"}); + n = b.add("image_processing_bayer_white_balance")(r_gain1_p, g_gain1_p, b_gain1_p, n["output"]).set_params(Param{"bayer_pattern", "GBRG"}); + n = b.add("image_processing_bayer_demosaic_simple")(n["output"]).set_params( Param{"bayer_pattern", "GBRG"}, Param{"width", std::to_string(width)}, Param{"height", std::to_string(height)} ); - n = b.add("image_processing_resize_bilinear_3d")(n["output"]).set_param( + n = b.add("image_processing_resize_bilinear_3d")(n["output"]).set_params( Param{"width", std::to_string(width)}, Param{"height", std::to_string(height)}, Param{"scale", std::to_string(2.0f)} ); n = b.add("base_denormalize_3d_uint8")(n["output"]); - n = b.add("image_processing_crop_image_3d_uint8")(n["output"]).set_param( + n = b.add("image_processing_crop_image_3d_uint8")(n["output"]).set_params( Param{"input_width", std::to_string(width)}, Param{"input_height", std::to_string(height)}, Param{"output_width", std::to_string(width)}, @@ -134,13 +134,13 @@ void display_and_save(int32_t width, int32_t height, std::string directory_path, rp = n["output"]; // display images - n = b.add("image_io_gui_display")(lp).set_param( + n = b.add("image_io_gui_display")(lp).set_params( Param{"idx", "0"}, Param{"width", std::to_string(width)}, Param{"height", std::to_string(height)} ); Port display_output0_p = n["output"]; - n = b.add("image_io_gui_display")(rp).set_param( + n = b.add("image_io_gui_display")(rp).set_params( Param{"idx", "1"}, Param{"width", std::to_string(width)}, Param{"height", std::to_string(height)}); diff --git a/example/u3v_camera1_opencv/u3v_camera1_opencv.cc b/example/u3v_camera1_opencv/u3v_camera1_opencv.cc index a48aa68a..94583d19 100644 --- a/example/u3v_camera1_opencv/u3v_camera1_opencv.cc +++ b/example/u3v_camera1_opencv/u3v_camera1_opencv.cc @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) // Connect the input port to the Node instance created by b.add(). Node n = b.add("image_io_u3v_cameraN_u16x2")(&gain, &exposure) - .set_param( + .set_params( Param("num_devices", 1), Param("frame_sync", false), Param("gain_key", FEATURE_GAIN_KEY), diff --git a/example/u3v_camera1_opencv/u3v_camera1_opencv.py b/example/u3v_camera1_opencv/u3v_camera1_opencv.py index fa1e25de..5218c3b1 100644 --- a/example/u3v_camera1_opencv/u3v_camera1_opencv.py +++ b/example/u3v_camera1_opencv/u3v_camera1_opencv.py @@ -42,7 +42,7 @@ # Add node and connect the input port to the node instance node = builder.add('image_io_u3v_cameraN_u16x2')\ .set_iport([gain0_p, exposure0_p])\ - .set_param([num_devices, frame_sync, gain_key, exposure_key, realtime_diaplay_mode, enable_control]) + .set_params([num_devices, frame_sync, gain_key, exposure_key, realtime_diaplay_mode, enable_control]) # Define Output Port out_p = node.get_port('output') diff --git a/example/u3v_camera2_opencv/u3v_camera2_opencv.cc b/example/u3v_camera2_opencv/u3v_camera2_opencv.cc index 40ef8cd3..751b867b 100644 --- a/example/u3v_camera2_opencv/u3v_camera2_opencv.cc +++ b/example/u3v_camera2_opencv/u3v_camera2_opencv.cc @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) // Connect the input port to the Node instance created by b.add(). Node n = b.add("image_io_u3v_cameraN_u16x2")(&gain, &exposure, &gain, &exposure) - .set_param( + .set_params( Param("frame_sync", false), Param("gain_key", FEATURE_GAIN_KEY), Param("exposure_key", FEATURE_EXPOSURE_KEY), diff --git a/example/u3v_camera2_opencv/u3v_camera2_opencv.py b/example/u3v_camera2_opencv/u3v_camera2_opencv.py index 871a5032..b6e8bb41 100644 --- a/example/u3v_camera2_opencv/u3v_camera2_opencv.py +++ b/example/u3v_camera2_opencv/u3v_camera2_opencv.py @@ -45,7 +45,7 @@ # Add node and connect the input port to the node instance node = builder.add('image_io_u3v_cameraN_u16x2')\ .set_iport([gain0_p, gain1_p, exposure0_p, exposure1_p, ])\ - .set_param([num_devices, frame_sync, gain_key, exposure_key, realtime_diaplay_mode, enable_control]) + .set_params([num_devices, frame_sync, gain_key, exposure_key, realtime_diaplay_mode, enable_control]) # Define Output Port diff --git a/example/u3v_fake.cc b/example/u3v_fake.cc index ffdb3e22..ec49e45b 100644 --- a/example/u3v_fake.cc +++ b/example/u3v_fake.cc @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) int height = 480; int num_device = 2; // if you don't set width and height, default width is 640 and default height is 480 - Node n = b.add("image_io_u3v_cameraN_u8x2")().set_param( + Node n = b.add("image_io_u3v_cameraN_u8x2")().set_params( Param("num_devices", num_device), Param("pixel_format", "Mono8")); @@ -35,19 +35,19 @@ int main(int argc, char *argv[]) // int width = 960; // int height = 640; // int num_device = 2; -// Node n = b.add("image_io_u3v_cameraN_u8x2")().set_param( +// Node n = b.add("image_io_u3v_cameraN_u8x2")().set_params( // Param("num_devices", num_device), // Param("force_sim_mode", true), // Param("width", width), // Param("height", height)); /********************RGB 8*************************/ -// Node n = b.add("image_io_u3v_cameraN_u8x3")().set_param( +// Node n = b.add("image_io_u3v_cameraN_u8x3")().set_params( // Param("num_devices", num_device), // Param("pixel_format", "RGB8")); /********************Mono16*************************/ -// Node n = b.add("image_io_u3v_cameraN_u16x2")().set_param( +// Node n = b.add("image_io_u3v_cameraN_u16x2")().set_params( // Param("num_devices", num_device), // Param("pixel_format", "Mono16")); diff --git a/example/v4l2.cc b/example/v4l2.cc index bb5745a8..e0b364a8 100644 --- a/example/v4l2.cc +++ b/example/v4l2.cc @@ -41,12 +41,12 @@ int main(int argc, char *argv[]) { const int32_t width = 640; const int32_t height = 480; - auto n0 = b.add("image_io_camera").set_param(Param("fps", 25), Param("width", width), Param("height", height), Param("index", "0"), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png")); - auto n1 = b.add("image_io_camera").set_param(Param("fps", 25), Param("width", width), Param("height", height), Param("index", "1"), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png")); - auto n2 = b.add("image_io_camera_simulation").set_param(Param("fps", 25), Param("width", width), Param("height", height), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png"), Param("bit_width", 10), Param("bit_shift", 6), Param("gain_r", 0.4), Param("gain_g", 0.5), Param("gain_b", 0.3125), Param("offset", 0.0625)); - auto n3 = b.add("image_io_camera_simulation").set_param(Param("fps", 25), Param("width", width), Param("height", height), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png"), Param("bit_width", 10), Param("bit_shift", 6), Param("gain_r", 0.4), Param("gain_g", 0.5), Param("gain_b", 0.3125), Param("offset", 0.0625)); - auto n4 = b.add("image_io_imx219").set_param(Param("fps", 25), Param("width", width), Param("height", height), Param("index", "4"), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png")); - auto n5 = b.add("image_io_imx219").set_param(Param("fps", 25), Param("width", width), Param("height", height), Param("index", "5"), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png")); + auto n0 = b.add("image_io_camera").set_params(Param("fps", 25), Param("width", width), Param("height", height), Param("index", "0"), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png")); + auto n1 = b.add("image_io_camera").set_params(Param("fps", 25), Param("width", width), Param("height", height), Param("index", "1"), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png")); + auto n2 = b.add("image_io_camera_simulation").set_params(Param("fps", 25), Param("width", width), Param("height", height), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png"), Param("bit_width", 10), Param("bit_shift", 6), Param("gain_r", 0.4), Param("gain_g", 0.5), Param("gain_b", 0.3125), Param("offset", 0.0625)); + auto n3 = b.add("image_io_camera_simulation").set_params(Param("fps", 25), Param("width", width), Param("height", height), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png"), Param("bit_width", 10), Param("bit_shift", 6), Param("gain_r", 0.4), Param("gain_g", 0.5), Param("gain_b", 0.3125), Param("offset", 0.0625)); + auto n4 = b.add("image_io_imx219").set_params(Param("fps", 25), Param("width", width), Param("height", height), Param("index", "4"), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png")); + auto n5 = b.add("image_io_imx219").set_params(Param("fps", 25), Param("width", width), Param("height", height), Param("index", "5"), Param("url", "http://optipng.sourceforge.net/pngtech/img/lena.png")); ion::Buffer obuf0(width, height, 3), obuf1(width, height, 3); ion::Buffer obuf2(width, height), obuf3(width, height); diff --git a/include/ion/c_ion.h b/include/ion/c_ion.h index 6347c455..ec59a654 100644 --- a/include/ion/c_ion.h +++ b/include/ion/c_ion.h @@ -56,8 +56,8 @@ int ion_param_destroy(ion_param_t); int ion_node_create(ion_node_t *); int ion_node_destroy(ion_node_t); int ion_node_get_port(ion_node_t, const char *, ion_port_t *); -int ion_node_set_iport(ion_node_t, ion_port_t *, int); -int ion_node_set_param(ion_node_t, ion_param_t *, int); +int ion_node_set_iports(ion_node_t, ion_port_t *, int); +int ion_node_set_params(ion_node_t, ion_param_t *, int); int ion_builder_create(ion_builder_t *); int ion_builder_destroy(ion_builder_t); diff --git a/include/ion/node.h b/include/ion/node.h index 8e3edea5..8ca8a928 100644 --- a/include/ion/node.h +++ b/include/ion/node.h @@ -57,12 +57,12 @@ class Node { * @return Node object whose parameter is set. */ template - Node set_param(Args ...args) { + Node set_params(Args ...args) { impl_->params = std::vector{args...}; return *this; } - void set_param(const std::vector& params) { + void set_params(const std::vector& params) { impl_->params = params; } @@ -77,11 +77,11 @@ class Node { */ template Node operator()(Args ...args) { - set_iport(std::vector{make_iport(args)...}); + set_iports(std::vector{make_iport(args)...}); return *this; } - void set_iport(const std::vector& ports); + void set_iports(const std::vector& ports); void set_iport(Port port); diff --git a/python/ionpy/Node.py b/python/ionpy/Node.py index c2c04114..829792c2 100644 --- a/python/ionpy/Node.py +++ b/python/ionpy/Node.py @@ -8,8 +8,8 @@ ion_node_create, ion_node_destroy, ion_node_get_port, - ion_node_set_iport, - ion_node_set_param, + ion_node_set_iports, + ion_node_set_params, ) from .Type import Type from .Port import Port @@ -35,7 +35,7 @@ def __del__(self): # TODO: Make it work well # def __call__(self, *args): - # self.set_iport(list(*args)) + # self.set_iports(list(*args)) def get_port(self, name: str) -> Port: c_port = c_ion_port_t() @@ -46,7 +46,7 @@ def get_port(self, name: str) -> Port: return Port(obj_=c_port) - def set_iport(self, ports: List[Port]) -> 'Node': + def set_iports(self, ports: List[Port]) -> 'Node': num_ports = len(ports) c_ion_port_sized_array_t = c_ion_port_t * num_ports # arraysize == num_ports c_ports = c_ion_port_sized_array_t() # instance @@ -54,13 +54,13 @@ def set_iport(self, ports: List[Port]) -> 'Node': for i in range(num_ports): c_ports[i] = ports[i].obj - ret = ion_node_set_iport(self.obj, c_ports, num_ports) + ret = ion_node_set_iports(self.obj, c_ports, num_ports) if ret != 0: raise Exception('Invalid operation') return self - def set_param(self, params: List[Param]) -> 'Node': + def set_params(self, params: List[Param]) -> 'Node': num_params = len(params) c_ion_param_sized_array_t = c_ion_param_t * num_params # arraysize == num_params c_params = c_ion_param_sized_array_t() # instance @@ -68,7 +68,7 @@ def set_param(self, params: List[Param]) -> 'Node': for i in range(num_params): c_params[i] = params[i].obj - ret = ion_node_set_param(self.obj, c_params, num_params) + ret = ion_node_set_params(self.obj, c_params, num_params) if ret != 0: raise Exception('Invalid operation') diff --git a/python/ionpy/native.py b/python/ionpy/native.py index 6451aae7..4f9b0215 100644 --- a/python/ionpy/native.py +++ b/python/ionpy/native.py @@ -149,15 +149,15 @@ class c_builder_compile_option_t(ctypes.Structure): ion_node_get_port.restype = ctypes.c_int ion_node_get_port.argtypes = [ c_ion_node_t, ctypes.c_char_p, ctypes.POINTER(c_ion_port_t) ] -# int ion_node_set_iport(ion_node_t, ion_port_t *, int); -ion_node_set_iport = ion_core.ion_node_set_iport -ion_node_set_iport.restype = ctypes.c_int -ion_node_set_iport.argtypes = [ c_ion_node_t, ctypes.POINTER(c_ion_port_t), ctypes.c_int ] - -# int ion_node_set_param(ion_node_t, ion_param_t *, int); -ion_node_set_param = ion_core.ion_node_set_param -ion_node_set_param.restype = ctypes.c_int -ion_node_set_param.argtypes = [ c_ion_node_t, ctypes.POINTER(c_ion_param_t), ctypes.c_int ] +# int ion_node_set_iports(ion_node_t, ion_port_t *, int); +ion_node_set_iports = ion_core.ion_node_set_iports +ion_node_set_iports.restype = ctypes.c_int +ion_node_set_iports.argtypes = [ c_ion_node_t, ctypes.POINTER(c_ion_port_t), ctypes.c_int ] + +# int ion_node_set_params(ion_node_t, ion_param_t *, int); +ion_node_set_params = ion_core.ion_node_set_params +ion_node_set_params.restype = ctypes.c_int +ion_node_set_params.argtypes = [ c_ion_node_t, ctypes.POINTER(c_ion_param_t), ctypes.c_int ] # int ion_builder_create(ion_builder_t *); diff --git a/python/ionpy/version.py b/python/ionpy/version.py index 8c0d5d5b..528787cf 100644 --- a/python/ionpy/version.py +++ b/python/ionpy/version.py @@ -1 +1 @@ -__version__ = "2.0.0" +__version__ = "3.0.0" diff --git a/python/test/test_all.py b/python/test/test_all.py index 222ae793..6a62f844 100644 --- a/python/test/test_all.py +++ b/python/test/test_all.py @@ -13,7 +13,7 @@ def test_all(): builder.set_target(target='host') builder.with_bb_module(path='ion-bb-test') - node = builder.add('test_inc_i32x2').set_iport([input_port]).set_param(params=[ value41, ]) + node = builder.add('test_inc_i32x2').set_iports([input_port]).set_params(params=[ value41, ]) idata = np.full((4, 4), fill_value=1, dtype=np.int32) ibuf = Buffer(array=idata) diff --git a/python/test/test_binding.py b/python/test/test_binding.py index 03662296..1dbd93ac 100644 --- a/python/test/test_binding.py +++ b/python/test/test_binding.py @@ -12,7 +12,7 @@ def test_binding(): builder.set_target(target='host') builder.with_bb_module(path='ion-bb-test') - node = builder.add('test_incx_i32x2').set_iport([input_port, value_port]) + node = builder.add('test_incx_i32x2').set_iports([input_port, value_port]) idata = np.array([[42, 42]], dtype=np.int32) ibuf = Buffer(array=idata) diff --git a/python/test/test_graph.py b/python/test/test_graph.py index 6dab4d49..8e6cd3c8 100644 --- a/python/test/test_graph.py +++ b/python/test/test_graph.py @@ -11,7 +11,7 @@ def test_graph(): graph0 = builder.add_graph("graph0") - node0 = graph0.add('test_incx_i32x2').set_iport([input_port0, value_port0]) + node0 = graph0.add('test_incx_i32x2').set_iports([input_port0, value_port0]) idata0 = np.array([[42, 42]], dtype=np.int32) ibuf0 = Buffer(array=idata0) @@ -29,7 +29,7 @@ def test_graph(): graph1 = builder.add_graph("graph1") # graph1 = Graph(builder =builder, name="graph1") # alternative - node1 = graph1.add('test_incx_i32x2').set_iport([input_port1, value_port1]) + node1 = graph1.add('test_incx_i32x2').set_iports([input_port1, value_port1]) idata1 = np.array([[42, 42]], dtype=np.int32) ibuf1 = Buffer(array=idata1) diff --git a/python/test/test_node_param.py b/python/test/test_node_param.py index d94eacbd..34944f51 100644 --- a/python/test/test_node_param.py +++ b/python/test/test_node_param.py @@ -7,4 +7,4 @@ def test_node_param(): params = [ param_to_set, ] n = Node() - n.set_param(params) + n.set_params(params) diff --git a/python/test/test_node_port.py b/python/test/test_node_port.py index 4a3992d3..ab890077 100644 --- a/python/test/test_node_port.py +++ b/python/test/test_node_port.py @@ -12,7 +12,7 @@ def test_node_port(): builder.with_bb_module(path='ion-bb-test') # builder.with_bb_module(path='ion-bb-test.dll') # for Windows - n = builder.add('test_inc_i32x2').set_iport(ports=[ port_to_set, ]) + n = builder.add('test_inc_i32x2').set_iports(ports=[ port_to_set, ]) port_to_get = n.get_port('input') print(f'from node.get_port: {port_to_get}') diff --git a/python/test/test_pipeline.py b/python/test/test_pipeline.py index 943bf7dd..f5ec12af 100644 --- a/python/test/test_pipeline.py +++ b/python/test/test_pipeline.py @@ -19,9 +19,9 @@ def test_pipeline(): # make sure path includes libion-bb.so builder.with_bb_module(path='ion-bb') - node = builder.add('image_io_cameraN').set_param(params=[width, height, urls]) - node1 = builder.add("base_normalize_3d_uint8").set_iport(ports=[node.get_port(name='output')[0], ]) - node2 = builder.add("base_normalize_3d_uint8").set_iport(ports=[node.get_port(name='output')[1], ]) + node = builder.add('image_io_cameraN').set_params(params=[width, height, urls]) + node1 = builder.add("base_normalize_3d_uint8").set_iports(ports=[node.get_port(name='output')[0], ]) + node2 = builder.add("base_normalize_3d_uint8").set_iports(ports=[node.get_port(name='output')[1], ]) sizes = (w, h, 3) diff --git a/src/c_ion.cc b/src/c_ion.cc index 61ff11fa..e98287ed 100644 --- a/src/c_ion.cc +++ b/src/c_ion.cc @@ -320,14 +320,14 @@ int ion_node_get_port(ion_node_t obj, const char *key, ion_port_t *port_ptr) return 0; } -int ion_node_set_iport(ion_node_t obj, ion_port_t *ports_ptr, int ports_num) +int ion_node_set_iports(ion_node_t obj, ion_port_t *ports_ptr, int ports_num) { try { std::vector ports(ports_num); for (int i=0; i(ports_ptr[i]); } - reinterpret_cast(obj)->set_iport(ports); + reinterpret_cast(obj)->set_iports(ports); } catch (const Halide::Error& e) { log::error(e.what()); return 1; @@ -342,14 +342,14 @@ int ion_node_set_iport(ion_node_t obj, ion_port_t *ports_ptr, int ports_num) return 0; } -int ion_node_set_param(ion_node_t obj, ion_param_t *params_ptr, int params_num) +int ion_node_set_params(ion_node_t obj, ion_param_t *params_ptr, int params_num) { try { std::vector params(params_num); for (int i=0; i(params_ptr[i]); } - reinterpret_cast(obj)->set_param(params); + reinterpret_cast(obj)->set_params(params); } catch (const Halide::Error& e) { log::error(e.what()); return 1; diff --git a/src/node.cc b/src/node.cc index 6fb34460..f46bec25 100644 --- a/src/node.cc +++ b/src/node.cc @@ -29,7 +29,7 @@ Node::Impl::Impl(const NodeID& id_, const std::string& name_, const Halide::Targ arginfos = bb->arginfos(); } -void Node::set_iport(const std::vector& ports) { +void Node::set_iports(const std::vector& ports) { impl_->ports.erase(std::remove_if(impl_->ports.begin(), impl_->ports.end(), [&](const Port &p) { return p.has_succ_by_nid(this->id());}), diff --git a/test/array_dup_names.cc b/test/array_dup_names.cc index bd30912c..08d8372a 100644 --- a/test/array_dup_names.cc +++ b/test/array_dup_names.cc @@ -21,10 +21,10 @@ int main() { Builder b; b.set_target(Halide::get_host_target()); - auto n = b.add("test_array_output")(in).set_param(Param("len", len)); - n = b.add("test_array_input")(n["array_output"]).set_param(Param("array_input.size", len)); - n = b.add("test_array_output")(n["output"]).set_param(Param("len", len)); - n = b.add("test_array_input")(n["array_output"]).set_param(Param("array_input.size", len)); + auto n = b.add("test_array_output")(in).set_params(Param("len", len)); + n = b.add("test_array_input")(n["array_output"]).set_params(Param("array_input.size", len)); + n = b.add("test_array_output")(n["output"]).set_params(Param("len", len)); + n = b.add("test_array_input")(n["array_output"]).set_params(Param("array_input.size", len)); Halide::Buffer out(w, h); out.fill(0); diff --git a/test/array_inout.cc b/test/array_inout.cc index 8d104820..2a2ee474 100644 --- a/test/array_inout.cc +++ b/test/array_inout.cc @@ -24,8 +24,8 @@ int main() { Builder b; b.set_target(Halide::get_host_target()); - auto n = b.add("test_array_output")(in).set_param(Param("len", len)); - n = b.add("test_array_input")(n["array_output"]).set_param(Param("array_input.size", len)); + auto n = b.add("test_array_output")(in).set_params(Param("len", len)); + n = b.add("test_array_input")(n["array_output"]).set_params(Param("array_input.size", len)); n["output"].bind(out); b.run(); diff --git a/test/array_input.cc b/test/array_input.cc index 1dba284d..51a9e962 100644 --- a/test/array_input.cc +++ b/test/array_input.cc @@ -18,8 +18,8 @@ int main() { Builder b; b.set_target(Halide::get_host_target()); Node n; - n = b.add("test_array_copy")(input).set_param(Param("array_input.size", len)); - n = b.add("test_array_input")(n["array_output"]).set_param(Param("array_input.size", len)); + n = b.add("test_array_copy")(input).set_params(Param("array_input.size", len)); + n = b.add("test_array_input")(n["array_output"]).set_params(Param("array_input.size", len)); std::vector> ins{ Halide::Buffer{w, h}, @@ -70,8 +70,8 @@ int main() { Builder b; b.set_target(Halide::get_host_target()); Node n; - n = b.add("test_array_copy")(input).set_param(Param("array_input.size", len)); - n = b.add("test_array_input")(n["array_output"]).set_param(Param("array_input.size", len)); + n = b.add("test_array_copy")(input).set_params(Param("array_input.size", len)); + n = b.add("test_array_input")(n["array_output"]).set_params(Param("array_input.size", len)); Halide::Buffer in0(w, h), in1(w, h), in2(w, h), in3(w, h), in4(w, h); @@ -130,8 +130,8 @@ int main() { Builder b; b.set_target(Halide::get_host_target()); Node n; - n = b.add("test_array_copy")(ins).set_param(Param("array_input.size", len)); - n = b.add("test_array_input")(n["array_output"]).set_param(Param("array_input.size", len)); + n = b.add("test_array_copy")(ins).set_params(Param("array_input.size", len)); + n = b.add("test_array_input")(n["array_output"]).set_params(Param("array_input.size", len)); for (int y = 0; y < h; ++y) { for (int x = 0; x < w; ++x) { diff --git a/test/array_output.cc b/test/array_output.cc index 98b100b3..46dbd193 100644 --- a/test/array_output.cc +++ b/test/array_output.cc @@ -35,8 +35,8 @@ int main() { b.set_target(ion::get_host_target()); Node n; - n = b.add("test_array_output")(in).set_param(Param("len", len)); - n = b.add("test_array_copy")(n["array_output"]).set_param(Param("array_input.size", len)); + n = b.add("test_array_output")(in).set_params(Param("len", len)); + n = b.add("test_array_copy")(n["array_output"]).set_params(Param("array_input.size", len)); for (int i=0; i output{size}; - b.add("test")(input, &v, &v).set_param(Param("num", 2))["output"].bind(output); + b.add("test")(input, &v, &v).set_params(Param("num", 2))["output"].bind(output); b.compile("x"); b.run(); for (int i=0; i(), 2}; - n = b.add("test_extern_inc_i32x2")(ip).set_param(wp, hp, vp); - n = b.add("test_extern_inc_i32x2")(n["output"]).set_param(wp, hp, vp); + n = b.add("test_extern_inc_i32x2")(ip).set_params(wp, hp, vp); + n = b.add("test_extern_inc_i32x2")(n["output"]).set_params(wp, hp, vp); diff --git a/test/gpu-extern_compile.cc b/test/gpu-extern_compile.cc index feffe380..c8a5ded7 100644 --- a/test/gpu-extern_compile.cc +++ b/test/gpu-extern_compile.cc @@ -20,8 +20,8 @@ int main() Node n; Port ip{"input", Halide::type_of(), 2}; - n = b.add("test_extern_inc_i32x2")(ip).set_param(wp, hp, vp); - n = b.add("test_extern_inc_i32x2")(n["output"]).set_param(wp, hp, vp); + n = b.add("test_extern_inc_i32x2")(ip).set_params(wp, hp, vp); + n = b.add("test_extern_inc_i32x2")(n["output"]).set_params(wp, hp, vp); b.compile("gpu_extern"); diff --git a/test/graph.cc b/test/graph.cc index 98f94ab6..b7d8d290 100644 --- a/test/graph.cc +++ b/test/graph.cc @@ -25,7 +25,7 @@ int main() out1.fill(0); Graph g0 = b.add_graph("graph0"); - Node n0 = g0.add("test_inc_i32x2")(in0).set_param(Param("v", 40)); + Node n0 = g0.add("test_inc_i32x2")(in0).set_params(Param("v", 40)); n0["output"].bind(out0); g0.run(); @@ -41,7 +41,7 @@ int main() } Graph g1 = b.add_graph("graph1"); - Node n1 = g1.add("test_inc_i32x2")(in1).set_param(Param("v", 41)); + Node n1 = g1.add("test_inc_i32x2")(in1).set_params(Param("v", 41)); n1["output"].bind(out1); g1.run(); diff --git a/test/multi_pipe.cc b/test/multi_pipe.cc index cdfb762b..6179502c 100644 --- a/test/multi_pipe.cc +++ b/test/multi_pipe.cc @@ -17,13 +17,13 @@ int main() Buffer in0(std::vector{size, size}); in0.fill(0); Buffer out0(std::vector{size, size}); - n = b.add("test_inc_i32x2")(in0).set_param(Param{"v", 1});; + n = b.add("test_inc_i32x2")(in0).set_params(Param{"v", 1});; n["output"].bind(out0); Buffer in1(std::vector{size, size}); in1.fill(0); Buffer out1(std::vector{size, size}); - n = b.add("test_inc_i32x2")(in1).set_param(Param{"v", 2}); + n = b.add("test_inc_i32x2")(in1).set_params(Param{"v", 2}); n["output"].bind(out1); b.run(); diff --git a/test/port-access.cc b/test/port-access.cc index 03779326..0b02bc82 100644 --- a/test/port-access.cc +++ b/test/port-access.cc @@ -49,14 +49,14 @@ int main(int argc, char *argv[]) { b.with_bb_module("ion-bb"); Node n; - n = b.add("image_io_cameraN").set_param( + n = b.add("image_io_cameraN").set_params( wparam, hparam, Param("num_devices", 2), Param("urls", "http://optipng.sourceforge.net/pngtech/img/lena.png;http://upload.wikimedia.org/wikipedia/commons/0/05/Cat.png") ); n = b.add("base_normalize_3d_uint8")(n["output"][1]); // access only port[1] - n = b.add("image_processing_resize_nearest_3d")(n["output"]).set_param( + n = b.add("image_processing_resize_nearest_3d")(n["output"]).set_params( Param("width", width), Param("height", height), Param("scale", 2)); diff --git a/test/simple_graph_compile.cc b/test/simple_graph_compile.cc index 8bd629c4..b92c0999 100644 --- a/test/simple_graph_compile.cc +++ b/test/simple_graph_compile.cc @@ -13,7 +13,7 @@ int main() Builder b; b.set_target(Halide::get_target_from_environment()); Node n; - n = b.add("test_producer").set_param(v41); + n = b.add("test_producer").set_params(v41); n = b.add("test_consumer")(n["output"], min0, extent0, min1, extent1, v); b.compile("simple_graph"); } catch (const Halide::Error& e) { diff --git a/test/simple_graph_jit.cc b/test/simple_graph_jit.cc index faa0c39f..a1a21a5c 100644 --- a/test/simple_graph_jit.cc +++ b/test/simple_graph_jit.cc @@ -12,7 +12,7 @@ int main() b.with_bb_module("ion-bb-test"); b.set_target(Halide::get_host_target()); Node n; - n = b.add("test_producer").set_param(Param("v", 41)); + n = b.add("test_producer").set_params(Param("v", 41)); n = b.add("test_consumer")(n["output"], &min0, &extent0, &min1, &extent1, &v); ion::Buffer r = ion::Buffer::make_scalar(); diff --git a/test/validation.cc b/test/validation.cc index 6eab72c4..b59ee471 100644 --- a/test/validation.cc +++ b/test/validation.cc @@ -19,7 +19,7 @@ int main() b.with_bb_module("ion-bb-test"); b.set_target(Halide::get_host_target()); Node n; - n = b.add("test_inc_i32x2")(input).set_param(Param("unknown-parameter", 1)); + n = b.add("test_inc_i32x2")(input).set_params(Param("unknown-parameter", 1)); n = b.add("test_inc_i32x2")(n["output"]); n["output"].bind(output); @@ -37,7 +37,7 @@ int main() b.with_bb_module("ion-bb-test"); b.set_target(Halide::get_host_target()); Node n; - n = b.add("test_inc_i32x2")(input).set_param(Param("v", 41)); + n = b.add("test_inc_i32x2")(input).set_params(Param("v", 41)); n = b.add("test_inc_i32x2")(n["unknown-port"]); n["output"].bind(output); @@ -55,7 +55,7 @@ int main() b.with_bb_module("ion-bb-test"); b.set_target(Halide::get_host_target()); Node n; - n = b.add("test_inc_i32x2")(input).set_param(Param("v", 41)); + n = b.add("test_inc_i32x2")(input).set_params(Param("v", 41)); n = b.add("test_inc_i32x2")(n["output"]); n["unknown-port"].bind(output); @@ -76,7 +76,7 @@ int main() Buffer unknown(2, 2); Node n; - n = b.add("test_inc_i32x2")(input, unknown).set_param(Param("v", 41)); + n = b.add("test_inc_i32x2")(input, unknown).set_params(Param("v", 41)); n = b.add("test_inc_i32x2")(n["output"]); n["output"].bind(output);