Commit Graph

1356 Commits (release/2.5)

Author SHA1 Message Date
cuicheng01 dc651d4732
Merge branch 'PaddlePaddle:develop' into develop 2022-05-29 21:57:14 +08:00
cuicheng01 ad71254e68
Merge pull request #1960 from zhiboniu/dev_attr
support attribute infer
2022-05-27 19:22:17 +08:00
zhiboniu 7f0075e8d0 reverse to BatchNorm 2022-05-27 07:54:26 +00:00
Walter dcef409dde
Merge branch 'develop' into adaface 2022-05-27 14:19:03 +08:00
cuicheng01 a226a0589d
Merge branch 'PaddlePaddle:develop' into develop 2022-05-27 10:34:06 +08:00
zhiboniu 9f049f1145 fix batchnorm2d data_format 2022-05-26 09:12:28 +00:00
gaotingquan c22bdc7e54
remove fluid 2022-05-26 07:40:15 +00:00
zhiboniu 939a35d605 add more details 2022-05-26 07:14:10 +00:00
zhiboniu a4e1da6610 modify attr export model 2022-05-25 08:13:38 +00:00
cuicheng01 e894fa861d
Merge branch 'develop' into add_person_demo 2022-05-25 15:30:07 +08:00
cuicheng01 c870befb86
Merge branch 'PaddlePaddle:develop' into develop 2022-05-25 10:20:56 +08:00
cuicheng01 4091592cfb
Merge pull request #1917 from zhiboniu/develop
add attribute support
2022-05-25 10:19:21 +08:00
cuicheng01 33a15cfdae fix static training bugs 2022-05-24 17:02:44 +00:00
cuicheng01 dcf9e7d7f6
Merge branch 'PaddlePaddle:develop' into develop 2022-05-25 00:31:02 +08:00
gaotingquan 20730fad07 revert
the code may cause problem that loss change in training.
2022-05-24 22:19:10 +08:00
cuicheng01 2e48a7ed7a add PPHGNet_base config 2022-05-23 16:39:58 +00:00
cuicheng01 6cb33220ea
Merge branch 'PaddlePaddle:develop' into develop 2022-05-23 23:49:48 +08:00
littletomatodonkey 6dac07f68d
fix quant logic (#1941)
* fix quant logic

* add support for trt+int8 inference

* add support for swin quant

* fix swin and quant

* fix assert info

* fix assert info

* fix log
2022-05-23 19:04:27 +08:00
zhiboniu edf1129e5d match new eval function 2022-05-23 10:27:55 +00:00
zhiboniu 699c10aaeb Merge remote-tracking branch 'ppcls/develop' into develop 2022-05-23 08:03:46 +00:00
cuicheng01 94d4722b8d
Merge branch 'PaddlePaddle:develop' into develop 2022-05-23 10:15:50 +08:00
xiongkun 821e550900
stop_gradient=True for input spec (#1943) 2022-05-23 09:48:27 +08:00
cuicheng01 8f5fe61540
Merge pull request #1925 from cuicheng01/add_person_demo
Add person demo
2022-05-23 09:26:49 +08:00
cuicheng01 8b639e939f update code and docs 2022-05-23 01:11:03 +00:00
weishengyu 70c45dcdfd Merge branch 'add_person_demo' of github.com:cuicheng01/PaddleClas into add_person_demo 2022-05-19 06:33:40 +00:00
weishengyu 94ef340528 dbg 2022-05-19 06:33:27 +00:00
dongshuilong 759fe41ccc modify face_dataset and ir_net name issue 2022-05-19 02:22:17 +00:00
Walter 9005e080a5
Merge pull request #1938 from HydrogenSulfate/fix_resume_opt
Fix resume opt
2022-05-19 10:20:28 +08:00
zhiboniu 032c45c1d3 delete norm_decay in resnet 2022-05-18 11:58:53 +00:00
gaotingquan 683adcda46 fix: support AMP infer 2022-05-18 18:10:44 +08:00
gaotingquan 5f88903e6e fix: -> DistributedBatchSampler 2022-05-18 18:10:44 +08:00
gaotingquan e4327c8686 log tip when export succeeded 2022-05-18 13:00:00 +08:00
zhiboniu 05ecf1d045 multi-card eval support 2022-05-18 04:54:44 +00:00
zhiboniu 824746b3a7 update data_path 2022-05-18 04:54:43 +00:00
zhiboniu 50900443f3 remove strongbaseline_attr, etc... 2022-05-18 04:54:43 +00:00
zhiboniu 26d5b7d1cc adapted dataset and loss 2022-05-18 04:54:43 +00:00
zhiboniu aa8f4c16d2 attr ma test ok 2022-05-18 04:54:43 +00:00
zhiboniu 0a3ecf60b4 add attribute strongbaseline 2022-05-18 04:54:43 +00:00
littletomatodonkey afafb8f41d fix save load 2022-05-17 13:24:24 +00:00
gaotingquan 675e60d5a5 feat: log the FLOPs and Params when building model 2022-05-17 21:24:17 +08:00
HydrogenSulfate ec80a56e5c fix bug when load dict for optimizer in resume training 2022-05-17 21:04:01 +08:00
HydrogenSulfate f4e400fa3a fix bug when load dict for optimizer in resume training 2022-05-17 21:01:10 +08:00
littletomatodonkey 6f631e4340 fix convert weight 2022-05-17 12:46:49 +00:00
cuicheng01 5a81627859 add convert_weights.py 2022-05-17 10:26:14 +00:00
cuicheng01 d2da38f3ea update PPLCNet_x1_0_distillation_search.yaml 2022-05-17 09:26:29 +00:00
cuicheng01 6e8f395c22 add person_demo docs 2022-05-17 09:22:21 +00:00
dongshuilong 511669a49a fix bcolz install bug 2022-05-17 07:48:23 +00:00
cuicheng01 912285c167 Merge branch 'add_person_demo' of http://github.com/cuicheng01/PaddleClas into add_person_demo 2022-05-17 03:36:28 +00:00
weisy11 279a2e0356 add search_times 2022-05-17 11:29:26 +08:00
cuicheng01 dbcfe2c395 update config 2022-05-16 11:46:34 +00:00
Walter afb473e2ae
Merge pull request #1914 from HydrogenSulfate/add_re_ranking
Add re ranking
2022-05-16 18:45:14 +08:00
Yang Nie 62e06ced05 update 2022-05-16 18:00:09 +08:00
dongshuilong b2f34d0487 fix static train ips info bug 2022-05-16 08:34:02 +00:00
weisy11 047ec1ae49 use list instead of dict 2022-05-16 14:29:52 +08:00
cuicheng01 87a0ba6f31 update metrics 2022-05-16 04:31:26 +00:00
dongshuilong 32c99be6aa add adaface 2022-05-16 03:50:35 +00:00
HydrogenSulfate 43d1eba917 Merge branch 'develop' into add_re_ranking 2022-05-16 11:04:32 +08:00
weishengyu 93e9970ede dbg 2022-05-15 17:25:56 +00:00
weishengyu 4b014a1b19 dbg 2022-05-14 19:28:58 +00:00
weisy11 45f2d010b6 add python search tools 2022-05-14 21:37:31 +08:00
cuicheng01 b513670a1a update PPLCNet_x1_0_distillation.yaml 2022-05-14 11:56:44 +00:00
nemonameless 60a4269d9b fix ShuffleNetV2 x2_0 stage_out_channels 2022-05-14 10:29:49 +00:00
cuicheng01 0112a036ea update pp_lcnet.py 2022-05-14 10:06:58 +00:00
cuicheng01 d125b31f73 update code 2022-05-14 10:03:55 +00:00
cuicheng01 45b1296c25 Add cls_demo_person code 2022-05-14 09:31:52 +00:00
gaotingquan f04b52343f fix: unable to export rep net 2022-05-14 14:13:25 +08:00
cuicheng01 ff09e310de update res2net200_vd_distill_pphgnet_base.yaml 2022-05-13 16:15:00 +00:00
cuicheng01 ad92e521b8 add res2net200_vd_distill_pphgnet_base.yaml 2022-05-13 15:56:59 +00:00
cuicheng01 03142ea32b
Merge pull request #1919 from cuicheng01/develop
Add PPHGNet code
2022-05-13 17:59:53 +08:00
cuicheng01 713dd6f9eb update pp_hgnet.py 2022-05-13 04:07:41 +00:00
Yang Nie 4a54e5f70b
Update PeleeNet.yaml 2022-05-13 09:10:49 +08:00
cuicheng01 8a760fb85f Add PPHGNet code 2022-05-12 15:53:51 +00:00
Yang Nie 96687d07e2 add PeleeNet code 2022-05-12 23:19:44 +08:00
gaotingquan c3bd88a244
circuitous rep 2022-05-12 14:38:17 +00:00
gaotingquan 4c5ed46b2c
refactor 2022-05-12 14:38:17 +00:00
gaotingquan 0ef1ac3fa7
fix 2022-05-12 14:38:17 +00:00
gaotingquan 6e0900ecec
feat: add PPLCNetV2_base config 2022-05-12 14:38:17 +00:00
gaotingquan e82e1358bc
BatchNorm -> BatchNorm2D 2022-05-12 14:38:17 +00:00
gaotingquan 925cb6ef6c
feat: add PPLCNetV2 2022-05-12 14:38:17 +00:00
Tingquan Gao 3c8f491092
Merge branch 'develop' into dev/multi-scale 2022-05-12 16:18:27 +08:00
gaotingquan f8150efeb6
fix: (h, w) -> (w, h) 2022-05-12 08:13:34 +00:00
Walter 2b9af59971
Merge pull request #1915 from HydrogenSulfate/refine_strong_baseline
fix interpolation to 'bilinear', adjust file structure and rename
2022-05-12 14:53:45 +08:00
HydrogenSulfate 585b6bc3e8 fix interpolation to 'bilinear', adjust file structure and rename 2022-05-11 21:36:47 +08:00
HydrogenSulfate 565053167d update code 2022-05-11 18:57:16 +08:00
HydrogenSulfate 88295413f5 add re-ranking code 2022-05-11 17:33:07 +08:00
Walter 353e050c21
Merge pull request #1910 from RainFrost1/dali_bug
修复dali环境变量bug
2022-05-11 17:20:13 +08:00
dongshuilong 11b0860a1b fix dali env bug 2022-05-11 03:06:55 +00:00
Yang Nie 098bc1d8b2 Merge remote-tracking branch 'upstream/develop' into ConvNeXt 2022-05-10 21:30:48 +08:00
Yang Nie 7fa948f806 rename yaml 2022-05-10 21:29:48 +08:00
Yang Nie 5b91120e1a
fix bs 2022-05-10 18:50:55 +08:00
weishengyu f6923adff8 remove logger.colring 2022-05-10 14:29:20 +08:00
WangChen0902 283ae9b327
add dkd (#1888)
* add dkd

* update dkd

* update dkd

* update dkd

* update dkd

* update dkd

* update dkd and add tipc
2022-05-09 22:55:01 +08:00
HydrogenSulfate 73cddf6db2 update 2022-05-09 15:31:44 +08:00
HydrogenSulfate 0c76d5a521 fix FC initialization in reid-strong-baseline baseline config 2022-05-09 15:14:01 +08:00
Yang Nie 272fda2b83 update config for 8 cards 2022-05-09 12:32:18 +08:00
Yang Nie e61f392598 Merge branch 'develop' into ConvNeXt 2022-05-09 12:22:37 +08:00
flytocc b38240b86c add `pil` backend for DecodeImage 2022-05-09 11:51:59 +08:00
flytocc a618534ebc fix log_info 2022-05-09 11:51:26 +08:00
gaotingquan 56b8710dc4 fix: fix bug get paddle version 2022-05-06 19:51:44 +08:00
dongshuilong 7283598041 Merge branch 'develop' of https://github.com/PaddlePaddle/PaddleClas into adaface 2022-05-06 04:50:31 +00:00
dongshuilong bdc535bb39 add adaface 2022-05-06 04:50:26 +00:00
Walter bd524e8a88
Merge pull request #1819 from weisy11/reid
复现reid-strong-baseline
2022-05-06 12:05:07 +08:00
HydrogenSulfate 790815f430 refine code and docs 2022-05-05 22:14:07 +08:00
gaotingquan 0ba524d26b update: add reference 2022-05-05 21:37:37 +08:00
Wei Shengyu 4bc4b7e0e2
Merge pull request #1876 from TingquanGao/dev/fix_amp_eval
fix: amp eval
2022-05-05 20:39:02 +08:00
HydrogenSulfate 1c31010b14 refine code 2022-05-05 20:28:59 +08:00
HydrogenSulfate 16f910b451 add m1 and baseline config 2022-05-05 19:55:08 +08:00
HydrogenSulfate 0b1481402b merge devevelop 2022-05-05 14:42:06 +08:00
Yang Nie b334da6fad
Merge branch 'develop' into ConvNeXt 2022-05-05 14:40:46 +08:00
Walter 00bf84c43a
Merge pull request #1886 from HydrogenSulfate/refine_ref
Refine paper & code ref for loss
2022-05-05 10:41:49 +08:00
littletomatodonkey bb13f3c4f5
fix single card dist (#1889)
* fix single card logit

* fix distillation yaml files
2022-05-05 09:48:56 +08:00
gaotingquan 275945dff9
fix: compatible with Paddle 2.2, 2.3, and develop. 2022-04-29 10:21:09 +00:00
gaotingquan 24372cc6e5 update: update the default gpu num to 8 when using AdamW 2022-04-29 17:31:12 +08:00
HydrogenSulfate 92cdbe6fb9 add ref for emlloss 2022-04-29 13:53:21 +08:00
HydrogenSulfate 645a125c40 refine paper and code ref, and remove trailing spaces 2022-04-29 13:34:56 +08:00
flytocc 8b8a02d607 add update_freq option for gradient accumulation 2022-04-28 00:50:28 +08:00
flytocc ed8202236b add EMA code 2022-04-28 00:39:53 +08:00
flytocc e1943f9a68 add ConvNeXt code 2022-04-28 00:34:48 +08:00
gaotingquan 59a3dcfc1c
fix: amp eval 2022-04-26 12:26:17 +00:00
gaotingquan fea9522a69 fix: dbg 2022-04-26 12:07:59 +08:00
HydrogenSulfate faa4c08762 remove tripetloss_v3 2022-04-25 15:11:51 +08:00
HydrogenSulfate 6149e719b3 refine code 2022-04-25 14:14:20 +08:00
HydrogenSulfate 674447f63e refine code 2022-04-25 11:25:44 +08:00
HydrogenSulfate 97e8abc3db refine code and yaml 2022-04-24 14:38:26 +08:00
cuicheng01 4e6c36e269
Merge pull request #1833 from TingquanGao/dev/fix_dist_loss
fix calc metric error and calc loss error in distributed.
2022-04-22 22:41:57 +08:00
HydrogenSulfate 661a1909e8 update code 2022-04-22 18:15:31 +08:00
gaotingquan b86ddf470e fix: when eval only, AMP can be enabled 2022-04-22 17:49:44 +08:00
gaotingquan b5a7eea504
fix: fix the bug that DistributedBatchSampler may sample repeatedly 2022-04-22 09:39:22 +00:00
HydrogenSulfate 15a0afc67c update code 2022-04-22 15:52:16 +08:00
HydrogenSulfate bc6e7f5cf5 update code 2022-04-22 15:26:05 +08:00
HydrogenSulfate 9dde9376fb update code 2022-04-22 15:25:11 +08:00
Walter 0218742ba5
Merge pull request #1868 from HydrogenSulfate/fix_optimizer_init
fix bug for static graph
2022-04-22 14:05:07 +08:00
HydrogenSulfate 74b4574367 Support for multiple components when build optimizer 2022-04-22 13:15:49 +08:00
HydrogenSulfate 8ae8934358 Merge branch 'develop' into multi_optim 2022-04-22 12:04:52 +08:00
HydrogenSulfate 15997ea9d0 update code 2022-04-22 12:03:17 +08:00
HydrogenSulfate f2982e5e47 update code 2022-04-22 12:01:05 +08:00
HydrogenSulfate 17fd1bc2c0 refine code 2022-04-22 12:00:03 +08:00
HydrogenSulfate 0146af28b0 fix code bug 2022-04-21 17:11:07 +08:00
HydrogenSulfate aa26a8c1d8 fix bug for static graph 2022-04-21 16:31:28 +08:00
HydrogenSulfate daf7eea23d fix code 2022-04-21 15:43:53 +08:00
HydrogenSulfate dfd7749828 refine hard code 2022-04-21 14:37:00 +08:00
Wei Shengyu ae9860b4bc
Merge pull request #1854 from weisy11/update_delimiter
update delimiter of imagenet dataset and topk
2022-04-21 11:53:05 +08:00
weishengyu f6373eb239 dbg 2022-04-21 11:25:33 +08:00
HydrogenSulfate 41e1a86caf add center loss 2022-04-21 00:17:54 +08:00
Wei Shengyu 05770197c3
Merge pull request #1855 from flytocc/VAN_Classification
add paper citation
2022-04-20 14:46:05 +08:00
Wei Shengyu e6feb68bb8
Merge pull request #1824 from TingquanGao/dev/spt_amp_eval
fix: fp32 eval by default when enable amp
2022-04-20 14:40:46 +08:00
Walter 43a03a0c6b
Merge pull request #1853 from HydrogenSulfate/multi_optim
support for multi optimizer case
2022-04-20 14:33:07 +08:00
HydrogenSulfate 15242df170 refine optimizer/__init__.py 2022-04-20 13:10:31 +08:00
HydrogenSulfate 80b8ca3f23 fix optimizer/init.py 2022-04-20 12:16:40 +08:00
HydrogenSulfate 3f117428da fix code 2022-04-20 11:08:42 +08:00
HydrogenSulfate 3a1276d315 train_loss_func only used in train mode 2022-04-19 19:54:48 +08:00
flytocc 7b020eb2aa add paper citation 2022-04-19 19:45:19 +08:00
weishengyu f834a22e71 update delimiter 2022-04-19 16:36:46 +08:00
HydrogenSulfate 24abea151a support for multi optimizer case 2022-04-19 14:26:42 +08:00
flytocc 3f84dcb44e add random interpolation for UnifiedResize 2022-04-19 13:25:13 +08:00
flytocc c3018ebd39 add VAN-Classification code 2022-04-19 13:13:33 +08:00
Wei Shengyu a5a1c19273
Merge pull request #1851 from zhangxinyu-xyz/ISE_ReID
Release the inference code of ISE (ReID-CVPR2022)
2022-04-18 15:57:20 +08:00
gaotingquan 83ed5195c3
fix: set use_fp16_test to True when AMP O2 is enabled 2022-04-18 06:14:43 +00:00
zhangxinyu-xyz 12d1b5f9a9 Release the inference code of ISE (ReID-CVPR2022) 2022-04-18 13:23:47 +08:00
weishengyu 1789da6422 fix bug 2022-04-18 11:26:32 +08:00
weishengyu 1db85b5d3b remove pad 2022-04-18 11:07:47 +08:00
weishengyu b242f52976 remove configs 2022-04-18 11:06:08 +08:00
weishengyu 52b5918dbc Merge branch 'develop' of github.com:weisy11/PaddleClas into develop 2022-04-18 11:02:28 +08:00
gaotingquan a35cdd2aec
uncommit: sync bn is too slow to use and convert_sync_batchnorm() is not effective for BatchNorm 2022-04-14 08:19:39 +00:00
gaotingquan 13d5e59051
fix: convert bn to sync_bn
the running_mean and running_var of bn would not be synchronized in dist,
so which leads to bug that eval loss in training is inconsistent with eval only.
2022-04-14 07:36:39 +00:00
gaotingquan efde56ffc6
fix: only fp16 evaluation is supported when ampO2 is enabled 2022-04-13 12:14:14 +00:00
Walter bf12dffcd3
Merge pull request #1805 from RainFrost1/amp_o2
all model amp train config for tipc
2022-04-13 17:46:33 +08:00
gaotingquan 474c918b27
fix: fix bug of batch_size statistics error 2022-04-13 09:19:30 +00:00
gaotingquan c46189bad0
fix: fix bug about calc loss in dist 2022-04-12 06:56:44 +00:00
HydrogenSulfate af90cd7c59 update center loss config and related code 2022-04-12 13:07:53 +08:00
weishengyu 9de22673df dbg 2022-04-08 14:29:03 +08:00
weishengyu 7f0b7a04cd dbg 2022-04-08 10:59:18 +08:00
weishengyu e651f3f62f remove bnneck 2022-04-08 10:58:23 +08:00
weishengyu d7a20aa967 dbg 2022-04-07 19:35:58 +08:00
weishengyu 9ab1ca3f0c dbg 2022-04-07 18:31:45 +08:00
weishengyu 9c99e7cc6b add bnneck, last stride=1 2022-04-07 16:59:09 +08:00
dongshuilong 2ecdaddfc6 fix spell error for config.py 2022-04-07 06:57:32 +00:00
weishengyu 5615bc6cfd change sampler 2022-04-06 20:14:29 +08:00
weishengyu 08582fe617 dbg 2022-04-06 19:54:15 +08:00
weishengyu 0993147af7 dbg 2022-04-06 19:49:10 +08:00
gaotingquan b761325faa fix: fp32 eval by default when enable amp
If you want to eval by fp16 when enable amp, please set Amp.use_fp16_test=True, False by default.
2022-04-02 19:22:10 +08:00
cuicheng01 96fbbad038 update mobilevit.py 2022-04-01 09:06:46 +00:00
cuicheng01 44b9963b25 add mobilevit code 2022-04-01 08:51:42 +00:00
weishengyu 4b76c385e1 dbg 2022-04-01 11:42:49 +08:00
weishengyu a5089348ee dbg 2022-04-01 11:41:02 +08:00
weishengyu fb2ddcfd64 update config 2022-04-01 11:39:43 +08:00
weishengyu 5f303937ae dbg 2022-03-31 15:27:19 +08:00
weishengyu fdfeeadff1 dbg 2022-03-31 15:15:50 +08:00
weishengyu 8408f8ef28 dbg 2022-03-31 15:12:05 +08:00
weishengyu 6618954c33 dbg and add configs 2022-03-31 15:10:50 +08:00
weishengyu dbb8df64d5 add reid config 2022-03-31 15:06:06 +08:00
cuicheng01 91b5337fdb
Merge pull request #1795 from cuicheng01/add_cswin
add cswin code and doc
2022-03-30 17:56:03 +08:00
dongshuilong 86fed454c1 supoort -o new config param 2022-03-30 09:12:02 +00:00
dongshuilong a944603da0 fix log twice bug 2022-03-30 08:31:35 +00:00
cuicheng01 f977c7c060 update cswin config 2022-03-30 03:40:27 +00:00
cuicheng01 4839915056 update cswin_transformer.py 2022-03-29 12:01:04 +00:00
cuicheng01 51e06d43f5 add cswin code and doc 2022-03-29 09:50:44 +00:00
cuicheng01 84ae83da7a
Merge pull request #1762 from cuicheng01/develop
fix AccuracyScore metric
2022-03-28 16:32:20 +08:00
cuicheng01 891fa1c093 fix AccuracyScore metric 2022-03-16 14:34:45 +00:00
huangqipeng b62b98d79f feat: support mlu device and amp of mlu 2022-03-14 15:48:26 +08:00