Fix/clean latex delimiters #4942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

vivienfanghuagood wants to merge 181 commits into PaddlePaddle:release/3.3 from vivienfanghuagood:fix/clean-latex-delimiters

.github/workflows/xpu_ci.yml

-Original file line number
+Diff line change
@@ -0,0 +1,75 @@
+    name: CI_XPU
+    on:
+      pull_request:
+        branches:
+          - develop
+        paths-ignore:
+          - '**.md'
+          - '**.txt'
+      workflow_dispatch:
+    concurrency:
+      group: ${{ github.event.pull_request.number }}-xpu-ci
+      cancel-in-progress: true
+    jobs:
+      CI_XPU:
+        timeout-minutes: 60
+        runs-on: [self-hosted, XPU-P800-2Card]
+        steps:
+          - name: Print current runner name
+            run: |
+              echo "Current runner name: ${{ runner.name }}"
+          # Because the system version is lower than 2.23, the checkout cannot be used.
+          # - name: Checkout code
+          #   uses: actions/checkout@v4
+          - name: Code Checkout
+            env:
+              docker_image: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/fastdeploy-xpu:2.3.0
+            run: |
+              REPO="https://github.com/${{ github.repository }}.git"
+              FULL_REPO="${{ github.repository }}"
+              REPO_NAME="${FULL_REPO##*/}"
+              BASE_BRANCH="${{ github.base_ref }}"
+              # Clean the repository directory before starting
+              docker run --rm --net=host -v $(pwd):/workspace -w /workspace \
+              -e "REPO_NAME=${REPO_NAME}" \
+              -e "BASE_BRANCH=${BASE_BRANCH}" \
+              ${docker_image} /bin/bash -c '
+                if [ -d ${REPO_NAME} ]; then
+                  echo "Directory ${REPO_NAME} exists, removing it..."
+                  rm -rf ${REPO_NAME}
+                fi
+              '
+              git config --global user.name "PaddleCI"
+              git config --global user.email "paddle_ci@example.com"
+              git clone ${REPO} ${REPO_NAME} -b ${BASE_BRANCH}
+              cd PaddleX
+              if [ "${{ github.event_name }}" = "pull_request" ]; then
+                git fetch origin pull/${{ github.event.pull_request.number }}/head:pr/${{ github.event.pull_request.number }}
+                git merge pr/${{ github.event.pull_request.number }}
+                git log -n 3 --oneline
+              else
+                git checkout ${{ github.sha }}
+                git log -n 3 --oneline
+              fi
+          - name: Run CI unittest
+            env:
+              docker_image: ccr-2vdh3abv-pub.cnc.bj.baidubce.com/paddlepaddle/fastdeploy-xpu:2.3.0
+            run: |
+              runner_name="${{ runner.name }}"
+              PARENT_DIR=$(dirname "$WORKSPACE")
+              echo "PARENT_DIR:$PARENT_DIR"
+              docker run --rm --net=host --cap-add=SYS_PTRACE --privileged --shm-size=64G  \
+              -v $(pwd):/workspace -w /workspace \
+              -e "http_proxy=$(git config --global --get http.proxy)" \
+              -e "https_proxy=$(git config --global --get https.proxy)" \
+              -e "no_proxy=bcebos.com,mirrors.tuna.tsinghua.edu.cn,127.0.0.1,localhost" \
+               ${docker_image} /bin/bash -c "
+              git config --global --add safe.directory /workspace/PaddleX
+              cd PaddleX
+              bash tests/run_xpu_ci.sh
+              "

.precommit/check_imports.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -49,6 +49,7 @@ @@
         "GPUtil": "GPUtil",
         "huggingface_hub": "huggingface-hub",
         "imagesize": "imagesize",
+        "jieba": "jieba",
         "jinja2": "Jinja2",
         "joblib": "joblib",
         "langchain": "langchain",
