From c54e82ba23b4972730cd688423a133ad731e5885 Mon Sep 17 00:00:00 2001 From: tuanlv Date: Mon, 26 Feb 2024 12:39:22 +0700 Subject: [PATCH 1/3] Integrate fast-deploy for sdsv_dewarp --- cope2n-ai-fi/Dockerfile | 4 +++- docker-compose-dev.yml | 18 +++++++++--------- document-classification-kv-demo | 1 - 3 files changed, 12 insertions(+), 11 deletions(-) delete mode 160000 document-classification-kv-demo diff --git a/cope2n-ai-fi/Dockerfile b/cope2n-ai-fi/Dockerfile index 2a1f54d..8968edf 100755 --- a/cope2n-ai-fi/Dockerfile +++ b/cope2n-ai-fi/Dockerfile @@ -15,7 +15,9 @@ RUN pip install mmcv==1.6.0 -f https://download.openmmlab.com/mmcv/dst/cu116/tor RUN ln -s /opt/conda/lib/python3.10/site-packages/torch/lib/libcudnn.so.8 /usr/lib/libcudnn.so && \ ln -s /opt/conda/lib/libcublas.so /usr/lib/libcublas.so -RUN python -m pip install paddlepaddle-gpu==2.4.2.post116 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html --no-cache-dir +# RUN python -m pip install paddlepaddle-gpu==2.4.2.post116 -f https://www.paddlepaddle.org.cn/whl/linux/mkl/avx/stable.html --no-cache-dir +RUN pip install fastdeploy-gpu-python==1.0.7 -f https://www.paddlepaddle.org.cn/whl/fastdeploy.html --no-cache-dir + RUN python -m pip install 'git+https://github.com/facebookresearch/detectron2.git' --no-cache-dir diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index f6d8386..fcd7ffc 100755 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -73,11 +73,11 @@ services: - S3_BUCKET_NAME=${S3_BUCKET_NAME} restart: always ports: - - 9000:9000 + - 6000:9000 networks: - ctel-sbt volumes: - # - BE_media:${MEDIA_ROOT} + - BE_media:${MEDIA_ROOT} - BE_static:/app/static - ./cope2n-api:/app working_dir: /app @@ -101,8 +101,8 @@ services: volumes: - ./data/minio_data:/data ports: - - 9884:9884 - - 9885:9885 + - 6884:9884 + - 6885:9885 networks: - ctel-sbt restart: always @@ -170,12 +170,12 @@ services: rabbitmq-sbt: condition: service_started volumes: - # - BE_media:${MEDIA_ROOT} + - BE_media:${MEDIA_ROOT} - ./cope2n-api:/app working_dir: /app - # command: sh -c "celery -A fwd_api.celery_worker.worker worker -l INFO -c 5" - command: bash -c "tail -f > /dev/null" + command: sh -c "celery -A fwd_api.celery_worker.worker worker -l INFO -c 5" + # command: bash -c "tail -f > /dev/null" # Back-end persistent db-sbt: @@ -191,7 +191,7 @@ services: - POSTGRES_PASSWORD=${DB_PASSWORD} - POSTGRES_DB=${DB_SCHEMA} ports: - - 5432:5432 + - 54321:5432 rabbitmq-sbt: mem_reservation: 600m @@ -215,7 +215,7 @@ services: shm_size: 10gb privileged: true ports: - - 9881:80 + - 6881:80 depends_on: be-ctel-sbt: condition: service_started diff --git a/document-classification-kv-demo b/document-classification-kv-demo deleted file mode 160000 index 220954c..0000000 --- a/document-classification-kv-demo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 220954c5c6bfed15e93e26b2adacf28ff8b75baf From fcb304474a71d203edf26ec1be72f0a2c1b11efa Mon Sep 17 00:00:00 2001 From: tuanlv Date: Mon, 26 Feb 2024 12:48:59 +0700 Subject: [PATCH 2/3] Integrate fast-deploy for sdsv_dewarp --- cope2n-ai-fi/modules/sdsvkvu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cope2n-ai-fi/modules/sdsvkvu b/cope2n-ai-fi/modules/sdsvkvu index d01de31..e3fd6d4 160000 --- a/cope2n-ai-fi/modules/sdsvkvu +++ b/cope2n-ai-fi/modules/sdsvkvu @@ -1 +1 @@ -Subproject commit d01de312ab86db554ffa2f1b01396ef8d56b78ed +Subproject commit e3fd6d439ec1e44e0a0794e3ed4a723fe5dbda8f From 535a8597ac1a55f9f8356e01fadf9781bb31f0f9 Mon Sep 17 00:00:00 2001 From: tuanlv Date: Mon, 26 Feb 2024 13:02:37 +0700 Subject: [PATCH 3/3] Integrate fast-deploy for sdsv_dewarp --- cope2n-ai-fi/modules/sdsvkvu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cope2n-ai-fi/modules/sdsvkvu b/cope2n-ai-fi/modules/sdsvkvu index e3fd6d4..671d791 160000 --- a/cope2n-ai-fi/modules/sdsvkvu +++ b/cope2n-ai-fi/modules/sdsvkvu @@ -1 +1 @@ -Subproject commit e3fd6d439ec1e44e0a0794e3ed4a723fe5dbda8f +Subproject commit 671d7917c657ad185a06772e0b707b45fe59788a