fixed comment

cvat-ai · Mar 26, 2020 · e74f9cc · e74f9cc
1 parent a1abc39
commit e74f9cc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/cvat-core/webpack.config.js b/cvat-core/webpack.config.js
@@ -52,7 +52,27 @@ const webConfig = {
                     sourceType: 'unambiguous',
                 },
             },
-        }],
+        }, {
+            test: /3rdparty\/.*\.worker\.js$/,
+            use: {
+                loader: 'worker-loader',
+                options: {
+                    publicPath: '/static/engine/js/3rdparty/',
+                    name: '[name].js',
+                },
+            },
+        }, {
+            test: /\.worker\.js$/,
+            exclude: /3rdparty/,
+            use: {
+                loader: 'worker-loader',
+                options: {
+                    publicPath: '/static/engine/js/',
+                    name: '[name].js',
+                },
+            },
+        },
+        ],
     },
 };
 

diff --git a/cvat/apps/engine/task.py b/cvat/apps/engine/task.py
@@ -258,16 +258,7 @@ def update_progress(progress):
         if isinstance(compressed_chunk_writer, ZipCompressedChunkWriter):
             w, h = extractor.get_image_size()
             area = h * w
-            if area <= 1920 * 1080:
-                db_data.chunk_size = 36
-            elif area <= 2560 * 1440:
-                db_data.chunk_size = 18
-            elif area <= 3840 * 2160:
-                db_data.chunk_size = 9
-            elif area <= 5120 * 2880:
-                db_data.chunk_size = 4
-            else:
-                db_data.chunk_size = 2
+            db_data.chunk_size = max(2, min(72, 36 * 1920 * 1080 // area))
         else:
             db_data.chunk_size = 36
 

diff --git a/datumaro/datumaro/util/tf_util.py b/datumaro/datumaro/util/tf_util.py
@@ -38,4 +38,4 @@ def import_tf():
     except AttributeError:
         pass
 
-    return tf
+    return tf