Skip to content

refactor for layer define #7

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

Merged
merged 8 commits into from
Jul 26, 2023
Merged

refactor for layer define #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7339d4d
Merge pull request #6 from xiangweizeng/nhwc_layout
xiangweizeng Jul 25, 2023
1bedc84
adjust layer define, refactor quantize tools
Jul 26, 2023
9e6366f
update models
Jul 26, 2023
33b9cf6
supported per channel quantize
Jul 26, 2023
1fdeba3
adjust calibration.cpp to save threshold
Jul 26, 2023
6d862a2
adjust style for quantize
Jul 26, 2023
003e413
supported fix blob scale
Jul 26, 2023
8acdda2
optimize for group conv for memory layout
Jul 26, 2023
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
0 c-network/tools/quantize/convert_data.cpp → c-netend/examples/convert_data.cpp
View file
Open in desktop
File renamed without changes.
17,822 changes: 9,363 additions & 8,459 deletions c-netend/examples/models/face/face-opt.c
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 37 additions & 61 deletions c-netend/examples/models/face/face-opt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,56 +52,44 @@
#define face_opt_blob_363_364 40
#define face_opt_blob_365_366 41
#define face_opt_blob_367_367 42
#define face_opt_blob_368_368 43
#define face_opt_blob_369_370 44
#define face_opt_blob_371_371 45
#define face_opt_blob_372_372 46
#define face_opt_blob_373_374 47
#define face_opt_blob_375_375 48
#define face_opt_blob_376_376 49
#define face_opt_blob_377_378 50
#define face_opt_blob_379_379 51
#define face_opt_blob_380_380 52
#define face_opt_blob_381_382 53
#define face_opt_blob_383_383 54
#define face_opt_blob_384_384 55
#define face_opt_blob_385_386 56
#define face_opt_blob_387_387 57
#define face_opt_blob_388_388 58
#define face_opt_blob_389_390 59
#define face_opt_blob_391_391 60
#define face_opt_blob_392_392 61
#define face_opt_blob_393_394 62
#define face_opt_blob_395_395 63
#define face_opt_blob_396_396 64
#define face_opt_blob_397_398 65
#define face_opt_blob_399_399 66
#define face_opt_blob_400_400 67
#define face_opt_blob_401_401 68
#define face_opt_blob_402_402 69
#define face_opt_blob_403_403 70
#define face_opt_blob_404_404 71
#define face_opt_blob_405_405 72
#define face_opt_blob_406_406 73
#define face_opt_blob_416_416 74
#define face_opt_blob_426_426 75
#define face_opt_blob_436_436 76
#define face_opt_blob_446_446 77
#define face_opt_blob_457_457 78
#define face_opt_blob_467_467 79
#define face_opt_blob_477_477 80
#define face_opt_blob_487_487 81
#define face_opt_blob_488_488 82
#define face_opt_blob_498_498 83
#define face_opt_blob_508_508 84
#define face_opt_blob_518_518 85
#define face_opt_blob_528_528 86
#define face_opt_blob_529_529 87
#define face_opt_blob_530_530 88
#define face_opt_blob_input0_input0 89
#define face_opt_blob_output0_output0 90
#define face_opt_blob_369_370 43
#define face_opt_blob_371_371 44
#define face_opt_blob_373_374 45
#define face_opt_blob_375_375 46
#define face_opt_blob_377_378 47
#define face_opt_blob_379_379 48
#define face_opt_blob_381_382 49
#define face_opt_blob_383_383 50
#define face_opt_blob_385_386 51
#define face_opt_blob_387_387 52
#define face_opt_blob_389_390 53
#define face_opt_blob_391_391 54
#define face_opt_blob_393_394 55
#define face_opt_blob_395_395 56
#define face_opt_blob_397_398 57
#define face_opt_blob_399_399 58
#define face_opt_blob_401_401 59
#define face_opt_blob_403_403 60
#define face_opt_blob_405_405 61
#define face_opt_blob_416_416 62
#define face_opt_blob_426_426 63
#define face_opt_blob_436_436 64
#define face_opt_blob_446_446 65
#define face_opt_blob_457_457 66
#define face_opt_blob_467_467 67
#define face_opt_blob_477_477 68
#define face_opt_blob_487_487 69
#define face_opt_blob_488_488 70
#define face_opt_blob_498_498 71
#define face_opt_blob_508_508 72
#define face_opt_blob_518_518 73
#define face_opt_blob_528_528 74
#define face_opt_blob_529_529 75
#define face_opt_blob_530_530 76
#define face_opt_blob_input0_input0 77
#define face_opt_blob_output0_output0 78

