From c1b5ba281f5c2aa0f79c02f5a27f8578c8de191c Mon Sep 17 00:00:00 2001 From: ZePan110 Date: Tue, 4 Mar 2025 16:10:20 +0800 Subject: [PATCH] Enable CodeGen,CodeTrans and DocSum model cache for docker compose test. (#1599) 1.Add cache path check 2.Enable CodeGen,CodeTrans and DocSum model cache for docker compose test. Signed-off-by: ZePan110 --- .github/workflows/_run-docker-compose.yml | 9 ++++++++- CodeGen/docker_compose/intel/cpu/xeon/compose.yaml | 2 +- CodeGen/docker_compose/intel/hpu/gaudi/compose.yaml | 2 +- CodeGen/tests/test_compose_on_gaudi.sh | 1 + CodeGen/tests/test_compose_on_xeon.sh | 1 + CodeTrans/docker_compose/intel/cpu/xeon/compose.yaml | 2 +- CodeTrans/docker_compose/intel/hpu/gaudi/compose.yaml | 2 +- CodeTrans/tests/test_compose_on_gaudi.sh | 1 + CodeTrans/tests/test_compose_on_xeon.sh | 1 + DocSum/docker_compose/intel/cpu/xeon/compose.yaml | 2 +- DocSum/tests/test_compose_on_gaudi.sh | 2 +- DocSum/tests/test_compose_on_xeon.sh | 1 + 12 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/_run-docker-compose.yml b/.github/workflows/_run-docker-compose.yml index 3d02b7b4a..f21c3202f 100644 --- a/.github/workflows/_run-docker-compose.yml +++ b/.github/workflows/_run-docker-compose.yml @@ -152,7 +152,14 @@ jobs: run: | cd ${{ github.workspace }}/$example/tests if [[ "$IMAGE_REPO" == "" ]]; then export IMAGE_REPO="${OPEA_IMAGE_REPO}opea"; fi - if [[ "$use_model_cache" == "true" ]]; then export model_cache="/data2/hf_model"; fi + if [[ "$use_model_cache" == "true" ]]; then + if [ -d "/data2/hf_model" ]; then + export model_cache="/data2/hf_model" + else + echo "Model cache directory /data2/hf_model does not exist" + export model_cache="~/.cache/huggingface/hub" + fi + fi if [ -f ${test_case} ]; then timeout 30m bash ${test_case}; else echo "Test script {${test_case}} not found, skip test!"; fi - name: Clean up container after test diff --git a/CodeGen/docker_compose/intel/cpu/xeon/compose.yaml b/CodeGen/docker_compose/intel/cpu/xeon/compose.yaml index 28940c9ba..f9e7e2628 100644 --- a/CodeGen/docker_compose/intel/cpu/xeon/compose.yaml +++ b/CodeGen/docker_compose/intel/cpu/xeon/compose.yaml @@ -8,7 +8,7 @@ services: ports: - "8028:80" volumes: - - "./data:/data" + - "${MODEL_CACHE}:/data" shm_size: 1g environment: no_proxy: ${no_proxy} diff --git a/CodeGen/docker_compose/intel/hpu/gaudi/compose.yaml b/CodeGen/docker_compose/intel/hpu/gaudi/compose.yaml index 4d5ed9568..62ec96e62 100644 --- a/CodeGen/docker_compose/intel/hpu/gaudi/compose.yaml +++ b/CodeGen/docker_compose/intel/hpu/gaudi/compose.yaml @@ -8,7 +8,7 @@ services: ports: - "8028:80" volumes: - - "./data:/data" + - "${MODEL_CACHE}:/data" environment: no_proxy: ${no_proxy} http_proxy: ${http_proxy} diff --git a/CodeGen/tests/test_compose_on_gaudi.sh b/CodeGen/tests/test_compose_on_gaudi.sh index 9ffbc4114..e6e6d1f03 100644 --- a/CodeGen/tests/test_compose_on_gaudi.sh +++ b/CodeGen/tests/test_compose_on_gaudi.sh @@ -9,6 +9,7 @@ echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" echo "TAG=IMAGE_TAG=${IMAGE_TAG}" export REGISTRY=${IMAGE_REPO} export TAG=${IMAGE_TAG} +export MODEL_CACHE=${model_cache:-"./data"} WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" diff --git a/CodeGen/tests/test_compose_on_xeon.sh b/CodeGen/tests/test_compose_on_xeon.sh index f323e7207..70e5ba9c4 100644 --- a/CodeGen/tests/test_compose_on_xeon.sh +++ b/CodeGen/tests/test_compose_on_xeon.sh @@ -9,6 +9,7 @@ echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" echo "TAG=IMAGE_TAG=${IMAGE_TAG}" export REGISTRY=${IMAGE_REPO} export TAG=${IMAGE_TAG} +export MODEL_CACHE=${model_cache:-"./data"} WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" diff --git a/CodeTrans/docker_compose/intel/cpu/xeon/compose.yaml b/CodeTrans/docker_compose/intel/cpu/xeon/compose.yaml index b818956fa..0ece6dff1 100644 --- a/CodeTrans/docker_compose/intel/cpu/xeon/compose.yaml +++ b/CodeTrans/docker_compose/intel/cpu/xeon/compose.yaml @@ -8,7 +8,7 @@ services: ports: - "8008:80" volumes: - - "./data:/data" + - "${MODEL_CACHE}:/data" shm_size: 1g environment: no_proxy: ${no_proxy} diff --git a/CodeTrans/docker_compose/intel/hpu/gaudi/compose.yaml b/CodeTrans/docker_compose/intel/hpu/gaudi/compose.yaml index cbccde060..3e25dee89 100644 --- a/CodeTrans/docker_compose/intel/hpu/gaudi/compose.yaml +++ b/CodeTrans/docker_compose/intel/hpu/gaudi/compose.yaml @@ -8,7 +8,7 @@ services: ports: - "8008:80" volumes: - - "./data:/data" + - "${MODEL_CACHE}:/data" environment: no_proxy: ${no_proxy} http_proxy: ${http_proxy} diff --git a/CodeTrans/tests/test_compose_on_gaudi.sh b/CodeTrans/tests/test_compose_on_gaudi.sh index 377937435..e2aedcd6e 100644 --- a/CodeTrans/tests/test_compose_on_gaudi.sh +++ b/CodeTrans/tests/test_compose_on_gaudi.sh @@ -9,6 +9,7 @@ echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" echo "TAG=IMAGE_TAG=${IMAGE_TAG}" export REGISTRY=${IMAGE_REPO} export TAG=${IMAGE_TAG} +export MODEL_CACHE=${model_cache:-"./data"} WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" diff --git a/CodeTrans/tests/test_compose_on_xeon.sh b/CodeTrans/tests/test_compose_on_xeon.sh index 9060eb283..efa09fe0a 100644 --- a/CodeTrans/tests/test_compose_on_xeon.sh +++ b/CodeTrans/tests/test_compose_on_xeon.sh @@ -9,6 +9,7 @@ echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" echo "TAG=IMAGE_TAG=${IMAGE_TAG}" export REGISTRY=${IMAGE_REPO} export TAG=${IMAGE_TAG} +export MODEL_CACHE=${model_cache:-"./data"} WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" diff --git a/DocSum/docker_compose/intel/cpu/xeon/compose.yaml b/DocSum/docker_compose/intel/cpu/xeon/compose.yaml index 2c4344cc2..0d87eaeb2 100644 --- a/DocSum/docker_compose/intel/cpu/xeon/compose.yaml +++ b/DocSum/docker_compose/intel/cpu/xeon/compose.yaml @@ -21,7 +21,7 @@ services: timeout: 10s retries: 100 volumes: - - "./data:/data" + - "${MODEL_CACHE}:/data" shm_size: 1g command: --model-id ${LLM_MODEL_ID} --cuda-graphs 0 --max-input-length ${MAX_INPUT_TOKENS} --max-total-tokens ${MAX_TOTAL_TOKENS} diff --git a/DocSum/tests/test_compose_on_gaudi.sh b/DocSum/tests/test_compose_on_gaudi.sh index e129608aa..66dd5b318 100644 --- a/DocSum/tests/test_compose_on_gaudi.sh +++ b/DocSum/tests/test_compose_on_gaudi.sh @@ -28,7 +28,7 @@ export DOCSUM_PORT=9000 export LLM_ENDPOINT="http://${host_ip}:${LLM_ENDPOINT_PORT}" export DocSum_COMPONENT_NAME="OpeaDocSumTgi" export LOGFLAG=True -export DATA_PATH="/data/cache" +export DATA_PATH=${model_cache:-"/data/cache"} WORKPATH=$(dirname "$PWD") LOG_PATH="$WORKPATH/tests" diff --git a/DocSum/tests/test_compose_on_xeon.sh b/DocSum/tests/test_compose_on_xeon.sh index de208292a..7dc194ff6 100644 --- a/DocSum/tests/test_compose_on_xeon.sh +++ b/DocSum/tests/test_compose_on_xeon.sh @@ -12,6 +12,7 @@ export host_ip=$(hostname -I | awk '{print $1}') echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}" echo "TAG=IMAGE_TAG=${IMAGE_TAG}" +export MODEL_CACHE=${model_cache:-"./data"} export REGISTRY=${IMAGE_REPO} export TAG=${IMAGE_TAG} export MAX_INPUT_TOKENS=2048