From 5e2a5b7a6a88cfc28e7e0b47e41295d1fce3c106 Mon Sep 17 00:00:00 2001 From: Pavel Bartsits <48913536+cxnt@users.noreply.github.com> Date: Tue, 4 Jul 2023 11:16:26 +0400 Subject: [PATCH] Optimize app launch, fix table widget, add gpu required key (#202) * fix el table * Update requirements.txt * Rename requirements.txt to dev_requirements.txt * Update Dockerfile * Create build_image.yml * Update config.json * Update config.json * Update config.json * Update config.json * add gpu required * add gpu required --- Dockerfile | 4 +- requirements.txt => dev_requirements.txt | 2 +- supervisely/serve/config.json | 4 +- supervisely/train/config.json | 4 +- supervisely/train/src/ui/classes.html | 63 ++++++++++++++++-------- 5 files changed, 50 insertions(+), 27 deletions(-) rename requirements.txt => dev_requirements.txt (96%) diff --git a/Dockerfile b/Dockerfile index 50df903b981b..6edbd916fd57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,10 +6,10 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt update && apt install -y zip htop screen libgl1-mesa-glx ffmpeg # Install python dependencies -COPY requirements.txt . +COPY dev_requirements.txt . RUN python -m pip install --upgrade pip RUN pip uninstall -y nvidia-tensorboard nvidia-tensorboard-plugin-dlprof -RUN pip install --no-cache -r requirements.txt coremltools onnx gsutil notebook +RUN pip install --no-cache -r dev_requirements.txt coremltools onnx gsutil notebook # Create working directory RUN mkdir -p /usr/src/app diff --git a/requirements.txt b/dev_requirements.txt similarity index 96% rename from requirements.txt rename to dev_requirements.txt index 2662d8b5addd..613494bc982c 100755 --- a/requirements.txt +++ b/dev_requirements.txt @@ -1,5 +1,5 @@ # pip install -r requirements.txt -supervisely==6.72.15 +supervisely==6.72.55 opencv-python-headless==4.5.5.62 opencv-python==4.5.5.62 diff --git a/supervisely/serve/config.json b/supervisely/serve/config.json index e78d728f002a..7ddb18c2a5b3 100644 --- a/supervisely/serve/config.json +++ b/supervisely/serve/config.json @@ -11,7 +11,7 @@ "serve" ], "description": "Deploy model as REST API service", - "docker_image": "supervisely/yolov5:1.0.1", + "docker_image": "supervisely/yolov5:1.0.2", "instance_version": "6.6.7", "entrypoint": "python -m uvicorn main:m.app --app-dir ./supervisely/serve/src --host 0.0.0.0 --port 8000 --ws websockets", "port": 8000, @@ -167,7 +167,7 @@ "icon": "https://i.imgur.com/2U6HufM.png", "icon_cover": true, "isolate": true, - "need_gpu": true, + "gpu": "required", "headless": true, "session_tags": [ "deployed_nn" diff --git a/supervisely/train/config.json b/supervisely/train/config.json index 27621f433bfc..ee0cd7db0ff6 100644 --- a/supervisely/train/config.json +++ b/supervisely/train/config.json @@ -10,12 +10,12 @@ "train" ], "description": "Dashboard to configure and monitor training", - "docker_image": "supervisely/yolov5:1.0.1", + "docker_image": "supervisely/yolov5:1.0.2", "instance_version": "6.4.57", "main_script": "supervisely/train/src/sly_train.py", "gui_template": "supervisely/train/src/gui.html", "task_location": "workspace_tasks", - "need_gpu": true, + "gpu": "required", "icon": "https://i.imgur.com/HZCM0QM.png", "icon_cover": true, "context_menu": { diff --git a/supervisely/train/src/ui/classes.html b/supervisely/train/src/ui/classes.html index 145d4df23632..9f06284c73d6 100644 --- a/supervisely/train/src/ui/classes.html +++ b/supervisely/train/src/ui/classes.html @@ -1,27 +1,50 @@ - + + - - - - - - - + + + + + + + - \ No newline at end of file + +