Skip to content

Commit 75354bf

Browse files
authored
Merge pull request #6 from zhangzhaosen/main
updae worklow
2 parents b0a6436 + 43234ca commit 75354bf

17 files changed

+2186
-1602
lines changed
Lines changed: 78 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"key_": "nndeploy.dag.Graph",
3-
"name_": "Classification ResNet",
3+
"name_": "Classification_ResNet",
44
"developer_": "Always",
55
"source_": "https://github.com/KaimingHe/deep-residual-networks",
66
"desc_": "Image classification workflow based on ResNet network",
@@ -36,25 +36,6 @@
3636
"template[http,modelscope]@https://template.cn/template.txt"
3737
],
3838
"node_repository_": [
39-
{
40-
"key_": "nndeploy::codec::OpenCvImageDecode",
41-
"name_": "OpenCvImageDecode_11",
42-
"desc_": "Decode image using OpenCV, from image path to cv::Mat, default color space is BGR",
43-
"device_type_": "kDeviceTypeCodeCpu:0",
44-
"is_dynamic_input_": false,
45-
"inputs_": [],
46-
"is_dynamic_output_": false,
47-
"outputs_": [
48-
{
49-
"desc_": "output_0",
50-
"type_": "ndarray",
51-
"name_": "OpenCvImageDecode_11@output_0"
52-
}
53-
],
54-
"node_type_": "Input",
55-
"path_": "resources/template/nndeploy-workflow/classification/input.resnet.png",
56-
"node_repository_": []
57-
},
5839
{
5940
"key_": "nndeploy::preprocess::CvtResizeNormTrans",
6041
"name_": "CvtResizeNormTrans_22",
@@ -65,7 +46,7 @@
6546
{
6647
"desc_": "input_0",
6748
"type_": "ndarray",
68-
"name_": "OpenCvImageDecode_11@output_0"
49+
"name_": "OpenCvImageDecode_27@output_0"
6950
}
7051
],
7152
"is_dynamic_output_": false,
@@ -105,7 +86,11 @@
10586
1
10687
]
10788
},
108-
"node_repository_": []
89+
"node_repository_": [],
90+
"size": {
91+
"width": 200,
92+
"height": 80
93+
}
10994
},
11095
{
11196
"key_": "nndeploy::infer::Infer",
@@ -191,7 +176,11 @@
191176
"parallel_type_": "kParallelTypeNone",
192177
"worker_num_": 1
193178
},
194-
"node_repository_": []
179+
"node_repository_": [],
180+
"size": {
181+
"width": 200,
182+
"height": 80
183+
}
195184
},
196185
{
197186
"key_": "nndeploy::classification::ClassificationPostProcess",
@@ -220,7 +209,11 @@
220209
"is_softmax": true,
221210
"version": -1
222211
},
223-
"node_repository_": []
212+
"node_repository_": [],
213+
"size": {
214+
"width": 200,
215+
"height": 80
216+
}
224217
},
225218
{
226219
"key_": "nndeploy::classification::DrawLable",
@@ -232,7 +225,7 @@
232225
{
233226
"desc_": "input_0",
234227
"type_": "ndarray",
235-
"name_": "OpenCvImageDecode_11@output_0"
228+
"name_": "OpenCvImageDecode_27@output_0"
236229
},
237230
{
238231
"desc_": "input_1",
@@ -249,53 +242,100 @@
249242
}
250243
],
251244
"node_type_": "Intermediate",
245+
"node_repository_": [],
246+
"size": {
247+
"width": 200,
248+
"height": 80
249+
}
250+
},
251+
{
252+
"key_": "nndeploy::codec::OpenCvImageDecode",
253+
"name_": "OpenCvImageDecode_27",
254+
"developer_": "",
255+
"source_": "",
256+
"desc_": "Decode image using OpenCV, from image path to cv::Mat, default color space is BGR",
257+
"device_type_": "kDeviceTypeCodeCpu:0",
258+
"version_": "1.0.0",
259+
"required_params_": [
260+
"path_"
261+
],
262+
"ui_params_": [],
263+
"is_dynamic_input_": false,
264+
"inputs_": [],
265+
"is_dynamic_output_": false,
266+
"outputs_": [
267+
{
268+
"type_": "ndarray",
269+
"desc_": "output_0",
270+
"name_": "OpenCvImageDecode_27@output_0"
271+
}
272+
],
273+
"node_type_": "Input",
274+
"io_type_": "Image",
275+
"path_": "resources/template/nndeploy-workflow/classification/input.resnet.png",
276+
"size": {
277+
"width": 200,
278+
"height": 80
279+
},
252280
"node_repository_": []
253281
},
254282
{
255283
"key_": "nndeploy::codec::OpenCvImageEncode",
256-
"name_": "OpenCvImageEncode_26",
284+
"name_": "OpenCvImageEncode_28",
285+
"developer_": "",
286+
"source_": "",
257287
"desc_": "Encode image using OpenCV, from cv::Mat to image file, supports common image formats",
258288
"device_type_": "kDeviceTypeCodeCpu:0",
289+
"version_": "1.0.0",
290+
"required_params_": [
291+
"path_"
292+
],
293+
"ui_params_": [],
259294
"is_dynamic_input_": false,
260295
"inputs_": [
261296
{
262-
"desc_": "input_0",
263297
"type_": "ndarray",
298+
"desc_": "input_0",
264299
"name_": "DrawLable_25@output_0"
265300
}
266301
],
267302
"is_dynamic_output_": false,
268303
"outputs_": [],
269304
"node_type_": "Output",
305+
"io_type_": "Image",
270306
"path_": "resources/images/result.resnet.jpg",
307+
"size": {
308+
"width": 200,
309+
"height": 80
310+
},
271311
"node_repository_": []
272312
}
273313
],
274314
"nndeploy_ui_layout": {
275315
"layout": {
276-
"OpenCvImageDecode_11": {
277-
"x": 100,
278-
"y": -1.4210854715202004e-14
279-
},
280316
"CvtResizeNormTrans_22": {
281317
"x": 400,
282-
"y": 112.79999999999998
318+
"y": 60
283319
},
284320
"Infer_23": {
285321
"x": 700,
286-
"y": 112.79999999999998
322+
"y": 60
287323
},
288324
"ClassificationPostProcess_24": {
289325
"x": 1000,
290-
"y": 112.79999999999998
326+
"y": 60
291327
},
292328
"DrawLable_25": {
293329
"x": 1300,
294-
"y": 7.59999999999998
330+
"y": 0
331+
},
332+
"OpenCvImageDecode_27": {
333+
"x": 110.25706940874026,
334+
"y": -189.32647814910027
295335
},
296-
"OpenCvImageEncode_26": {
297-
"x": 1602.8670864975843,
298-
"y": 7.59999999999998
336+
"OpenCvImageEncode_28": {
337+
"x": 1569.383033419023,
338+
"y": 161.31619537275066
299339
}
300340
},
301341
"groups": []

0 commit comments

Comments
 (0)