@@ Expand All / @@ -60,6 +61,7 @@ @@
         "modelscope": "modelscope",
         "numpy": "numpy",
         "openai": "openai",
+        "opencc": "OpenCC",
         "cv2": "opencv-contrib-python",
         "openpyxl": "openpyxl",
         "packaging": "packaging",
@@ Expand All / @@ -73,11 +75,13 @@ @@
         "pycocotools": "pycocotools",
         "pydantic": "pydantic",
         "pypdfium2": "pypdfium2",
+        "pypinyin": "pypinyin",
         "yaml": "PyYAML",
         "regex": "regex",
         "requests": "requests",
         "ruamel.yaml": "ruamel.yaml",
         "safetensors": "safetensors",
+        "scipy": "scipy",
         "skimage": "scikit-image",
         "sklearn": "scikit-learn",
         "sentencepiece": "sentencepiece",
@@ Expand Down Expand Up / @@ -120,6 +124,7 @@ @@
         "paddle_custom_device",
         "ultra_infer",
         "fastdeploy",
+        "onnxruntime",
     }
@@ Expand Down @@

api_examples/pipelines/test_pp_structure_v3.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
         use_doc_orientation_classify=False,
         use_doc_unwarping=False,
         use_common_ocr=True,
-        use_seal_recognition=True,
+        use_seal_recognition=False,
         use_table_recognition=True,
     )
@@ Expand Down @@

api_examples/pipelines/test_text_to_speech.py

-Original file line number
+Diff line change
@@ -0,0 +1,27 @@
+    # Copyright (c) 2025 PaddlePaddle Authors. All Rights Reserved.
+    #
+    # Licensed under the Apache License, Version 2.0 (the "License");
+    # you may not use this file except in compliance with the License.
+    # You may obtain a copy of the License at
+    #
+    #    http://www.apache.org/licenses/LICENSE-2.0
+    #
+    # Unless required by applicable law or agreed to in writing, software
+    # distributed under the License is distributed on an "AS IS" BASIS,
+    # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    # See the License for the specific language governing permissions and
+    # limitations under the License.
+    from paddlex import create_pipeline
+    pipeline = create_pipeline(pipeline="text_to_speech")
+    output = pipeline.predict(
+        "根据您的情况，建议低盐饮食配合轻度活动，已为您推荐了健康的食谱"
+    )
+    for res in output:
+        print(res)
+        res.print()
+        res.save_to_audio("./output/test.wav")
+        res.save_to_json("./output")

deploy/genai_vllm_server_docker/Dockerfile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,14 +8,17 @@ ENV PIP_NO_CACHE_DIR=0
  
    ENV PYTHONUNBUFFERED=1

    ENV PYTHONDONTWRITEBYTECODE=1

    RUN python -m pip install torch==2.8.0

    ARG PADDLEX_VERSION=">=3.3.6,<3.4"

    RUN python -m pip install "paddlex${PADDLEX_VERSION}"

    ARG BUILD_FOR_SM120=false

    RUN if [ "${BUILD_FOR_SM120}" = 'true' ]; then \

            python -m pip install https://github.com/mjun0812/flash-attention-prebuild-wheels/releases/download/v0.3.14/flash_attn-2.8.3+cu128torch2.8-cp310-cp310-linux_x86_64.whl \

            python -m pip install https://github.com/mjun0812/flash-attention-prebuild-wheels/releases/download/v0.4.11/flash_attn-2.8.3%2Bcu128torch2.8-cp310-cp310-linux_x86_64.whl; \

        else \

            python -m pip install https://github.com/mjun0812/flash-attention-prebuild-wheels/releases/download/v0.3.14/flash_attn-2.8.2+cu128torch2.8-cp310-cp310-linux_x86_64.whl \

            python -m pip install https://github.com/mjun0812/flash-attention-prebuild-wheels/releases/download/v0.3.14/flash_attn-2.8.2+cu128torch2.8-cp310-cp310-linux_x86_64.whl; \

        fi \

        && paddlex --install genai-vllm-server

    EXPOSE 8080

