Skip to content

Commit f7d85d6

Browse files
Fixstars-iizukaFixstars-iizuka
committed
Reverted API name
1 parent c576dea commit f7d85d6

37 files changed

+188
-188
lines changed

‎example/demo.cc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ int main(int argc, char *argv[]) {
6060
for (int i = 0; i < 6; i++) {
6161
// IMX219
6262
Node imx = b.add("image_io_imx219")
63-
.set_params(Param{"index", std::to_string(i)},
63+
.set_param(Param{"index", std::to_string(i)},
6464
Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.jpg"});
6565

6666
// ISP
6767
Node downscale = b.add("image_processing_bayer_downscale_uint16")
68-
.set_params(
68+
.set_param(
6969
Param{"input_width", std::to_string(raw_width)},
7070
Param{"input_height", std::to_string(raw_height)},
7171
Param{"downscale_factor", std::to_string(downscale_factor)})(
7272
imx["output"]);
7373
Node normalize = b.add("image_processing_normalize_raw_image")
74-
.set_params(
74+
.set_param(
7575
Param{"bit_width", std::to_string(bit_width)},
7676
Param{"bit_shift", std::to_string(bit_shift)})(
7777
downscale["output"]);
@@ -81,7 +81,7 @@ int main(int argc, char *argv[]) {
8181
offset_b,
8282
normalize["output"]);
8383
Node shading_correction = b.add("image_processing_lens_shading_correction_linear")
84-
.set_params(
84+
.set_param(
8585
Param{"width", std::to_string(width)},
8686
Param{"height", std::to_string(height)})(
8787
shading_correction_slope_r,
@@ -97,12 +97,12 @@ int main(int argc, char *argv[]) {
9797
gain_b,
9898
shading_correction["output"]);
9999
Node demosaic = b.add("image_processing_bayer_demosaic_simple")
100-
.set_params(
100+
.set_param(
101101
Param{"width", std::to_string(width)},
102102
Param{"height", std::to_string(height)})(
103103
white_balance["output"]);
104104
Node resize = b.add("image_processing_resize_bilinear_3d")
105-
.set_params(
105+
.set_param(
106106
Param{"width", std::to_string(half_width)},
107107
Param{"height", std::to_string(half_height)},
108108
Param{"scale", std::to_string(scale)})(
@@ -113,7 +113,7 @@ int main(int argc, char *argv[]) {
113113

114114
// DNN
115115
Node fit_image = b.add("image_processing_fit_image_to_center_3d_float")
116-
.set_params(
116+
.set_param(
117117
Param{"input_width", std::to_string(scaled_width)},
118118
Param{"input_height", std::to_string(scaled_height)},
119119
Param{"output_width", std::to_string(output_width)},
@@ -122,13 +122,13 @@ int main(int argc, char *argv[]) {
122122
Node reorder_channel = b.add("image_processing_reorder_color_channel_3d_float")(
123123
fit_image["output"]);
124124
Node reorder_chw2hwc = b.add("base_reorder_buffer_3d_float")
125-
.set_params(
125+
.set_param(
126126
Param{"dim0", "2"},
127127
Param{"dim1", "0"},
128128
Param{"dim2", "1"})(
129129
reorder_channel["output"]);
130130
Node extended = b.add("base_extend_dimension_3d_float")
131-
.set_params(
131+
.set_param(
132132
Param{"new_dim", "3"})(
133133
reorder_chw2hwc["output"]);
134134

@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
138138
Port packed_dnn_input = dnn_inputs[0];
139139
for (int i = 1; i < 6; i++) {
140140
packed_dnn_input = b.add("base_concat_buffer_4d_float")
141-
.set_params(
141+
.set_param(
142142
Param{"dim", "3"},
143143
Param{"input0_extent", std::to_string(i)})(
144144
packed_dnn_input,
@@ -150,7 +150,7 @@ int main(int argc, char *argv[]) {
150150
Port dnn_outputs[6];
151151
for (int i = 0; i < 6; i++) {
152152
dnn_outputs[i] = b.add("base_extract_buffer_4d_float")
153-
.set_params(
153+
.set_param(
154154
Param{"dim", "3"},
155155
Param{"index", std::to_string(i)})(
156156
object_detection["output"])["output"];
@@ -161,7 +161,7 @@ int main(int argc, char *argv[]) {
161161
horizontal_tiled_image[i] = dnn_outputs[i * 3];
162162
for (int j = 1; j < 3; j++) {
163163
horizontal_tiled_image[i] = b.add("image_processing_tile_image_horizontal_3d_float")
164-
.set_params(
164+
.set_param(
165165
Param{"x_dim", "1"},
166166
Param{"y_dim", "2"},
167167
Param{"input0_width", std::to_string(output_width * j)},
@@ -174,7 +174,7 @@ int main(int argc, char *argv[]) {
174174
}
175175

176176
Port tiled_image = b.add("image_processing_tile_image_vertical_3d_float")
177-
.set_params(
177+
.set_param(
178178
Param{"x_dim", "1"},
179179
Param{"y_dim", "2"},
180180
Param{"input0_width", std::to_string(output_width * 3)},
@@ -190,7 +190,7 @@ int main(int argc, char *argv[]) {
190190
auto d435 = b.add("image_io_d435");
191191

192192
// SGM
193-
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)});
193+
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)});
194194

195195
b.save("demo.json");
196196

‎example/demo_compile.cc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@ int main(int argc, char *argv[]) {
5656
for (int i = 0; i < 6; i++) {
5757
// IMX219
5858
Node imx = b.add("image_io_imx219")
59-
.set_params(Param{"index", std::to_string(i)},
59+
.set_param(Param{"index", std::to_string(i)},
6060
Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.jpg"});
6161

6262
// ISP
6363
Node downscale = b.add("image_processing_bayer_downscale_uint16")
64-
.set_params(
64+
.set_param(
6565
Param{"input_width", std::to_string(raw_width)},
6666
Param{"input_height", std::to_string(raw_height)},
6767
Param{"downscale_factor", std::to_string(downscale_factor)})(
6868
imx["output"]);
6969
Node normalize = b.add("image_processing_normalize_raw_image")
70-
.set_params(
70+
.set_param(
7171
Param{"bit_width", std::to_string(bit_width)},
7272
Param{"bit_shift", std::to_string(bit_shift)})(
7373
downscale["output"]);
@@ -77,7 +77,7 @@ int main(int argc, char *argv[]) {
7777
offset_b,
7878
normalize["output"]);
7979
Node shading_correction = b.add("image_processing_lens_shading_correction_linear")
80-
.set_params(
80+
.set_param(
8181
Param{"width", std::to_string(width)},
8282
Param{"height", std::to_string(height)})(
8383
shading_correction_slope_r,
@@ -93,12 +93,12 @@ int main(int argc, char *argv[]) {
9393
gain_b,
9494
shading_correction["output"]);
9595
Node demosaic = b.add("image_processing_bayer_demosaic_simple")
96-
.set_params(
96+
.set_param(
9797
Param{"width", std::to_string(width)},
9898
Param{"height", std::to_string(height)})(
9999
white_balance["output"]);
100100
Node resize = b.add("image_processing_resize_bilinear_3d")
101-
.set_params(
101+
.set_param(
102102
Param{"width", std::to_string(half_width)},
103103
Param{"height", std::to_string(half_height)},
104104
Param{"scale", std::to_string(scale)})(
@@ -109,7 +109,7 @@ int main(int argc, char *argv[]) {
109109

110110
// DNN
111111
Node fit_image = b.add("image_processing_fit_image_to_center_3d_float")
112-
.set_params(
112+
.set_param(
113113
Param{"input_width", std::to_string(scaled_width)},
114114
Param{"input_height", std::to_string(scaled_height)},
115115
Param{"output_width", std::to_string(output_width)},
@@ -118,13 +118,13 @@ int main(int argc, char *argv[]) {
118118
Node reorder_channel = b.add("image_processing_reorder_color_channel_3d_float")(
119119
fit_image["output"]);
120120
Node reorder_chw2hwc = b.add("base_reorder_buffer_3d_float")
121-
.set_params(
121+
.set_param(
122122
Param{"dim0", "2"},
123123
Param{"dim1", "0"},
124124
Param{"dim2", "1"})(
125125
reorder_channel["output"]);
126126
Node extended = b.add("base_extend_dimension_3d_float")
127-
.set_params(
127+
.set_param(
128128
Param{"new_dim", "3"})(
129129
reorder_chw2hwc["output"]);
130130

@@ -134,7 +134,7 @@ int main(int argc, char *argv[]) {
134134
Port packed_dnn_input = dnn_inputs[0];
135135
for (int i = 1; i < 6; i++) {
136136
packed_dnn_input = b.add("base_concat_buffer_4d_float")
137-
.set_params(
137+
.set_param(
138138
Param{"dim", "3"},
139139
Param{"input0_extent", std::to_string(i)})(
140140
packed_dnn_input,
@@ -146,7 +146,7 @@ int main(int argc, char *argv[]) {
146146
Port dnn_outputs[6];
147147
for (int i = 0; i < 6; i++) {
148148
dnn_outputs[i] = b.add("base_extract_buffer_4d_float")
149-
.set_params(
149+
.set_param(
150150
Param{"dim", "3"},
151151
Param{"index", std::to_string(i)})(
152152
object_detection["output"])["output"];
@@ -157,7 +157,7 @@ int main(int argc, char *argv[]) {
157157
horizontal_tiled_image[i] = dnn_outputs[i * 3];
158158
for (int j = 1; j < 3; j++) {
159159
horizontal_tiled_image[i] = b.add("image_processing_tile_image_horizontal_3d_float")
160-
.set_params(
160+
.set_param(
161161
Param{"x_dim", "1"},
162162
Param{"y_dim", "2"},
163163
Param{"input0_width", std::to_string(output_width * j)},
@@ -170,7 +170,7 @@ int main(int argc, char *argv[]) {
170170
}
171171

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

188188
// SGM
189-
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)});
189+
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)});
190190

191191
b.compile("demo");
192192
b.save("demo.json");

‎example/dnn.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ int main(int argc, char *argv[]) {
1818
b.with_bb_module("ion-bb");
1919

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

‎example/dnn_compile.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ int main(int argc, char *argv[]) {
1313
b.with_bb_module("ion-bb");
1414

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

‎example/dnn_fpga.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ int main(int argc, char *argv[]) {
2121
b.set_target(Halide::get_target_from_environment());
2222

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

‎example/dnn_fpga_compile.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ int main(int argc, char *argv[]) {
1818
// b.set_target(Halide::Target("arm-64-linux"));
1919

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

‎example/fpga_isp_compile.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ int main(int argc, char *argv[]) {
1212
b.set_target(Halide::get_target_from_environment());
1313

1414
Node imx219 = b.add("image_io_imx219")
15-
.set_params(
15+
.set_param(
1616
Param{"force_sim_mode", "true"},
1717
Param{"url", "http://ion-kit.s3.us-west-2.amazonaws.com/images/pedestrian.jpg"});
1818

1919
Node downscale = b.add("image_processing_bayer_downscale_uint16")
20-
.set_params(
20+
.set_param(
2121
Param{"input_width", "3264"},
2222
Param{"input_height", "2464"},
2323
Param{"downscale_factor", "2"})(
2424
imx219["output"]);
2525

2626
Node isp = b.add("fpga_simple_isp_with_unsharp_mask")
27-
.set_params(
27+
.set_param(
2828
Param{"bayer_pattern", "0"},
2929
Param{"width", "1632"},
3030
Param{"height", "1232"},
@@ -41,14 +41,14 @@ int main(int argc, char *argv[]) {
4141
downscale["output"]);
4242

4343
Node reorder = b.add("base_reorder_buffer_3d_uint8")
44-
.set_params(
44+
.set_param(
4545
Param{"dim0", "1"},
4646
Param{"dim1", "2"},
4747
Param{"dim2", "0"})(
4848
isp["output"]);
4949

5050
Node output = b.add("image_io_image_saver")
51-
.set_params(
51+
.set_param(
5252
Param{"width", "816"},
5353
Param{"height", "616"},
5454
Param{"path", "out.png"})(

0 commit comments

Comments
 (0)