Skip to content

Commit 13204c9

Browse files
HydrogenSulfateHydrogenSulfate
committed
update sample
1 parent f7c78d9 commit 13204c9

File tree

7 files changed

+137
-241
lines changed

7 files changed

+137
-241
lines changed

‎configs/recognition/tsm/tsm_k400_frames.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ PIPELINE: #PIPELINE field
3838
decode:
3939
name: "FrameDecoder"
4040
sample:
41-
name: "Sampler_TSM"
41+
name: "Sampler"
4242
num_seg: 8
4343
seg_len: 1
4444
valid_mode: False
45+
select_left: True
4546
transform: #Mandotary, image transform operator.
46-
- MultiScaleCrop_TSM:
47+
- MultiScaleCrop:
4748
target_size: 224
49+
allow_duplication: True
4850
- RandomFlip:
4951
- Image2Array:
5052
- Normalization:
@@ -55,13 +57,15 @@ PIPELINE: #PIPELINE field
5557
decode:
5658
name: "FrameDecoder"
5759
sample:
58-
name: "Sampler_TSM"
60+
name: "Sampler"
5961
num_seg: 8
6062
seg_len: 1
6163
valid_mode: True
64+
select_left: True
6265
transform:
63-
- Scale_PV:
66+
- Scale:
6467
short_size: 256
68+
fixed_ratio: False
6569
- CenterCrop:
6670
target_size: 224
6771
- Image2Array:
@@ -73,13 +77,15 @@ PIPELINE: #PIPELINE field
7377
decode:
7478
name: "FrameDecoder"
7579
sample:
76-
name: "Sampler_TSM"
80+
name: "Sampler"
7781
num_seg: 8
7882
seg_len: 1
7983
valid_mode: True
84+
select_left: True
8085
transform:
81-
- Scale_PV:
86+
- Scale:
8287
short_size: 256
88+
fixed_ratio: False
8389
- CenterCrop:
8490
target_size: 224
8591
- Image2Array:

‎configs/recognition/tsm/tsm_k400_frames_nhwc.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MODEL: #MODEL field
1313
drop_ratio: 0.5 #the ratio of dropout
1414
std: 0.001 #std value in params initialization
1515
data_format: "NHWC"
16-
16+
1717

1818
DATASET: #DATASET field
1919
batch_size: 16 #Mandatory, bacth size
@@ -40,13 +40,15 @@ PIPELINE: #PIPELINE field
4040
decode:
4141
name: "FrameDecoder"
4242
sample:
43-
name: "Sampler_TSM"
43+
name: "Sampler"
4444
num_seg: 8
4545
seg_len: 1
4646
valid_mode: False
47+
select_left: True
4748
transform: #Mandotary, image transform operator.
48-
- MultiScaleCrop_TSM:
49+
- MultiScaleCrop:
4950
target_size: 224
51+
allow_duplication: True
5052
- RandomFlip:
5153
- Image2Array:
5254
transpose: False
@@ -59,13 +61,15 @@ PIPELINE: #PIPELINE field
5961
decode:
6062
name: "FrameDecoder"
6163
sample:
62-
name: "Sampler_TSM"
64+
name: "Sampler"
6365
num_seg: 8
6466
seg_len: 1
6567
valid_mode: True
68+
select_left: True
6669
transform:
67-
- Scale_PV:
70+
- Scale:
6871
short_size: 256
72+
fixed_ratio: False
6973
- CenterCrop:
7074
target_size: 224
7175
- Image2Array:
@@ -79,13 +83,15 @@ PIPELINE: #PIPELINE field
7983
decode:
8084
name: "FrameDecoder"
8185
sample:
82-
name: "Sampler_TSM"
86+
name: "Sampler"
8387
num_seg: 8
8488
seg_len: 1
8589
valid_mode: True
90+
select_left: True
8691
transform:
87-
- Scale_PV:
92+
- Scale:
8893
short_size: 256
94+
fixed_ratio: False
8995
- CenterCrop:
9096
target_size: 224
9197
- Image2Array:

