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
supervisely-ecosystem · Jul 4, 2023 · 5e2a5b7 · 5e2a5b7
1 parent d10abe2
commit 5e2a5b7
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 27 deletions.
diff --git 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 → dev_requirements.txt b/requirements.txt → 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
@@ -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
@@ -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
@@ -1,27 +1,50 @@
-<sly-card class="mt15"
-          title="2. Training classes"
-          subtitle="Select classes, that should be used for training. Training supports only classes of shape
-                        Rectangle, other shapes are transformed to it automatically.">
+<sly-card
+  class="mt15"
+  title="2. Training classes"
+  subtitle="Select classes, that should be used for training. Training supports only classes of shape Rectangle, other shapes are transformed to it automatically."
+>
+  <sly-el-table-selection-container
+    :data="data.classes"
+    :selected="state.selectedClasses"
+    identity-field="title"
+  >
     <el-table
-            class="ultra-table"
-            :data="data.classes"
-            style="width: 100%"
-            max-height="500"
-            @selection-change="
+      ref="sly-el-table-with-selection"
+      class="ultra-table"
+      :data="data.classes"
+      style="width: 100%"
+      max-height="500"
+      @selection-change="
                 (val) => {
                     state.selectedClasses = val.map(x => x.title);
                 }
                 "
     >
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="Name" prop="title" sortable>
-            <template scope="scope">
-                <i class="zmdi zmdi-circle mr5" :style="{color: scope.row.color}"></i>
-                {{ scope.row.title }}
-            </template>
-        </el-table-column>
-        <el-table-column prop="shape" label="Shape" sortable width="180"></el-table-column>
-        <el-table-column prop="imagesCount" label="Images count" sortable width="150"></el-table-column>
-        <el-table-column prop="objectsCount" label="Objects count" sortable width="180"></el-table-column>
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column label="Name" prop="title" sortable>
+        <template scope="scope">
+          <i class="zmdi zmdi-circle mr5" :style="{color: scope.row.color}"></i>
+          {{ scope.row.title }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="shape"
+        label="Shape"
+        sortable
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="imagesCount"
+        label="Images count"
+        sortable
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="objectsCount"
+        label="Objects count"
+        sortable
+        width="180"
+      ></el-table-column>
     </el-table>
-</sly-card>
+  </sly-el-table-selection-container>
+</sly-card>