Compare commits

...

4 Commits

Author SHA1 Message Date
xiawei
2736b76493 solve conflict 2025-11-14 15:59:58 +08:00
xiawei
a0ea057490 solve conflict 2025-11-14 15:51:58 +08:00
4pdadmin
8283d5e430 init git attributes 2025-11-14 15:50:30 +08:00
xiawei
cb95a394a5 DESC: fix infer 2025-11-14 15:43:41 +08:00
2 changed files with 45 additions and 11 deletions

35
.gitattributes vendored
View File

@ -5,6 +5,9 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40
*.bin.* filter=lfs diff=lfs merge=lfs -text *.bin.* filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text *.bz2 filter=lfs diff=lfs merge=lfs -text
======= =======
@ -18,11 +21,15 @@
======= =======
*.bz2 filter=lfs diff=lfs merge=lfs -text *.bz2 filter=lfs diff=lfs merge=lfs -text
*.ckpt filter=lfs diff=lfs merge=lfs -text *.ckpt filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD
>>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae
=======
>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d >>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d
======= =======
*.bz2 filter=lfs diff=lfs merge=lfs -text *.bz2 filter=lfs diff=lfs merge=lfs -text
*.ckpt filter=lfs diff=lfs merge=lfs -text *.ckpt filter=lfs diff=lfs merge=lfs -text
>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f >>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40
*.ftz filter=lfs diff=lfs merge=lfs -text *.ftz filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text *.gz filter=lfs diff=lfs merge=lfs -text
*.h5 filter=lfs diff=lfs merge=lfs -text *.h5 filter=lfs diff=lfs merge=lfs -text
@ -32,15 +39,22 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40
*.model filter=lfs diff=lfs merge=lfs -text *.model filter=lfs diff=lfs merge=lfs -text
*.msgpack filter=lfs diff=lfs merge=lfs -text *.msgpack filter=lfs diff=lfs merge=lfs -text
======= =======
======= =======
>>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849 >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
======= =======
<<<<<<< HEAD
>>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae
=======
>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d >>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d
======= =======
>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f >>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40
*.mlmodel filter=lfs diff=lfs merge=lfs -text *.mlmodel filter=lfs diff=lfs merge=lfs -text
*.model filter=lfs diff=lfs merge=lfs -text *.model filter=lfs diff=lfs merge=lfs -text
*.msgpack filter=lfs diff=lfs merge=lfs -text *.msgpack filter=lfs diff=lfs merge=lfs -text
@ -49,13 +63,20 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40
>>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352 >>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352
======= =======
>>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849 >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
======= =======
<<<<<<< HEAD
>>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae
=======
>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d >>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d
======= =======
>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f >>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40
*.onnx filter=lfs diff=lfs merge=lfs -text *.onnx filter=lfs diff=lfs merge=lfs -text
*.ot filter=lfs diff=lfs merge=lfs -text *.ot filter=lfs diff=lfs merge=lfs -text
*.parquet filter=lfs diff=lfs merge=lfs -text *.parquet filter=lfs diff=lfs merge=lfs -text
@ -64,6 +85,9 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40
*.pt filter=lfs diff=lfs merge=lfs -text *.pt filter=lfs diff=lfs merge=lfs -text
*.pth filter=lfs diff=lfs merge=lfs -text *.pth filter=lfs diff=lfs merge=lfs -text
*.rar filter=lfs diff=lfs merge=lfs -text *.rar filter=lfs diff=lfs merge=lfs -text
@ -102,9 +126,13 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text
======= =======
>>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849 >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
======= =======
<<<<<<< HEAD
>>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae
=======
>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d >>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d
======= =======
>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f >>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40
*.pickle filter=lfs diff=lfs merge=lfs -text *.pickle filter=lfs diff=lfs merge=lfs -text
*.pkl filter=lfs diff=lfs merge=lfs -text *.pkl filter=lfs diff=lfs merge=lfs -text
*.pt filter=lfs diff=lfs merge=lfs -text *.pt filter=lfs diff=lfs merge=lfs -text
@ -124,6 +152,9 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
>>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352 >>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352
======= =======
@ -131,7 +162,11 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
>>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849 >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
======= =======
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD
>>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae
=======
>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d >>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d
======= =======
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f >>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f
>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40

View File

@ -945,17 +945,6 @@ class DeepseekOCRForCausalLM(DeepseekV2ForCausalLM):
use_cache = True use_cache = True
) )
if '<image>' in conversation[0]['content'] and eval_mode:
outputs = tokenizer.decode(output_ids[0, input_ids.unsqueeze(0).cuda().shape[1]:])
stop_str = '<end▁of▁sentence>'
if outputs.endswith(stop_str):
outputs = outputs[:-len(stop_str)]
# re_match
outputs = outputs.strip()
return outputs
if '<image>' in conversation[0]['content'] and test_compress: if '<image>' in conversation[0]['content'] and test_compress:
outputs = tokenizer.decode(output_ids[0, input_ids.unsqueeze(0).cuda().shape[1]:]) outputs = tokenizer.decode(output_ids[0, input_ids.unsqueeze(0).cuda().shape[1]:])
pure_texts_outputs_token_length = len(text_encode(tokenizer, outputs, bos=False, eos=False)) pure_texts_outputs_token_length = len(text_encode(tokenizer, outputs, bos=False, eos=False))
@ -1035,3 +1024,13 @@ class DeepseekOCRForCausalLM(DeepseekV2ForCausalLM):
plt.close() plt.close()
result.save(f"{output_path}/result_with_boxes.jpg") result.save(f"{output_path}/result_with_boxes.jpg")
if '<image>' in conversation[0]['content'] and eval_mode:
outputs = tokenizer.decode(output_ids[0, input_ids.unsqueeze(0).cuda().shape[1]:])
stop_str = '<end▁of▁sentence>'
if outputs.endswith(stop_str):
outputs = outputs[:-len(stop_str)]
# re_match
outputs = outputs.strip()
return outputs