deploy/genai_vllm_server_docker/build.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -21,8 +21,8 @@ while [[ $# -gt 0 ]]; do
  
                shift

                ;;

            *)

                echo "Unknown option: $1"

                exit 1

                echo "Unknown option: $1" >&2

                exit 2

                ;;

        esac

    done

deploy/hps/sdk/common/server.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,8 +14,12 @@ rm -rf "${MODEL_REPO_DIR}" @@
     cp -r model_repo "${MODEL_REPO_DIR}"
     find "${MODEL_REPO_DIR}" -mindepth 1 -maxdepth 1 -type d -print0 | while IFS= read -r -d '' dir_; do
-        if [ -f "${dir_}/config_${PADDLEX_HPS_DEVICE_TYPE}.pbtxt" ]; then
-            cp -f "${dir_}/config_${PADDLEX_HPS_DEVICE_TYPE}.pbtxt" "${dir_}/config.pbtxt"
+        if [ ! -f "${dir_}/config.pbtxt" ]; then
+            if [ "${PADDLEX_HPS_DEVICE_TYPE:-gpu}" = 'gpu' ]; then
+                cp -f "${dir_}/config_gpu.pbtxt" "${dir_}/config.pbtxt"
+            else
+                cp -f "${dir_}/config_cpu.pbtxt" "${dir_}/config.pbtxt"
+            fi
         fi
     done
@@ Expand Down @@

deploy/hps/sdk/pipelines/3d_bev_detection/version.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		0.1.1

deploy/hps/sdk/pipelines/OCR/server/model_repo/ocr/1/model.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ @@
     from paddlex_hps_server import (
         BaseTritonPythonModel,
         app_common,
+        logging,
         protocol,
         schemas,
         utils,
@@ Expand Down Expand Up / @@ -167,10 +168,13 @@ def run_batch(self, inputs, log_ids, batch_id): @@
         def _group_inputs(self, inputs):
             def _to_hashable(obj):
-                if isinstance(obj, list):
-                    return tuple(obj)
-                elif isinstance(obj, dict):
-                    return tuple(sorted(obj.items()))
+                if isinstance(obj, dict):
+                    return tuple(
+                        (_to_hashable(k), _to_hashable(v))
+                        for k, v in sorted(obj.items(), key=lambda x: repr(x[0]))
+                    )
+                elif isinstance(obj, list):
+                    return tuple(_to_hashable(x) for x in obj)
                 else:
                     return obj
@@ Expand Down Expand Up / @@ -231,12 +235,20 @@ def _preprocess(self, input, log_id): @@
                 else self.app_config.visualize
             )
-            file_bytes = utils.get_raw_bytes(input.file)
-            images, data_info = utils.file_to_images(
-                file_bytes,
-                file_type,
-                max_num_imgs=self.context["max_num_input_imgs"],
-            )
+            try:
+                file_bytes = utils.get_raw_bytes(input.file)
+                images, data_info = utils.file_to_images(
+                    file_bytes,
+                    file_type,
+                    max_num_imgs=self.context["max_num_input_imgs"],
+                )
+            except Exception as e:
+                logging.error("Failed to get input file bytes: %s", e)
+                return protocol.create_aistudio_output_without_result(
+,
+                    "Input file is invalid",
+                    log_id=log_id,
+                )
             return images, data_info, visualize_enabled
@@ Expand Down @@

deploy/hps/sdk/pipelines/OCR/version.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		0.2.5

deploy/hps/sdk/pipelines/PP-ChatOCRv3-doc/version.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		0.3.2

deploy/hps/sdk/pipelines/PP-ChatOCRv4-doc/version.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		0.4.2

deploy/hps/sdk/pipelines/PP-DocTranslation/version.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		0.1.2

deploy/hps/sdk/pipelines/PP-ShiTuV2/version.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		0.1.1

deploy/hps/sdk/pipelines/PP-StructureV3/server/model_repo/layout-parsing/1/model.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ @@
     from paddlex_hps_server import (
         BaseTritonPythonModel,
         app_common,
+        logging,
         protocol,
         schemas,
         utils,
@@ Expand Down Expand Up / @@ -163,6 +164,7 @@ def run_batch(self, inputs, log_ids, batch_id): @@
                                 use_e2e_wireless_table_rec_model=inputs_g[
                                 ].useE2eWirelessTableRecModel,
+                                markdown_ignore_labels=inputs_g[0].markdownIgnoreLabels,
                             )
                         )
