Skip to content

Commit 675631e

Browse files
authored
Merge branch 'PaddlePaddle:develop' into develop
2 parents b2a820e + 231824f commit 675631e

File tree

1,354 files changed

+56944
-3540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,354 files changed

+56944
-3540
lines changed

graph_net/analysis_util.py

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import sys
44
from scipy.stats import gmean
55
from graph_net.config.datatype_tolerance_config import get_precision
6+
from graph_net.positive_tolerance_interpretation import PositiveToleranceInterpretation
7+
from graph_net.verify_aggregated_params import determine_tolerances
68

79

810
def detect_sample_status(log_text: str) -> str:
@@ -293,38 +295,24 @@ def get_correctness(dtype: str, t: int, correctness_data: dict, index: int) -> b
293295
return False
294296

295297

296-
def fake_perf_degrad(tolerance, error_code, type="default") -> str:
298+
def fake_perf_degrad(
299+
tolerance,
300+
error_code,
301+
positive_tolerance_interpretation: PositiveToleranceInterpretation,
302+
) -> str:
297303
"""
298304
Judge current correctness based on tolerance t and status.
305+
Refactored to delegate logic to PositiveToleranceInterpretation classes.
299306
"""
300-
if type == "default":
301-
if tolerance >= 3:
302-
return "correct"
303-
elif error_code == "accuracy" and tolerance >= 1:
304-
return "correct"
305-
else:
306-
return error_code
307-
elif type == "extended":
308-
if (
309-
error_code == "compile_fail" or error_code == "runtime_fail"
310-
) and tolerance >= 4:
311-
return "correct"
312-
elif error_code == "eager_fail" and tolerance >= 3:
313-
return "correct"
314-
elif (
315-
error_code == "shape_mismatch" or error_code == "type_mismatch"
316-
) and tolerance >= 2:
317-
return "correct"
318-
elif error_code == "accuracy" and tolerance >= 1:
319-
return "correct"
320-
else:
321-
return error_code
322-
else:
323-
raise NotImplementedError
307+
if positive_tolerance_interpretation.is_error_tolerated(tolerance, error_code):
308+
return "correct"
309+
310+
return error_code
324311

325312