#define FACE_OPT_BLOB_SIZE 91
#define FACE_OPT_BLOB_SIZE 79

typedef struct face_opt_ncnn_blob{ const char *name; int blob_id;} face_opt_ncnn_blob_t;
static face_opt_ncnn_blob_t face_opt_ncnn_blobs [] = {
Expand Down Expand Up @@ -149,37 +137,25 @@ static face_opt_ncnn_blob_t face_opt_ncnn_blobs [] = {
{"364" , face_opt_blob_363_364},
{"366" , face_opt_blob_365_366},
{"367" , face_opt_blob_367_367},
{"368" , face_opt_blob_368_368},
{"370" , face_opt_blob_369_370},
{"371" , face_opt_blob_371_371},
{"372" , face_opt_blob_372_372},
{"374" , face_opt_blob_373_374},
{"375" , face_opt_blob_375_375},
{"376" , face_opt_blob_376_376},
{"378" , face_opt_blob_377_378},
{"379" , face_opt_blob_379_379},
{"380" , face_opt_blob_380_380},
{"382" , face_opt_blob_381_382},
{"383" , face_opt_blob_383_383},
{"384" , face_opt_blob_384_384},
{"386" , face_opt_blob_385_386},
{"387" , face_opt_blob_387_387},
{"388" , face_opt_blob_388_388},
{"390" , face_opt_blob_389_390},
{"391" , face_opt_blob_391_391},
{"392" , face_opt_blob_392_392},
{"394" , face_opt_blob_393_394},
{"395" , face_opt_blob_395_395},
{"396" , face_opt_blob_396_396},
{"398" , face_opt_blob_397_398},
{"399" , face_opt_blob_399_399},
{"400" , face_opt_blob_400_400},
{"401" , face_opt_blob_401_401},
{"402" , face_opt_blob_402_402},
{"403" , face_opt_blob_403_403},
{"404" , face_opt_blob_404_404},
{"405" , face_opt_blob_405_405},
{"406" , face_opt_blob_406_406},
{"416" , face_opt_blob_416_416},
{"426" , face_opt_blob_426_426},
{"436" , face_opt_blob_436_436},
Expand Down
220 changes: 110 additions & 110 deletions c-netend/examples/models/face/face-opt.table
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,110 +1,110 @@
input0 217.052994
261 4814.681152
264 6499.439453
267 3212.908447
270 7818.288574
273 7342.898926
276 6567.874023
279 6704.869141
282 7800.678711
285 6366.527344
288 6495.782227
291 5689.767090
294 4184.420410
297 4880.107422
297_splitncnn_0 4880.107422
297_splitncnn_1 4880.107422
297_splitncnn_2 4880.107422
297_splitncnn_3 4880.107422
298 3284.874756
302 4962.150391
303 3178.250000
305 4284.743652
309 4962.427246
310 4426.156738
312 5138.068359
316 4664.257324
319 4489.235352
320 4712.398438
322 3293.395996
323 2960.170166
325 5023.942871
327 2166.545654
328 3105.643066
328_splitncnn_0 3105.643066
328_splitncnn_1 3105.643066
328_splitncnn_2 3105.643066
328_splitncnn_3 3105.643066
331 3432.200195
334 3261.186768
337 3876.244141
340 3529.287842
343 4716.303223
346 4265.840332
346_splitncnn_0 4265.840332
346_splitncnn_1 4265.840332
346_splitncnn_2 4265.840332
346_splitncnn_3 4265.840332
349 5267.882812
352 5220.464355
355 4679.009277
358 5225.716797
358_splitncnn_0 5225.716797
358_splitncnn_1 5225.716797
358_splitncnn_2 5225.716797
358_splitncnn_3 5225.716797
360 3328.813965
362 3452.416748
364 10949.991211
364_splitncnn_0 10949.991211
364_splitncnn_1 10949.991211
364_splitncnn_2 10949.991211
366 6146.038574
367 5980.900391
368 5980.900391
370 5973.556641
371 4198.700684
372 4198.700684
374 3573.634277
375 2727.307617
376 2727.307617
378 6171.292969
379 6011.691406
380 6011.691406
382 4269.603027
383 6145.834961
384 6145.834961
386 3765.824463
387 2920.289307
388 2920.289307
390 10100.282227
391 7432.951172
392 7432.951172
394 8588.697266
395 7800.420898
396 7800.420898
398 6471.696289
399 3504.548340
400 3504.548340
401 10051.492188
402 10051.492188
403 7107.489746
404 7107.489746
405 6903.421875
406 6903.421875
416 5980.900391
426 6011.691406
436 7432.951172
446 10051.492188
output0 5739.848633
457 4198.700684
467 6145.834961
477 7800.420898
487 7107.489746
488 4666.434570
498 2727.307617
508 2920.289307
518 3504.548340
528 6903.421875
529 2725.869629
530 32775.007812
input0 150.963135
261 6.805643
264 5.041512
267 10.198547
270 4.191071
273 4.462407
276 4.988981
279 4.887045
282 4.200532
285 5.146762
288 5.044350
291 5.758935
294 7.830714
297 6.714401
297_splitncnn_0 6.714401
297_splitncnn_1 6.714401
297_splitncnn_2 6.714401
297_splitncnn_3 6.714401
298 9.975114
302 6.603384
303 10.309759
305 7.647366
309 6.603019
310 7.403036
312 6.377299
316 7.025127
319 7.299012
320 6.953358
322 9.949302
323 11.069293
325 6.522168
327 15.114810
328 10.550793
328_splitncnn_0 10.550793
328_splitncnn_1 10.550793
328_splitncnn_2 10.550793
328_splitncnn_3 10.550793
331 9.546941
334 10.047567
337 8.453286
340 9.284309
343 6.947603
346 7.681253
346_splitncnn_0 7.681253
346_splitncnn_1 7.681253
346_splitncnn_2 7.681253
346_splitncnn_3 7.681253
349 6.220147
352 6.276645
355 7.002979
358 6.270336
358_splitncnn_0 6.270336
358_splitncnn_1 6.270336
358_splitncnn_2 6.270336
358_splitncnn_3 6.270336
360 9.843445
362 9.491031
364 2.992423
364_splitncnn_0 2.992423
364_splitncnn_1 2.992423
364_splitncnn_2 2.992423
366 5.331402
367 5.478605
368 5.478605
370 5.485344
371 7.804081
372 7.804081
374 9.169098
375 12.014410
376 12.014410
378 5.309583
379 5.450546
380 5.450546
382 7.674482
383 5.331580
384 5.331580
386 8.701148
387 11.220463
388 11.220463
390 3.244167
391 4.408343
392 4.408343
394 3.815131
395 4.200672
396 4.200672
398 5.063125
399 9.349849
400 9.349849
401 3.259914
402 3.259914
403 4.610206
404 4.610206
405 4.746486
406 4.746486
416 5.478605
426 5.450546
436 4.408343
446 3.259914
output0 5.708686
457 7.804081
467 5.331580
477 4.200672
487 4.610206
488 7.021849
498 12.014410
508 11.220463
518 9.349849
528 4.746486
529 12.020749
530 0.999756
Loading