fix checkOption

周伟奇
Showing 4 changed files with 51 additions and 16 deletions
README.md
bin/conf.sh
bin/control.sh
bin/utils.sh
--- a/README.md
View file @c2013d8
+++ b/README.md
View file @c2013d8
@@ -89,13 +89,18 @@ bin/control.sh logs triton
 bin/control.sh logs backend
 ```
-## TODO
+## TODO 01
+- ~~backend logs~~
+- ~~backend sanic worker num可配置~~
 - 授权部分
- backend logs
- backend sanic worker num可配置
- 随机选择triton端口，该配置项无意义
 - 取消java，更新接口及文档，完善响应结果
+## TODO 02
+- 随机选择triton端口，该配置项无意义
+- 转onnx，体积缩小900M+
 - 参数校验
- 多余的包
+- 移除多余的包
+## TODO 03
 - ASGI & supervisor ? 
 - async ?
\ No newline at end of file
--- a/bin/conf.sh
View file @c2013d8
+++ b/bin/conf.sh
View file @c2013d8
@@ -22,7 +22,7 @@ TRITON_MODEL_DIR=${REPO_DIR}/models
 # triton相关
 TRITON_CONTAINER_NAME=tritonserver
 TRITON_IMAGE_NAME=tritonserver
-TRITON_IMAGE_TAG=1.0
+TRITON_IMAGE_TAG=latest
 TRITON_IMAGE=${TRITON_IMAGE_NAME}:${TRITON_IMAGE_TAG}
 TRITON_IMAGE_SAVE_NAME=tritonserver-tf2-pt.tar
 TRITON_IMAGE_SAVE_PATH=${DOCKER_IMAGE_DIR}/${TRITON_IMAGE_SAVE_NAME}
@@ -46,13 +46,13 @@ else
    exit 1
 fi
 # 这些配置依赖configs/settings.sh, 所以需要放在source之后
 # TRITON容器启动参数相关
 # -env
 TRITON_CONTAINER_ENVS=()
 TRITON_ENVS_OPTION=""
 if (( ${#TRITON_CONTAINER_ENVS[@]} > 0 )); then
-    checkEnvsOption ${TRITON_CONTAINER_ENVS[@]}
    TRITON_ENVS_OPTION="$(getOption "-env" ${TRITON_CONTAINER_ENVS[@]})"
 fi
 # -v
@@ -62,7 +62,6 @@ TRITON_CONTAINER_VOLUMES=(
 )
 TRITON_VOLUMES_OPTION=""
 if (( ${#TRITON_CONTAINER_VOLUMES[@]} > 0 )); then
-    checkVolumesOption ${TRITON_CONTAINER_VOLUMES[@]}
    TRITON_VOLUMES_OPTION="$(getOption "-v" ${TRITON_CONTAINER_VOLUMES[@]})"
 fi
 # -p
@@ -73,7 +72,6 @@ TRITON_CONTAINER_PORTS=(
 )
 TRITON_PORTS_OPTION=""
 if (( ${#TRITON_CONTAINER_PORTS[@]} > 0 )); then
-    checkPortUsedStatus ${TRITON_CONTAINER_PORTS[@]}
    TRITON_PORTS_OPTION="$(getOption "-p" ${TRITON_CONTAINER_PORTS[@]})"
 fi
 # --gpus
@@ -91,7 +89,6 @@ BACKEND_CONTAINER_ENVS=(
 )
 BACKEND_ENVS_OPTION=""
 if (( ${#BACKEND_CONTAINER_ENVS[@]} > 0 )); then
-    checkEnvsOption ${BACKEND_CONTAINER_ENVS[@]}
    BACKEND_ENVS_OPTION="$(getOption "-env" ${BACKEND_CONTAINER_ENVS[@]})"
 fi
 # -v 
@@ -102,7 +99,6 @@ BACKEND_CONTAINER_VOLUMES=(
 )
 BACKEND_VOLUMES_OPTION=""
 if (( ${#BACKEND_CONTAINER_VOLUMES[@]} > 0 )); then
-    checkVolumesOption ${BACKEND_CONTAINER_VOLUMES[@]}
    BACKEND_VOLUMES_OPTION="$(getOption "-v" ${BACKEND_CONTAINER_VOLUMES[@]})"
 fi
 # -p
@@ -111,8 +107,42 @@ BACKEND_CONTAINER_PORTS=(
 )
 BACKEND_PORTS_OPTION=""
 if (( ${#BACKEND_CONTAINER_PORTS[@]} > 0 )); then
-    checkPortUsedStatus ${BACKEND_CONTAINER_PORTS[@]}
    BACKEND_PORTS_OPTION="$(getOption "-p" ${BACKEND_CONTAINER_PORTS[@]})"
 fi
 # -env -v -p
 BACKEND_OPTIONS="${BACKEND_ENVS_OPTION} ${BACKEND_VOLUMES_OPTION} ${BACKEND_PORTS_OPTION}"
+function checkTritonOption() {
+    if (( ${#TRITON_CONTAINER_ENVS[@]} > 0 )); then
+        checkEnvsOption ${TRITON_CONTAINER_ENVS[@]}
+    fi
+    if (( ${#TRITON_CONTAINER_VOLUMES[@]} > 0 )); then
+        checkVolumesOption ${TRITON_CONTAINER_VOLUMES[@]}
+    fi
+    if (( ${#TRITON_CONTAINER_PORTS[@]} > 0 )); then
+        checkPortUsedStatus ${TRITON_CONTAINER_PORTS[@]}
+    fi
+}
+function checkBackendOption() {
+    if (( ${#BACKEND_CONTAINER_ENVS[@]} > 0 )); then
+        checkEnvsOption ${BACKEND_CONTAINER_ENVS[@]}
+    fi
+    if (( ${#BACKEND_CONTAINER_VOLUMES[@]} > 0 )); then
+        checkVolumesOption ${BACKEND_CONTAINER_VOLUMES[@]}
+    fi
+    if (( ${#BACKEND_CONTAINER_PORTS[@]} > 0 )); then
+        checkPortUsedStatus ${BACKEND_CONTAINER_PORTS[@]}
+    fi
+}
+function checkOption() {
+    case $1 in
+        triton) checkTritonOption ;;  
+        backend) checkBackendOption ;;  
+    esac
+}
--- a/bin/control.sh
View file @c2013d8
+++ b/bin/control.sh
View file @c2013d8
@@ -22,7 +22,7 @@ triton settings:
 END
    case "${1:-help}" in
-        start) _docker_func start "${TRITON_IMAGE}" "${TRITON_CONTAINER_NAME}" "${TRITON_OPTIONS}" "${TRITON_IMAGE_SAVE_PATH}" ;;
+        start) checkOption "triton" && _docker_func start "${TRITON_IMAGE}" "${TRITON_CONTAINER_NAME}" "${TRITON_OPTIONS}" "${TRITON_IMAGE_SAVE_PATH}" ;;
        stop) _docker_func stop "${TRITON_CONTAINER_NAME}" ;;
        restart) _docker_func restart "${TRITON_CONTAINER_NAME}" ;;
        rm) _docker_func rm "${TRITON_CONTAINER_NAME}" ;;
@@ -31,7 +31,7 @@ END
        dlogs) _docker_func logs "${TRITON_CONTAINER_NAME}" ;;
        logs) _docker_func logs "${TRITON_CONTAINER_NAME}" ;;
        is_running) _docker_func is_running "${TRITON_CONTAINER_NAME}" ;;
-        debug) _docker_func debug "${TRITON_IMAGE}" "${TRITON_CONTAINER_NAME}" "${TRITON_OPTIONS}" ;;
+        debug) checkOption "triton" && _docker_func debug "${TRITON_IMAGE}" "${TRITON_CONTAINER_NAME}" "${TRITON_OPTIONS}" ;;
        # 其他
        *)  _echo_help_message ;;
    esac  
@@ -48,7 +48,7 @@ backend settings:
 END
    case "${1:-help}" in
-        start) _docker_func start "${BACKEND_IMAGE}" "${BACKEND_CONTAINER_NAME}" "${BACKEND_OPTIONS}" "${BACKEND_IMAGE_SAVE_PATH}" ;;
+        start) checkOption "backend" && _docker_func start "${BACKEND_IMAGE}" "${BACKEND_CONTAINER_NAME}" "${BACKEND_OPTIONS}" "${BACKEND_IMAGE_SAVE_PATH}" ;;
        stop) _docker_func stop "${BACKEND_CONTAINER_NAME}" ;;
        restart) _docker_func restart "${BACKEND_CONTAINER_NAME}" ;;
        rm) _docker_func rm "${BACKEND_CONTAINER_NAME}" ;;
@@ -56,7 +56,7 @@ END
        top) _docker_func top "${BACKEND_CONTAINER_NAME}" ;;
        dlogs) _docker_func logs "${BACKEND_CONTAINER_NAME}" ;;
        is_running) _docker_func is_running "${BACKEND_CONTAINER_NAME}" ;;
-        debug) _docker_func debug "${BACKEND_IMAGE}" "${BACKEND_CONTAINER_NAME}" "${BACKEND_OPTIONS}" ;;
+        debug) checkOption "backend" && _docker_func debug "${BACKEND_IMAGE}" "${BACKEND_CONTAINER_NAME}" "${BACKEND_OPTIONS}" ;;
        # 其他
        *)  _echo_help_message ;;
    esac  
--- a/bin/utils.sh 100755 → 100644
View file @c2013d8
+++ b/bin/utils.sh 100755 → 100644
View file @c2013d8