Support devices other than gpu and cpu (#4814)

Author: Bobholamovic

deploy/hps/sdk/common/server.sh

@@ -14,8 +14,10 @@ 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 [ "${PADDLEX_HPS_DEVICE_TYPE}" = 'gpu' ]; then
+        cp -f "${dir_}/config_gpu.pbtxt" "${dir_}/config.pbtxt"
+    else
+        cp -f "${dir_}/config_cpu.pbtxt" "${dir_}/config.pbtxt"
     fi
 done
 

deploy/hps/sdk/versions.json

@@ -1,37 +1,37 @@
 {
-    "3d_bev_detection": "0.1.0",
-    "anomaly_detection": "0.1.0",
-    "doc_preprocessor": "0.2.0",
-    "doc_understanding": "0.1.1",
-    "face_recognition": "0.1.0",
-    "formula_recognition": "0.2.0",
-    "human_keypoint_detection": "0.1.0",
-    "image_classification": "0.1.0",
-    "image_multilabel_classification": "0.1.0",
-    "instance_segmentation": "0.1.0",
-    "layout_parsing": "0.3.0",
-    "PP-StructureV3": "0.3.3",
-    "multilingual_speech_recognition": "0.2.0",
-    "object_detection": "0.1.0",
-    "OCR": "0.2.3",
-    "open_vocabulary_detection": "0.1.0",
-    "open_vocabulary_segmentation": "0.1.0",
-    "pedestrian_attribute_recognition": "0.1.0",
-    "PP-ChatOCRv3-doc": "0.3.1",
-    "PP-ChatOCRv4-doc": "0.4.1",
-    "PP-DocTranslation": "0.1.1",
-    "PaddleOCR-VL": "0.1.2",
-    "PP-ShiTuV2": "0.1.0",
-    "rotated_object_detection": "0.1.0",
-    "seal_recognition": "0.2.1",
-    "semantic_segmentation": "0.1.0",
-    "small_object_detection": "0.1.0",
-    "table_recognition": "0.4.0",
-    "table_recognition_v2": "0.4.0",
-    "ts_anomaly_detection": "0.1.0",
-    "ts_classification": "0.1.0",
-    "ts_forecast": "0.1.0",
-    "vehicle_attribute_recognition": "0.1.0",
-    "video_classification": "0.2.0",
-    "video_detection": "0.2.0"
+    "3d_bev_detection": "0.1.1",
+    "anomaly_detection": "0.1.1",
+    "doc_preprocessor": "0.2.1",
+    "doc_understanding": "0.1.2",
+    "face_recognition": "0.1.1",
+    "formula_recognition": "0.2.1",
+    "human_keypoint_detection": "0.1.1",
+    "image_classification": "0.1.1",
+    "image_multilabel_classification": "0.1.1",
+    "instance_segmentation": "0.1.1",
+    "layout_parsing": "0.3.1",
+    "PP-StructureV3": "0.3.4",
+    "multilingual_speech_recognition": "0.2.1",
+    "object_detection": "0.1.1",
+    "OCR": "0.2.4",
+    "open_vocabulary_detection": "0.1.1",
+    "open_vocabulary_segmentation": "0.1.1",
+    "pedestrian_attribute_recognition": "0.1.1",
+    "PP-ChatOCRv3-doc": "0.3.2",
+    "PP-ChatOCRv4-doc": "0.4.2",
+    "PP-DocTranslation": "0.1.2",
+    "PaddleOCR-VL": "0.1.3",
+    "PP-ShiTuV2": "0.1.1",
+    "rotated_object_detection": "0.1.1",
+    "seal_recognition": "0.2.2",
+    "semantic_segmentation": "0.1.1",
+    "small_object_detection": "0.1.1",
+    "table_recognition": "0.4.1",
+    "table_recognition_v2": "0.4.1",
+    "ts_anomaly_detection": "0.1.1",
+    "ts_classification": "0.1.1",
+    "ts_forecast": "0.1.1",
+    "vehicle_attribute_recognition": "0.1.1",
+    "video_classification": "0.2.1",
+    "video_detection": "0.2.1"
 }

deploy/hps/server_env/paddlex-hps-server/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "paddlex-hps-server"
-version = "0.3.0"
+version = "0.3.1"
 # `paddlex` is not included here
 dependencies = [
     "colorlog >= 6.9",

deploy/hps/server_env/paddlex-hps-server/src/paddlex_hps_server/base_model.py

@@ -61,10 +61,14 @@ def initialize(self, args):
         logging.info("Output names: %s", self.output_names)
 
         if args["model_instance_kind"] == "GPU":
+            if env.DEVICE_TYPE != "gpu":
+                raise pb_utils.TritonModelException(
+                    f"Expected device type to be 'gpu', but got {repr(env.DEVICE_TYPE)}"
+                )
             self._device_type = "gpu"
             self._device_id = int(args["model_instance_device_id"])
         elif args["model_instance_kind"] == "CPU":
-            self._device_type = "cpu"
+            self._device_type = env.DEVICE_TYPE
             self._device_id = None
         else:
             raise pb_utils.TritonModelException(

deploy/hps/server_env/paddlex-hps-server/src/paddlex_hps_server/env.py

@@ -14,6 +14,7 @@
 
 import os
 
+DEVICE_TYPE = os.getenv("PADDLEX_HPS_DEVICE_TYPE", "cpu")
 PIPELINE_CONFIG_PATH = os.getenv("PADDLEX_HPS_PIPELINE_CONFIG_PATH", "")
 USE_HPIP = os.getenv("PADDLEX_HPS_USE_HPIP", "")