326313
def calculate_scores(
327314
samples: list,
315+
positive_tolerance_interpretation: PositiveToleranceInterpretation,
328316
p: float = 0,
329317
b: float = 0.1,
330318
type: str = "ESt",
@@ -339,7 +327,10 @@ def calculate_scores(
339327

340328
scores = {}
341329

342-
for tolerance in range(-10, 5):
330+
strategy = positive_tolerance_interpretation
331+
tolerances = determine_tolerances(samples, positive_tolerance_interpretation)
332+
333+
for tolerance in tolerances:
343334
rectified_speedups = []
344335
rectified_speedups_fake_degrad = []
345336

@@ -373,12 +364,10 @@ def calculate_scores(
373364
)
374365
else:
375366
if not is_correct_at_t1[idx]:
376-
current_correctness = fake_perf_degrad(
367+
is_tolerated = strategy.is_error_tolerated(
377368
tolerance, fail_type_at_t1[idx]
378369
)
379-
rec_speedup_fake_degrad = (
380-
1 if current_correctness == "correct" else b
381-
)
370+
rec_speedup_fake_degrad = 1 if is_tolerated else b
382371
else:
383372
rec_speedup_fake_degrad = (
384373
speedup_at_t1[idx] ** (p + 1)
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
GRAPH_NET_ROOT=$(python3 -c "import graph_net; import os; print(os.path.dirname(os.path.dirname(graph_net.__file__)))")
4+
5+
python3 -m graph_net.model_path_handler \
6+
--model-path-list "customize_your_model_path_list" \
7+
--handler-config $(base64 -w 0 <<EOF
8+
{
9+
"handler_path": "$GRAPH_NET_ROOT/graph_net/customize_your_sample_pass.py",
10+
"handler_class_name": "customize_your_class_name",
11+
"handler_config": {
12+
"resume": true,
13+
"model_path_prefix": "/customize_your_model_path_prefix",
14+
"output_dir": "/customize_your_output_file"
15+
}
16+
}
17+
EOF
18+
)
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
samples/timm/crossvit_small_240.in1k
2+
samples/timm/poolformerv2_s12.sail_in1k
3+
samples/timm/regnety_080.pycls_in1k
4+
samples/timm/dla46x_c.in1k
5+
samples/timm/mobilenetv1_100.ra4_e3600_r224_in1k
6+
samples/timm/efficientnetv2_rw_s.ra2_in1k
7+
samples/timm/vit_base_patch16_rope_ape_224.naver_in1k
8+
samples/timm/fastvit_t8.apple_dist_in1k
9+
samples/timm/test_byobnet.r160_in1k
10+
samples/timm/mambaout_base.in1k
11+
samples/timm/davit_small
12+
samples/timm/resnet61q.ra2_in1k
13+
samples/timm/coat_tiny
14+
samples/timm/regnetx_004.pycls_in1k
15+
samples/timm/convnextv2_large.fcmae
16+
samples/timm/regnety_640.seer
17+
samples/timm/repvit_m1_1.dist_300e_in1k
18+
samples/timm/tinynet_d.in1k
19+
samples/timm/resnetrs270.tf_in1k
20+
samples/timm/cait_m48_448
21+
samples/timm/legacy_seresnet50.in1k
22+
samples/timm/tinynet_a.in1k
23+
samples/timm/convnext_small.fb_in1k
24+
samples/timm/vit_huge_patch14_clip_quickgelu_224.dfn5b
25+
samples/timm/dpn131.mx_in1k
26+
samples/timm/convnextv2_large.fcmae_ft_in1k
27+
samples/timm/convnextv2_small
28+
samples/timm/repvit_m1.dist_in1k
29+
samples/timm/cs3darknet_s
30+
samples/timm/resnet50d.a1_in1k
31+
samples/timm/dm_nfnet_f6
32+
samples/timm/coatnet_1_rw_224
33+
samples/timm/lcnet_050.ra2_in1k
34+
samples/timm/efficientnet_em.ra2_in1k
35+
samples/timm/dpn48b
36+
samples/timm/semnasnet_075.rmsp_in1k
37+
samples/timm/skresnet34.ra_in1k
38+
samples/timm/crossvit_15_dagger_240.in1k
39+
samples/timm/mnasnet_100.rmsp_in1k
40+
samples/timm/mobilenetv3_rw.rmsp_in1k
41+
samples/timm/xception65p.ra3_in1k
42+
samples/timm/coatnet_0_rw_224
43+
samples/timm/eca_nfnet_l3
44+
samples/timm/deit3_base_patch16_224.fb_in1k
45+
samples/timm/mambaout_base_short_rw.sw_e500_in1k
46+
samples/timm/mobilenetv4_conv_small.e1200_r224_in1k
47+
samples/timm/xception71.tf_in1k
48+
samples/timm/dla60.in1k
49+
samples/timm/repghostnet_130.in1k
50+
samples/timm/mambaout_base_plus_rw.sw_e150_in12k
51+
samples/timm/poolformerv2_s36.sail_in1k
52+
samples/timm/deit3_huge_patch14_224.fb_in1k
53+
samples/timm/vit_base_patch32_clip_224.datacompxl
54+
samples/timm/poolformer_m48.sail_in1k
55+
samples/timm/regnety_006.pycls_in1k
56+
samples/timm/starnet_s4.in1k
57+
samples/timm/poolformer_m36.sail_in1k
58+
samples/timm/vit_huge_patch14_gap_224.in1k_ijepa
59+
samples/timm/efficientnet_b3.ra2_in1k
60+
samples/timm/mobilenetv3_large_150d.ra4_e3600_r256_in1k
61+
samples/timm/hgnetv2_b0.ssld_stage1_in22k_in1k
62+
samples/timm/convnextv2_huge.fcmae
63+
samples/timm/davit_huge
64+
samples/timm/regnetx_004_tv.tv2_in1k
65+
samples/timm/dla34.in1k
66+
samples/timm/convnext_xlarge.fb_in22k
67+
samples/timm/resmlp_12_224.fb_dino
68+
samples/timm/fasternet_t1.in1k
69+
samples/timm/resnetblur50.bt_in1k
70+
samples/timm/res2net50d.in1k
71+
samples/timm/vit_base_patch32_224.augreg_in1k
72+
samples/timm/mambaout_base_wide_rw.sw_e500_in1k
73+
samples/timm/vgg19_bn.tv_in1k
74+
samples/timm/vit_small_patch16_rope_ape_224.naver_in1k
75+
samples/timm/hardcorenas_b.miil_green_in1k
76+
samples/timm/vgg16.tv_in1k
77+
samples/timm/xception41p.ra3_in1k
78+
samples/timm/efficientnet_lite0.ra_in1k
79+
samples/timm/regnetv_064.ra3_in1k
80+
samples/timm/regnety_320.pycls_in1k
81+
samples/timm/convnext_pico.d1_in1k
82+
samples/timm/repvit_m1_0.dist_300e_in1k
83+
samples/timm/resnet50c.gluon_in1k
84+
samples/timm/mobileone_s4.apple_in1k
85+
samples/timm/ghostnet_100.in1k
86+
samples/timm/deit_base_distilled_patch16_384
87+
samples/timm/dpn68b.mx_in1k
88+
samples/timm/dla60_res2next
89+
samples/timm/resnet101d.gluon_in1k
90+
samples/timm/eva02_large_patch14_clip_224.merged2b
91+
samples/timm/fasternet_m.in1k
92+
samples/timm/mobilenetv2_110d.ra_in1k
93+
samples/timm/regnetx_064.pycls_in1k
94+
samples/timm/cspresnet50.ra_in1k
95+
samples/timm/resmlp_24_224.fb_dino
96+
samples/timm/mobileone_s3.apple_in1k
97+
samples/timm/mobileone_s2.apple_in1k
98+
samples/timm/res2net101d
99+
samples/timm/hardcorenas_f.miil_green_in1k
100+
samples/timm/hrnet_w18_ssld.paddle_in1k
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
# shuf -n 100 torch_samples_list.txt > small_torch_samples_list.txt
2+
samples/ultralytics/yolov3-tinyu
3+
samples/transformers-auto-model/hf-tiny-model-private_tiny-random-Swinv2ForImageClassification
4+
samples/torchgeometric/RECT_L
5+
samples/transformers-auto-model/opus-mt-en-gv
6+
samples/transformers-auto-model/Visual-Attention-Network_van-tiny
7+
samples/timm/convnextv2_base.fcmae_ft_in1k
8+
samples/torchvision/vgg16_bn
9+
samples/timm/regnety_080_tv.tv2_in1k
10+
samples/transformers-auto-model/internetoftim_dinov2-base
11+
samples/timm/mobilenetv4_conv_aa_large.e230_r384_in12k
12+
samples/ultralytics/yolo12x
13+
samples/transformers-auto-model/opus-mt-eo-it
14+
samples/transformers-auto-model/opus-mt-es-csg
15+
samples/transformers-auto-model/google_byt5_base
16+
samples/transformers-auto-model/Fsoft-AIC_videberta-base
17+
samples/timm/mixer_l16_224.goog_in21k
18+
samples/transformers-auto-model/hf-tiny-model-private_tiny-random-EfficientFormerModel
19+
samples/transformers-auto-model/distilbert_distilbert-base-multilingual-cased
20+
samples/transformers-auto-model/ydshieh_tiny-random-ViTModel
21+
samples/transformers-auto-model/microsoft_beit-base-patch16-384
22+
samples/transformers-auto-model/hf-tiny-model-private_tiny-random-Data2VecVisionModel
23+
samples/transformers-auto-model/kanarya-750m
24+
samples/transformers-auto-model/Helsinki-NLP_opus-mt-zh-en
25+
samples/transformers-auto-model/opus-mt-de-tl
26+
samples/timm/vit_base_patch16_224_miil.in21k
27+
samples/mmseg/SegNeXt-b
28+
samples/transformers-auto-model/OFA-Sys_chinese-clip-vit-large-patch14
29+
samples/mmpose/ViTPose-B
30+
samples/transformers-auto-model/Sayan01_tiny-bert-sst2-distilled
31+
samples/timm/regnety_080.pycls_in1k
32+
samples/ultralytics/yolov9c
33+
samples/transformers-auto-model/opus-mt-bcl-fr
34+
samples/transformers-auto-model/opus-mt-de-ase
35+
samples/timm/eva02_base_patch16_clip_224.merged2b
36+
samples/mmpose/S-ViPNAS-Res50
37+
samples/transformers-auto-model/Lin-Chen_ShareGPT4V-7B_Pretrained_vit-large336-l12
38+
samples/transformers-auto-model/opus-mt-en-tw
39+
samples/timm/hgnet_tiny.paddle_in1k
40+
samples/transformers-auto-model/opus-mt-ase-es
41+
samples/transformers-auto-model/MIT_ast-finetuned-audioset-10-10-0.4593
42+
samples/transformers-auto-model/opus-mt-en-kqn
43+
samples/transformers-auto-model/opus-mt-en-guw
44+
samples/timm/vit_small_patch16_rope_mixed_ape_224.naver_in1k
45+
samples/timm/repvgg_b0.rvgg_in1k
46+
samples/transformers-auto-model/opus-mt-en-crs
47+
samples/transformers-auto-model/opus-mt-en-bat
48+
samples/transformers-auto-model/Francesco_resnet101-224-1k
49+
samples/timm/dpn107.mx_in1k
50+
samples/transformers-auto-model/google/t5-efficient-large-kv128
51+
samples/transformers-auto-model/aimarsg_prueba5
52+
samples/torchvision/resnext50_32x4d
53+
samples/timm/inception_v3.gluon_in1k
54+
samples/transformers-auto-model/mohsenfayyaz_BERT_Warmup
55+
samples/transformers-auto-model/MoritzLaurer_xtremedistil-l6-h256-mnli-fever-anli-ling-binary
56+
samples/transformers-auto-model/pipecat-ai_smart-turn-v2
57+
samples/timm/poolformerv2_m48.sail_in1k
58+
samples/timm/res2net101_26w_4s
59+
samples/transformers-auto-model/opus-mt-ar-es
60+
samples/timm/regnety_002.pycls_in1k
61+
samples/transformers-auto-model/simjo_dummy-model
62+
samples/mmseg/CCNet_R101
63+
samples/transformers-auto-model/opus-mt-tc-bible-big-deu_eng_fra_por_spa-bat
64+
samples/transformers-auto-model/facebook_sam-vit-large
65+
samples/transformers-auto-model/distilbert_distilbert-base-uncased
66+
samples/mmseg/PoolFormer_m36
67+
samples/timm/hgnetv2_b4.ssld_stage1_in22k_in1k
68+
samples/timm/regnetx_160.pycls_in1k
69+
samples/transformers-auto-model/google/bert_uncased_L-6_H-512_A-8
70+
samples/transformers-auto-model/ogoshi2000_stance-nystromformer
71+
samples/timm/resnetv2_18.ra4_e3600_r224_in1k
72+
samples/transformers-auto-model/TinyLlama/TinyLlama-1.1B-Chat-v0.4
73+
samples/timm/resnetaa50d.d_in12k
74+
samples/transformers-auto-model/bge-small-en-v1.5
75+
samples/timm/coatnet_rmlp_0_rw_224
76+
samples/transformers-auto-model/opus-mt-en-sal
77+
samples/mmseg/UPerNet_R101
78+
samples/transformers-auto-model/sentence-transformers/paraphrase-distilroberta-base-v1
79+
samples/transformers-auto-model/opus-mt-en-phi
80+
samples/transformers-auto-model/opus-mt-fi-niu
81+
samples/torchvision/vit_l_16
82+
samples/timm/res2net50_14w_8s.in1k
83+
samples/mmseg/Twins_pcpvt-b_uperhead
84+
samples/transformers-auto-model/google-t5_t5-large
85+
samples/transformers-auto-model/TrustSafeAI_RADAR_Vicuna_7B
86+
samples/torchaudio/wavlm_base
87+
samples/transformers-auto-model/opus-mt-NORTH_EU-NORTH_EU
88+
samples/transformers-auto-model/apple_aimv2-huge-patch14-224
89+
samples/timm/resnetrs270.tf_in1k
90+
samples/transformers-auto-model/opus-mt-de-no
91+
samples/transformers-auto-model/opus-mt-tc-bible-big-gmw-deu_eng_fra_por_spa
92+
samples/timm/repghostnet_111.in1k
93+
samples/mmseg/DeepLabV3+_R101
94+
samples/transformers-auto-model/microsoft_swin-base-patch4-window12-384-in22k
95+
samples/transformers-auto-model/opus-mt-es-de
96+
samples/transformers-auto-model/nvidia_mit-b4
97+
samples/transformers-auto-model/opus-mt-tc-bible-big-ine-deu_eng_fra_por_spa
98+
samples/mmpose/pose_swin_b
99+
samples/transformers-auto-model/opus-mt-bi-en
100+
samples/transformers-auto-model/all-mpnet-base-v2
101+
samples/transformers-auto-model/Neurora_opus-tatoeba-heb-eng
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#samples/timm/crossvit_small_240.in1k
2+
#samples/timm/poolformerv2_s12.sail_in1k
3+
#samples/timm/regnety_080.pycls_in1k
4+
#samples/timm/dla46x_c.in1k
5+
#samples/timm/mobilenetv1_100.ra4_e3600_r224_in1k
6+
samples/timm/efficientnetv2_rw_s.ra2_in1k
7+
samples/timm/vit_base_patch16_rope_ape_224.naver_in1k
8+
#samples/timm/fastvit_t8.apple_dist_in1k
9+
#samples/timm/test_byobnet.r160_in1k
10+
#samples/timm/mambaout_base.in1k

graph_net/config/small_torch_samples_list.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)