From aca8b4aa039848944542386246420904a206428a Mon Sep 17 00:00:00 2001 From: allegroai Date: Wed, 12 Apr 2023 23:38:56 +0300 Subject: [PATCH] Upgrade to python 3.11 --- clearml_serving/engines/triton/Dockerfile | 6 ++--- .../engines/triton/requirements.txt | 2 +- clearml_serving/serving/Dockerfile | 2 +- clearml_serving/serving/requirements.txt | 22 +++++++++---------- clearml_serving/statistics/Dockerfile | 2 +- docker/docker-compose-triton-gpu.yml | 13 +++++++++++ docker/docker-compose-triton.yml | 13 +++++++++++ docker/docker-compose.yml | 12 +++++----- 8 files changed, 49 insertions(+), 23 deletions(-) diff --git a/clearml_serving/engines/triton/Dockerfile b/clearml_serving/engines/triton/Dockerfile index dd03cc2..4011838 100644 --- a/clearml_serving/engines/triton/Dockerfile +++ b/clearml_serving/engines/triton/Dockerfile @@ -1,17 +1,17 @@ -FROM nvcr.io/nvidia/tritonserver:22.04-py3 +FROM nvcr.io/nvidia/tritonserver:22.08-py3 ENV LC_ALL=C.UTF-8 # install base package -RUN pip3 install --no-cache-dir clearml-serving +RUN python3 -m pip install --no-cache-dir -U pip clearml-serving # get latest execution code from the git repository # RUN cd $HOME && git clone https://github.com/allegroai/clearml-serving.git COPY clearml_serving /root/clearml/clearml_serving -RUN pip3 install --no-cache-dir -r /root/clearml/clearml_serving/engines/triton/requirements.txt +RUN python3 -m pip install --no-cache-dir -r /root/clearml/clearml_serving/engines/triton/requirements.txt # default serving port EXPOSE 8001 diff --git a/clearml_serving/engines/triton/requirements.txt b/clearml_serving/engines/triton/requirements.txt index 284d834..82ed161 100644 --- a/clearml_serving/engines/triton/requirements.txt +++ b/clearml_serving/engines/triton/requirements.txt @@ -1,6 +1,6 @@ clearml >= 1.3.1 clearml-serving -tritonclient[grpc]>=2.25,<2.26 +tritonclient[grpc]>=2.32,<2.33 starlette grpcio Pillow>=9.0.1,<10 diff --git a/clearml_serving/serving/Dockerfile b/clearml_serving/serving/Dockerfile index 198f2fc..bd817ea 100644 --- a/clearml_serving/serving/Dockerfile +++ b/clearml_serving/serving/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-bullseye +FROM python:3.11-bullseye ENV LC_ALL=C.UTF-8 diff --git a/clearml_serving/serving/requirements.txt b/clearml_serving/serving/requirements.txt index 4335e83..f15e056 100644 --- a/clearml_serving/serving/requirements.txt +++ b/clearml_serving/serving/requirements.txt @@ -1,19 +1,19 @@ -clearml>=1.3.1 +clearml>=1.10.1,<2 attrs>=20.3.0,<21 -fastapi[all]>=0.75.0,<0.76 +fastapi[all]>=0.95.0,<0.96 uvicorn[standard] gunicorn>=20.1.0,<20.2 -asyncio>=3.4.3,<3.5 -aiocache>=0.11.1,<0.12 -tritonclient[grpc]>=2.25,<2.26 +asyncio>=3.4.3,<3.5 ; python_version < '3.10' +aiocache>=0.12,<0.13 +tritonclient[grpc]>=2.32,<2.33 starlette -numpy>=1.20,<1.24 -scikit-learn>=1.0.2,<1.1 -pandas>=1.0.5,<1.5 +numpy>=1.24,<1.25 +scikit-learn>=1.2.2,<1.3 +pandas>=1.5.3,<1.6 grpcio Pillow>=9.0.1,<10 -xgboost>=1.5.2,<1.6 +xgboost>=1.7.5,<1.8 lightgbm>=3.3.2,<3.4 -requests>=2.25.1,<2.26 +requests>=2.28.2,<2.29 kafka-python>=2.0.2,<2.1 -lz4>=4.0.0,<5 \ No newline at end of file +lz4>=4.0.0,<5 diff --git a/clearml_serving/statistics/Dockerfile b/clearml_serving/statistics/Dockerfile index 4b430bc..a55ccc2 100644 --- a/clearml_serving/statistics/Dockerfile +++ b/clearml_serving/statistics/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-bullseye +FROM python:3.11-bullseye ENV LC_ALL=C.UTF-8 diff --git a/docker/docker-compose-triton-gpu.yml b/docker/docker-compose-triton-gpu.yml index 74bc460..8e54073 100644 --- a/docker/docker-compose-triton-gpu.yml +++ b/docker/docker-compose-triton-gpu.yml @@ -98,6 +98,12 @@ services: CLEARML_USE_GUNICORN: ${CLEARML_USE_GUNICORN:-} CLEARML_SERVING_NUM_PROCESS: ${CLEARML_SERVING_NUM_PROCESS:-} CLEARML_EXTRA_PYTHON_PACKAGES: ${CLEARML_EXTRA_PYTHON_PACKAGES:-} + AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-} + AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:-} + GOOGLE_APPLICATION_CREDENTIALS: ${GOOGLE_APPLICATION_CREDENTIALS:-} + AZURE_STORAGE_ACCOUNT: ${AZURE_STORAGE_ACCOUNT:-} + AZURE_STORAGE_KEY: ${AZURE_STORAGE_KEY:-} depends_on: - kafka - clearml-serving-triton @@ -122,6 +128,13 @@ services: CLEARML_SERVING_TASK_ID: ${CLEARML_SERVING_TASK_ID:-} CLEARML_TRITON_POLL_FREQ: ${CLEARML_TRITON_POLL_FREQ:-1.0} CLEARML_TRITON_METRIC_FREQ: ${CLEARML_TRITON_METRIC_FREQ:-1.0} + CLEARML_EXTRA_PYTHON_PACKAGES: ${CLEARML_EXTRA_PYTHON_PACKAGES:-} + AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-} + AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:-} + GOOGLE_APPLICATION_CREDENTIALS: ${GOOGLE_APPLICATION_CREDENTIALS:-} + AZURE_STORAGE_ACCOUNT: ${AZURE_STORAGE_ACCOUNT:-} + AZURE_STORAGE_KEY: ${AZURE_STORAGE_KEY:-} depends_on: - kafka networks: diff --git a/docker/docker-compose-triton.yml b/docker/docker-compose-triton.yml index fd97daf..b815583 100644 --- a/docker/docker-compose-triton.yml +++ b/docker/docker-compose-triton.yml @@ -98,6 +98,12 @@ services: CLEARML_USE_GUNICORN: ${CLEARML_USE_GUNICORN:-} CLEARML_SERVING_NUM_PROCESS: ${CLEARML_SERVING_NUM_PROCESS:-} CLEARML_EXTRA_PYTHON_PACKAGES: ${CLEARML_EXTRA_PYTHON_PACKAGES:-} + AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-} + AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:-} + GOOGLE_APPLICATION_CREDENTIALS: ${GOOGLE_APPLICATION_CREDENTIALS:-} + AZURE_STORAGE_ACCOUNT: ${AZURE_STORAGE_ACCOUNT:-} + AZURE_STORAGE_KEY: ${AZURE_STORAGE_KEY:-} depends_on: - kafka - clearml-serving-triton @@ -122,6 +128,13 @@ services: CLEARML_SERVING_TASK_ID: ${CLEARML_SERVING_TASK_ID:-} CLEARML_TRITON_POLL_FREQ: ${CLEARML_TRITON_POLL_FREQ:-1.0} CLEARML_TRITON_METRIC_FREQ: ${CLEARML_TRITON_METRIC_FREQ:-1.0} + CLEARML_EXTRA_PYTHON_PACKAGES: ${CLEARML_EXTRA_PYTHON_PACKAGES:-} + AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-} + AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:-} + GOOGLE_APPLICATION_CREDENTIALS: ${GOOGLE_APPLICATION_CREDENTIALS:-} + AZURE_STORAGE_ACCOUNT: ${AZURE_STORAGE_ACCOUNT:-} + AZURE_STORAGE_KEY: ${AZURE_STORAGE_KEY:-} depends_on: - kafka networks: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e606643..24e3b95 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -98,12 +98,12 @@ services: CLEARML_USE_GUNICORN: ${CLEARML_USE_GUNICORN:-} CLEARML_SERVING_NUM_PROCESS: ${CLEARML_SERVING_NUM_PROCESS:-} CLEARML_EXTRA_PYTHON_PACKAGES: ${CLEARML_EXTRA_PYTHON_PACKAGES:-} - AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID} - AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} - AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION} - GOOGLE_APPLICATION_CREDENTIALS: ${GOOGLE_APPLICATION_CREDENTIALS} - AZURE_STORAGE_ACCOUNT: ${AZURE_STORAGE_ACCOUNT} - AZURE_STORAGE_KEY: ${AZURE_STORAGE_KEY} + AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID:-} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY:-} + AWS_DEFAULT_REGION: ${AWS_DEFAULT_REGION:-} + GOOGLE_APPLICATION_CREDENTIALS: ${GOOGLE_APPLICATION_CREDENTIALS:-} + AZURE_STORAGE_ACCOUNT: ${AZURE_STORAGE_ACCOUNT:-} + AZURE_STORAGE_KEY: ${AZURE_STORAGE_KEY:-} depends_on: - kafka networks: