Skip to content

Commit bd76f95

Browse files
authored
fix PaddleOCR-VL name (#4610)
1 parent a3b9c4b commit bd76f95

File tree

5 files changed

+23
-19
lines changed

5 files changed

+23
-19
lines changed

paddlex/inference/genai/models/paddleocr_vl_09b/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515

1616
def get_network_class(backend):
1717
if backend == "vllm":
18-
from ._vllm import PPOCRVLForConditionalGeneration
18+
from ._vllm import PaddleOCRVLForConditionalGeneration
1919

20-
return PPOCRVLForConditionalGeneration
20+
return PaddleOCRVLForConditionalGeneration
2121
elif backend == "sglang":
22-
from ._sglang import PPOCRVLForConditionalGeneration
22+
from ._sglang import PaddleOCRVLForConditionalGeneration
2323

24-
return PPOCRVLForConditionalGeneration
24+
return PaddleOCRVLForConditionalGeneration
2525
else:
2626
raise ValueError(f"Unsupported backend: {backend}")
2727

2828

2929
def get_processor_class(backend):
3030
if backend == "sglang":
31-
from ._sglang import PPOCRVLImageProcessor
31+
from ._sglang import PaddleOCRVLImageProcessor
3232

33-
return PPOCRVLImageProcessor
33+
return PaddleOCRVLImageProcessor
3434
else:
3535
raise ValueError(f"Unsupported backend: {backend}")

paddlex/inference/genai/models/paddleocr_vl_09b/_sglang/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from .network import PPOCRVLForConditionalGeneration
16-
from .processor import PPOCRVLImageProcessor
15+
from .network import PaddleOCRVLForConditionalGeneration
16+
from .processor import PaddleOCRVLImageProcessor

paddlex/inference/genai/models/paddleocr_vl_09b/_sglang/network.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ def forward(
626626
return sample_hidden_state
627627

628628
class SiglipVisionModel(nn.Module):
629-
config_class = "PPOCRVisionConfig"
629+
config_class = "PaddleOCRVisionConfig"
630630
main_input_name = "pixel_values"
631631

632632
def __init__(
@@ -679,7 +679,7 @@ def forward(
679679
cu_seqlens=cu_seqlens,
680680
)
681681

682-
class PPOCRVLForConditionalGeneration(Ernie4_5_ForCausalLM):
682+
class PaddleOCRVLForConditionalGeneration(Ernie4_5_ForCausalLM):
683683

684684
def __init__(self, *, config, quant_config=None, prefix: str = ""):
685685
super().__init__(config=config, prefix=prefix)

paddlex/inference/genai/models/paddleocr_vl_09b/_sglang/processor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def resize_image(image, min_pixels, max_pixels, factor) -> Image.Image:
8787
async def resize_image_async(image, min_pixels, max_pixels, factor):
8888
return resize_image(image, min_pixels, max_pixels, factor)
8989

90-
class PPOCRVLImageProcessor(BaseMultimodalProcessor):
90+
class PaddleOCRVLImageProcessor(BaseMultimodalProcessor):
9191

9292
def __init__(self, hf_config, server_args, _processor, *args, **kwargs):
9393
super().__init__(hf_config, server_args, _processor, *args, **kwargs)

paddlex/inference/genai/models/paddleocr_vl_09b/_vllm.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def smart_resize(
136136
w_bar = math.ceil(width * beta / factor) * factor
137137
return h_bar, w_bar
138138

139-
class PPOCRVLProcessingInfo(BaseProcessingInfo):
139+
class PaddleOCRVLProcessingInfo(BaseProcessingInfo):
140140

141141
def get_hf_config(self):
142142
return self.ctx.get_hf_config()
@@ -194,7 +194,9 @@ def get_image_size_with_most_features(self) -> ImageSize:
194194
image_size = hf_config.vision_config.image_size
195195
return ImageSize(height=image_size, width=image_size)
196196

197-
class PPOCRVLDummyInputsBuilder(BaseDummyInputsBuilder[PPOCRVLProcessingInfo]):
197+
class PaddleOCRVLDummyInputsBuilder(
198+
BaseDummyInputsBuilder[PaddleOCRVLProcessingInfo]
199+
):
198200

199201
def get_dummy_text(self, mm_counts: Mapping[str, int]) -> str:
200202
num_images = mm_counts.get("image", 0)
@@ -221,7 +223,9 @@ def get_dummy_mm_data(
221223
)
222224
}
223225

224-
class PPOCRVLMultiModalProcessor(BaseMultiModalProcessor[PPOCRVLProcessingInfo]):
226+
class PaddleOCRVLMultiModalProcessor(
227+
BaseMultiModalProcessor[PaddleOCRVLProcessingInfo]
228+
):
225229

226230
def _call_hf_processor(
227231
self,
@@ -955,7 +959,7 @@ def forward(
955959
return sample_hidden_state
956960

957961
class SiglipVisionModel(nn.Module):
958-
config_class = "PPOCRVisionConfig"
962+
config_class = "PaddleOCRVisionConfig"
959963
main_input_name = "pixel_values"
960964

961965
def __init__(
@@ -1073,9 +1077,9 @@ def load_weights(self, weights: Iterable[Tuple[str, torch.Tensor]]) -> set[str]:
10731077
return loaded_params
10741078

10751079
@MULTIMODAL_REGISTRY.register_processor(
1076-
PPOCRVLMultiModalProcessor,
1077-
info=PPOCRVLProcessingInfo,
1078-
dummy_inputs=PPOCRVLDummyInputsBuilder,
1080+
PaddleOCRVLMultiModalProcessor,
1081+
info=PaddleOCRVLProcessingInfo,
1082+
dummy_inputs=PaddleOCRVLDummyInputsBuilder,
10791083
)
10801084
@support_torch_compile(
10811085
# set dynamic_arg_dims to support mrope
@@ -1086,7 +1090,7 @@ def load_weights(self, weights: Iterable[Tuple[str, torch.Tensor]]) -> set[str]:
10861090
"inputs_embeds": 0,
10871091
}
10881092
)
1089-
class PPOCRVLForConditionalGeneration(Ernie4_5_ForCausalLM, SupportsMultiModal):
1093+
class PaddleOCRVLForConditionalGeneration(Ernie4_5_ForCausalLM, SupportsMultiModal):
10901094

10911095
def __init__(self, *, vllm_config: VllmConfig, prefix: str = ""):
10921096
super().__init__(vllm_config=vllm_config, prefix=prefix)

0 commit comments

Comments
 (0)