@@ Expand Down Expand Up / @@ -199,10 +201,13 @@ def run_batch(self, inputs, log_ids, batch_id): @@
         def _group_inputs(self, inputs):
             def _to_hashable(obj):
-                if isinstance(obj, list):
-                    return tuple(obj)
-                elif isinstance(obj, dict):
-                    return tuple(sorted(obj.items()))
+                if isinstance(obj, dict):
+                    return tuple(
+                        (_to_hashable(k), _to_hashable(v))
+                        for k, v in sorted(obj.items(), key=lambda x: repr(x[0]))
+                    )
+                elif isinstance(obj, list):
+                    return tuple(_to_hashable(x) for x in obj)
                 else:
                     return obj
@@ Expand Down Expand Up / @@ -243,6 +248,7 @@ def _hash(input): @@
                                 input.useOcrResultsWithTableCells,
                                 input.useE2eWiredTableRecModel,
                                 input.useE2eWirelessTableRecModel,
+                                input.markdownIgnoreLabels,
                             ),
                         )
                     )
@@ Expand Down Expand Up / @@ -284,20 +290,32 @@ def _preprocess(self, input, log_id): @@
                 else self.app_config.visualize
             )
-            file_bytes = utils.get_raw_bytes(input.file)
-            images, data_info = utils.file_to_images(
-                file_bytes,
-                file_type,
-                max_num_imgs=self.context["max_num_input_imgs"],
-            )
+            try:
+                file_bytes = utils.get_raw_bytes(input.file)
+                images, data_info = utils.file_to_images(
+                    file_bytes,
+                    file_type,
+                    max_num_imgs=self.context["max_num_input_imgs"],
+                )
+            except Exception as e:
+                logging.error("Failed to get input file bytes: %s", e)
+                return protocol.create_aistudio_output_without_result(
+,
+                    "Input file is invalid",
+                    log_id=log_id,
+                )
             return images, data_info, visualize_enabled
         def _postprocess(self, images, data_info, visualize_enabled, preds, log_id, input):
             layout_parsing_results: List[Dict[str, Any]] = []
             for i, (img, item) in enumerate(zip(images, preds)):
                 pruned_res = app_common.prune_result(item.json["res"])
-                md_data = item.markdown
+                # XXX
+                md_data = item._to_markdown(
+                    pretty=input.prettifyMarkdown,
+                    show_formula_number=input.showFormulaNumber,
+                )
                 md_text = md_data["markdown_texts"]
                 md_imgs = app_common.postprocess_images(
                     md_data["markdown_images"],
@@ Expand Down @@

deploy/hps/sdk/pipelines/PP-StructureV3/server/pipeline_config.yaml

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,15 @@ use_chart_recognition: False @@
     use_region_detection: True
     format_block_content: False
+    markdown_ignore_labels:
+      - number
+      - footnote
+      - header
+      - header_image
+      - footer
+      - footer_image
+      - aside_text
     SubModules:
       LayoutDetection:
         module_name: layout_detection
@@ Expand Down @@

deploy/hps/sdk/pipelines/PP-StructureV3/version.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		0.3.5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/clean latex delimiters #4942

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Fix/clean latex delimiters #4942

Are you sure you want to change the base?

Uh oh!

Fix/clean latex delimiters #4942

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!