‎configs/recognition/tsm/tsm_ucf101_frames.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ PIPELINE: #PIPELINE field
3838
decode:
3939
name: "FrameDecoder"
4040
sample:
41-
name: "Sampler_TSM"
41+
name: "Sampler"
4242
num_seg: 8
4343
seg_len: 1
4444
valid_mode: False
45+
select_left: True
4546
transform: #Mandotary, image transform operator.
46-
- MultiScaleCrop_TSM:
47+
- MultiScaleCrop:
4748
target_size: 224
49+
allow_duplication: True
4850
- RandomFlip:
4951
- Image2Array:
5052
- Normalization:
@@ -55,13 +57,15 @@ PIPELINE: #PIPELINE field
5557
decode:
5658
name: "FrameDecoder"
5759
sample:
58-
name: "Sampler_TSM"
60+
name: "Sampler"
5961
num_seg: 8
6062
seg_len: 1
6163
valid_mode: True
64+
select_left: True
6265
transform:
63-
- Scale_PV:
66+
- Scale:
6467
short_size: 256
68+
fixed_ratio: False
6569
- CenterCrop:
6670
target_size: 224
6771
- Image2Array:
@@ -73,13 +77,15 @@ PIPELINE: #PIPELINE field
7377
decode:
7478
name: "FrameDecoder"
7579
sample:
76-
name: "Sampler_TSM"
80+
name: "Sampler"
7781
num_seg: 8
7882
seg_len: 1
7983
valid_mode: True
84+
select_left: True
8085
transform:
81-
- Scale_PV:
86+
- Scale:
8287
short_size: 256
88+
fixed_ratio: False
8389
- CenterCrop:
8490
target_size: 224
8591
- Image2Array:

‎configs/recognition/tsm/tsm_ucf101_frames_nhwc.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ PIPELINE: #PIPELINE field
4040
decode:
4141
name: "FrameDecoder"
4242
sample:
43-
name: "Sampler_TSM"
43+
name: "Sampler"
4444
num_seg: 8
4545
seg_len: 1
4646
valid_mode: False
47+
select_left: True
4748
transform: #Mandotary, image transform operator.
48-
- MultiScaleCrop_TSM:
49+
- MultiScaleCrop:
4950
target_size: 224
51+
allow_duplication: True
5052
- RandomFlip:
5153
- Image2Array:
5254
transpose: False
@@ -59,13 +61,15 @@ PIPELINE: #PIPELINE field
5961
decode:
6062
name: "FrameDecoder"
6163
sample:
62-
name: "Sampler_TSM"
64+
name: "Sampler"
6365
num_seg: 8
6466
seg_len: 1
6567
valid_mode: True
68+
select_left: True
6669
transform:
67-
- Scale_PV:
70+
- Scale:
6871
short_size: 256
72+
fixed_ratio: False
6973
- CenterCrop:
7074
target_size: 224
7175
- Image2Array:
@@ -79,13 +83,15 @@ PIPELINE: #PIPELINE field
7983
decode:
8084
name: "FrameDecoder"
8185
sample:
82-
name: "Sampler_TSM"
86+
name: "Sampler"
8387
num_seg: 8
8488
seg_len: 1
8589
valid_mode: True
90+
select_left: True
8691
transform:
87-
- Scale_PV:
92+
- Scale:
8893
short_size: 256
94+
fixed_ratio: False
8995
- CenterCrop:
9096
target_size: 224
9197
- Image2Array:

‎paddlevideo/loader/pipelines/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
from .augmentations import (
1616
Scale,
17-
Scale_PV,
1817
RandomCrop,
1918
CenterCrop,
2019
RandomFlip,
@@ -27,14 +26,13 @@
2726

2827
from .compose import Compose
2928
from .decode import VideoDecoder, FrameDecoder
30-
from .sample import Sampler, Sampler_TSM
29+
from .sample import Sampler
3130
from .decode_sampler import DecodeSampler
3231
from .mix import Mixup, Cutmix
3332
from .anet_pipeline import LoadFeat, GetMatchMap, GetVideoLabel
3433

3534
__all__ = [
3635
'Scale',
37-
'Scale_PV',
3836
'RandomCrop',
3937
'CenterCrop',
4038
'RandomFlip',
@@ -44,7 +42,6 @@
4442
'VideoDecoder',
4543
'FrameDecoder',
4644
'Sampler',
47-
'Sampler_TSM',
4845
'Mixup',
4946
'Cutmix',
5047
'JitterScale',

0 commit comments

Comments
 (0)