未验证 提交 dd02918b 编写于 作者: X xiaoting 提交者: GitHub

rename PP-OCRv3 algorithm to SVTR_LCNet (#9025)

* rename PP-OCRv3 algorithm to SVTR_LCNet

* rename PP-OCRv3 algorithm to SVTR_LCNet

* update multi-lang config for v3
上级 7c81d482
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -45,7 +45,7 @@ Architecture: ...@@ -45,7 +45,7 @@ Architecture:
freeze_params: false freeze_params: false
return_all_feats: true return_all_feats: true
model_type: *model_type model_type: *model_type
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
...@@ -72,7 +72,7 @@ Architecture: ...@@ -72,7 +72,7 @@ Architecture:
freeze_params: false freeze_params: false
return_all_feats: true return_all_feats: true
model_type: *model_type model_type: *model_type
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -36,7 +36,7 @@ Optimizer: ...@@ -36,7 +36,7 @@ Optimizer:
Architecture: Architecture:
model_type: rec model_type: rec
algorithm: SVTR algorithm: SVTR_LCNet
Transform: Transform:
Backbone: Backbone:
name: MobileNetV1Enhance name: MobileNetV1Enhance
......
...@@ -40,7 +40,7 @@ def apply_to_static(model, config, logger): ...@@ -40,7 +40,7 @@ def apply_to_static(model, config, logger):
return model return model
assert "image_shape" in config[ assert "image_shape" in config[
"Global"], "image_shape must be assigned for static training mode..." "Global"], "image_shape must be assigned for static training mode..."
supported_list = ["DB", "SVTR"] supported_list = ["DB", "SVTR_LCNet"]
if config["Architecture"]["algorithm"] in ["Distillation"]: if config["Architecture"]["algorithm"] in ["Distillation"]:
algo = list(config["Architecture"]["Models"].values())[0]["algorithm"] algo = list(config["Architecture"]["Models"].values())[0]["algorithm"]
else: else:
...@@ -52,7 +52,7 @@ def apply_to_static(model, config, logger): ...@@ -52,7 +52,7 @@ def apply_to_static(model, config, logger):
[None] + config["Global"]["image_shape"], dtype='float32') [None] + config["Global"]["image_shape"], dtype='float32')
] ]
if algo == "SVTR": if algo == "SVTR_LCNet":
specs.append([ specs.append([
InputSpec( InputSpec(
[None, config["Global"]["max_text_length"]], [None, config["Global"]["max_text_length"]],
......
...@@ -75,7 +75,8 @@ def main(): ...@@ -75,7 +75,8 @@ def main():
model = build_model(config['Architecture']) model = build_model(config['Architecture'])
extra_input_models = [ extra_input_models = [
"SRN", "NRTR", "SAR", "SEED", "SVTR", "VisionLAN", "RobustScanner" "SRN", "NRTR", "SAR", "SEED", "SVTR", "SVTR_LCNet", "VisionLAN",
"RobustScanner"
] ]
extra_input = False extra_input = False
if config['Architecture']['algorithm'] == 'Distillation': if config['Architecture']['algorithm'] == 'Distillation':
......
...@@ -62,17 +62,17 @@ def export_single_model(model, ...@@ -62,17 +62,17 @@ def export_single_model(model,
shape=[None], dtype="float32")] shape=[None], dtype="float32")]
] ]
model = to_static(model, input_spec=other_shape) model = to_static(model, input_spec=other_shape)
elif arch_config["algorithm"] == "SVTR_LCNet":
other_shape = [
paddle.static.InputSpec(
shape=[None, 3, 48, -1], dtype="float32"),
]
model = to_static(model, input_spec=other_shape)
elif arch_config["algorithm"] == "SVTR": elif arch_config["algorithm"] == "SVTR":
if arch_config["Head"]["name"] == 'MultiHead': other_shape = [
other_shape = [ paddle.static.InputSpec(
paddle.static.InputSpec( shape=[None] + input_shape, dtype="float32"),
shape=[None, 3, 48, -1], dtype="float32"), ]
]
else:
other_shape = [
paddle.static.InputSpec(
shape=[None] + input_shape, dtype="float32"),
]
model = to_static(model, input_spec=other_shape) model = to_static(model, input_spec=other_shape)
elif arch_config["algorithm"] == "PREN": elif arch_config["algorithm"] == "PREN":
other_shape = [ other_shape = [
......
...@@ -219,7 +219,7 @@ def train(config, ...@@ -219,7 +219,7 @@ def train(config,
use_srn = config['Architecture']['algorithm'] == "SRN" use_srn = config['Architecture']['algorithm'] == "SRN"
extra_input_models = [ extra_input_models = [
"SRN", "NRTR", "SAR", "SEED", "SVTR", "SPIN", "VisionLAN", "SRN", "NRTR", "SAR", "SEED", "SVTR", "SVTR_LCNet", "SPIN", "VisionLAN",
"RobustScanner", "RFL", 'DRRG', 'SATRN' "RobustScanner", "RFL", 'DRRG', 'SATRN'
] ]
extra_input = False extra_input = False
...@@ -641,9 +641,9 @@ def preprocess(is_train=False): ...@@ -641,9 +641,9 @@ def preprocess(is_train=False):
'EAST', 'DB', 'SAST', 'Rosetta', 'CRNN', 'STARNet', 'RARE', 'SRN', 'EAST', 'DB', 'SAST', 'Rosetta', 'CRNN', 'STARNet', 'RARE', 'SRN',
'CLS', 'PGNet', 'Distillation', 'NRTR', 'TableAttn', 'SAR', 'PSE', 'CLS', 'PGNet', 'Distillation', 'NRTR', 'TableAttn', 'SAR', 'PSE',
'SEED', 'SDMGR', 'LayoutXLM', 'LayoutLM', 'LayoutLMv2', 'PREN', 'FCE', 'SEED', 'SDMGR', 'LayoutXLM', 'LayoutLM', 'LayoutLMv2', 'PREN', 'FCE',
'SVTR', 'ViTSTR', 'ABINet', 'DB++', 'TableMaster', 'SPIN', 'VisionLAN', 'SVTR', 'SVTR_LCNet', 'ViTSTR', 'ABINet', 'DB++', 'TableMaster', 'SPIN',
'Gestalt', 'SLANet', 'RobustScanner', 'CT', 'RFL', 'DRRG', 'CAN', 'VisionLAN', 'Gestalt', 'SLANet', 'RobustScanner', 'CT', 'RFL', 'DRRG',
'Telescope', 'SATRN' 'CAN', 'Telescope', 'SATRN'
] ]
if use_xpu: if use_xpu:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册