supervisely 6.73.279__py3-none-any.whl → 6.73.280__py3-none-any.whl

supervisely/nn/training/gui/gui.py

@@ -64,6 +64,7 @@ class TrainGUI:
         self.hyperparameters = hyperparameters
         self.app_options = app_options
         self.collapsable = app_options.get("collapsable", False)
+        self.need_convert_shapes_for_bm = False
 
         self.team_id = sly_env.team_id(raise_not_found=False)
         self.workspace_id = sly_env.workspace_id(raise_not_found=False)
@@ -141,24 +142,33 @@ class TrainGUI:
             self.training_process.set_experiment_name(experiment_name)
 
         def need_convert_class_shapes() -> bool:
-            task_type = self.model_selector.get_selected_task_type()
-
-            def _need_convert(shape):
-                if task_type == TaskType.OBJECT_DETECTION:
-                    return shape != Rectangle.geometry_name()
-                elif task_type in [TaskType.INSTANCE_SEGMENTATION, TaskType.SEMANTIC_SEGMENTATION]:
-                    return shape == Polygon.geometry_name()
-                return
-
-            data = self.classes_selector.classes_table._table_data
-            selected_classes = set(self.classes_selector.classes_table.get_selected_classes())
-            empty = set(r[0]["data"] for r in data if r[2]["data"] == 0 and r[3]["data"] == 0)
-            need_convert = set(r[0]["data"] for r in data if _need_convert(r[1]["data"]))
-
-            if need_convert.intersection(selected_classes - empty):
-                self.hyperparameters_selector.model_benchmark_auto_convert_warning.show()
-            else:
+            if not self.hyperparameters_selector.run_model_benchmark_checkbox.is_checked():
                 self.hyperparameters_selector.model_benchmark_auto_convert_warning.hide()
+                self.need_convert_shapes_for_bm = False
+            else:
+                task_type = self.model_selector.get_selected_task_type()
+
+                def _need_convert(shape):
+                    if task_type == TaskType.OBJECT_DETECTION:
+                        return shape != Rectangle.geometry_name()
+                    elif task_type in [
+                        TaskType.INSTANCE_SEGMENTATION,
+                        TaskType.SEMANTIC_SEGMENTATION,
+                    ]:
+                        return shape == Polygon.geometry_name()
+                    return
+
+                data = self.classes_selector.classes_table._table_data
+                selected_classes = set(self.classes_selector.classes_table.get_selected_classes())
+                empty = set(r[0]["data"] for r in data if r[2]["data"] == 0 and r[3]["data"] == 0)
+                need_convert = set(r[0]["data"] for r in data if _need_convert(r[1]["data"]))
+
+                if need_convert.intersection(selected_classes - empty):
+                    self.hyperparameters_selector.model_benchmark_auto_convert_warning.show()
+                    self.need_convert_shapes_for_bm = True
+                else:
+                    self.hyperparameters_selector.model_benchmark_auto_convert_warning.hide()
+                    self.need_convert_shapes_for_bm = False
 
         # ------------------------------------------------- #
 

supervisely/nn/training/train_app.py

@@ -482,7 +482,6 @@ class TrainApp:
         downloading project and model data.
         """
         logger.info("Preparing for training")
-        self.gui.disable_select_buttons()
 
         # Step 1. Workflow Input
         if is_production():
@@ -503,40 +502,40 @@ class TrainApp:
         :type experiment_info: dict
         """
         logger.info("Finalizing training")
+        # Step 1. Validate experiment TaskType
+        experiment_info = self._validate_experiment_task_type(experiment_info)
 
-        # Step 1. Validate experiment_info
+        # Step 2. Validate experiment_info
         success, reason = self._validate_experiment_info(experiment_info)
         if not success:
             raise ValueError(f"{reason}. Failed to upload artifacts")
 
-        # Step 2. Preprocess artifacts
+        # Step 3. Preprocess artifacts
         experiment_info = self._preprocess_artifacts(experiment_info)
 
-        # Step3. Postprocess splits
+        # Step 4. Postprocess splits
         train_splits_data = self._postprocess_splits()
 
-        # Step 3. Upload artifacts
+        # Step 5. Upload artifacts
         self._set_text_status("uploading")
         remote_dir, file_info = self._upload_artifacts()
 
-        # Step 4. Run Model Benchmark
+        # Step 6. Create model meta according to model CV task type
         model_meta = self.create_model_meta(experiment_info["task_type"])
-        mb_eval_lnk_file_info, mb_eval_report, mb_eval_report_id, eval_metrics = (
-            None,
-            None,
-            None,
-            {},
-        )
+
+        # Step 7. [Optional] Run Model Benchmark
+        mb_eval_lnk_file_info, mb_eval_report = None, None
+        mb_eval_report_id, eval_metrics = None, {}
         if self.is_model_benchmark_enabled:
             try:
                 # Convert GT project
+                gt_project_id, bm_splits_data = None, train_splits_data
                 if self._app_options.get("auto_convert_classes", True):
-                    self._set_text_status("convert_gt_project")
-                    gt_project_id, bm_splits_data = self._convert_and_split_gt_project(
-                        experiment_info["task_type"]
-                    )
-                else:
-                    gt_project_id, bm_splits_data = None, train_splits_data
+                    if self.gui.need_convert_shapes_for_bm:
+                        self._set_text_status("convert_gt_project")
+                        gt_project_id, bm_splits_data = self._convert_and_split_gt_project(
+                            experiment_info["task_type"]
+                        )
 
                 self._set_text_status("benchmark")
                 (
@@ -555,7 +554,7 @@ class TrainApp:
             except Exception as e:
                 logger.error(f"Model benchmark failed: {e}")
 
-        # Step 5. [Optional] Convert weights
+        # Step 8. [Optional] Convert weights
         export_weights = {}
         if self.gui.hyperparameters_selector.is_export_required():
             try:
@@ -564,7 +563,7 @@ class TrainApp:
             except Exception as e:
                 logger.error(f"Export weights failed: {e}")
 
-        # Step 6. Generate and upload additional files
+        # Step 9. Generate and upload additional files
         self._set_text_status("metadata")
         self._generate_experiment_info(
             remote_dir, experiment_info, eval_metrics, mb_eval_report_id, export_weights
@@ -575,12 +574,12 @@ class TrainApp:
         self._generate_model_meta(remote_dir, model_meta)
         self._upload_demo_files(remote_dir)
 
-        # Step 7. Set output widgets
+        # Step 10. Set output widgets
         self._set_text_status("reset")
         self._set_training_output(remote_dir, file_info, mb_eval_report)
         self._set_ws_progress_status("completed")
 
-        # Step 8. Workflow output
+        # Step 11. Workflow output
         if is_production():
             self._workflow_output(remote_dir, file_info, mb_eval_lnk_file_info, mb_eval_report_id)
 
@@ -1120,6 +1119,24 @@ class TrainApp:
     # ----------------------------------------- #
 
     # Postprocess
+    def _validate_experiment_task_type(self, experiment_info: dict) -> dict:
+        """
+        Checks if the task_type key if returned from the user's training function.
+        If not, it will be set to the task type of the model selected in the model selector.
+
+        :param experiment_info: Information about the experiment results.
+        :type experiment_info: dict
+        :return: Experiment info with task_type key.
+        :rtype: dict
+        """
+        task_type = experiment_info.get("task_type", None)
+        if task_type is None:
+            logger.debug(
+                "Task type not found in experiment_info. Task type from model config will be used."
+            )
+            task_type = self.gui.model_selector.get_selected_task_type()
+            experiment_info["task_type"] = task_type
+        return experiment_info
 
     def _validate_experiment_info(self, experiment_info: dict) -> tuple:
         """
@@ -2218,6 +2235,7 @@ class TrainApp:
         Wrapper function to wrap the training process.
         """
         experiment_info = None
+        check_logs_text = "Please check the logs for more details."
 
         try:
             self._set_train_widgets_state_on_start()
@@ -2226,7 +2244,7 @@ class TrainApp:
             self._prepare_working_dir()
             self._init_logger()
         except Exception as e:
-            message = "Error occurred during training initialization. Please check the logs for more details."
+            message = f"Error occurred during training initialization. {check_logs_text}"
             self._show_error(message, e)
             self._restore_train_widgets_state_on_error()
             self._set_ws_progress_status("reset")
@@ -2237,9 +2255,7 @@ class TrainApp:
             self._set_ws_progress_status("preparing")
             self._prepare()
         except Exception as e:
-            message = (
-                "Error occurred during data preparation. Please check the logs for more details."
-            )
+            message = f"Error occurred during data preparation. {check_logs_text}"
             self._show_error(message, e)
             self._restore_train_widgets_state_on_error()
             self._set_ws_progress_status("reset")
@@ -2250,8 +2266,18 @@ class TrainApp:
             if self._app_options.get("train_logger", None) is None:
                 self._set_ws_progress_status("training")
             experiment_info = self._train_func()
+        except ZeroDivisionError as e:
+            message = (
+                "'ZeroDivisionError' occurred during training. "
+                "The error was caused by an insufficient dataset size relative to the specified batch size in hyperparameters. "
+                "Please check input data and hyperparameters."
+            )
+            self._show_error(message, e)
+            self._restore_train_widgets_state_on_error()
+            self._set_ws_progress_status("reset")
+            return
         except Exception as e:
-            message = "Error occurred during training. Please check the logs for more details."
+            message = f"Error occurred during training. {check_logs_text}"
             self._show_error(message, e)
             self._restore_train_widgets_state_on_error()
             self._set_ws_progress_status("reset")
@@ -2263,7 +2289,7 @@ class TrainApp:
             self._finalize(experiment_info)
             self.gui.training_process.start_button.loading = False
         except Exception as e:
-            message = "Error occurred during finalizing and uploading training artifacts . Please check the logs for more details."
+            message = f"Error occurred during finalizing and uploading training artifacts. {check_logs_text}"
             self._show_error(message, e)
             self._restore_train_widgets_state_on_error()
             self._set_ws_progress_status("reset")
@@ -2280,6 +2306,7 @@ class TrainApp:
         self._restore_train_widgets_state_on_error()
 
     def _set_train_widgets_state_on_start(self):
+        self.gui.disable_select_buttons()
         self.gui.training_artifacts.validator_text.hide()
         self._validate_experiment_name()
         self.gui.training_process.experiment_name_input.disable()
@@ -2305,6 +2332,7 @@ class TrainApp:
         if self._app_options.get("device_selector", False):
             self.gui.training_process.select_device._select.enable()
             self.gui.training_process.select_device.enable()
+        self.gui.enable_select_buttons()
 
     def _validate_experiment_name(self) -> bool:
         experiment_name = self.gui.training_process.get_experiment_name()
@@ -2475,7 +2503,7 @@ class TrainApp:
             change_name_if_conflict=True,
         )
 
-        # 3. Upload gt project to benchmark workspace
+        # 3. Upload converted gt project
         project = Project("tmp_project", OpenMode.READ)
         self._api.project.update_meta(gt_project_info.id, project.meta)
         for dataset in project.datasets:
@@ -2491,6 +2519,7 @@ class TrainApp:
                 img_infos = self._api.image.copy_batch(ds_info.id, img_ids)
                 img_ids = [img_info.id for img_info in img_infos]
                 self._api.annotation.upload_anns(img_ids, anns)
+        sly_fs.remove_dir(project.directory)
 
         # 4. Match splits with original project
         gt_split_data = self._postprocess_splits(gt_project_info.id)

{supervisely-6.73.279.dist-info → supervisely-6.73.280.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.279
+Version: 6.73.280
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely

{supervisely-6.73.279.dist-info → supervisely-6.73.280.dist-info}/RECORD

@@ -968,10 +968,10 @@ supervisely/nn/tracker/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 supervisely/nn/tracker/utils/gmc.py,sha256=3JX8979H3NA-YHNaRQyj9Z-xb9qtyMittPEjGw8y2Jo,11557
 supervisely/nn/tracker/utils/kalman_filter.py,sha256=eSFmCjM0mikHCAFvj-KCVzw-0Jxpoc3Cfc2NWEjJC1Q,17268
 supervisely/nn/training/__init__.py,sha256=gY4PCykJ-42MWKsqb9kl-skemKa8yB6t_fb5kzqR66U,111
-supervisely/nn/training/train_app.py,sha256=mxoD8sgSuIc3B-LcieP9m1lEaUawuOuLeceRqDU6l6U,100168
+supervisely/nn/training/train_app.py,sha256=PZ4zWMYRvOFj97vy2rOofCBYqnpkDtmouzFTjs9UyN4,101747
 supervisely/nn/training/gui/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 supervisely/nn/training/gui/classes_selector.py,sha256=8UgzA4aogOAr1s42smwEcDbgaBj_i0JLhjwlZ9bFdIA,3772
-supervisely/nn/training/gui/gui.py,sha256=uXpNWU6q741PimYGZ5aFWpr0boewa0yDrpIz8JGcqXE,25004
+supervisely/nn/training/gui/gui.py,sha256=CnT_QhihrxdSHKybpI0pXhPLwCaXEana_qdn0DhXByg,25558
 supervisely/nn/training/gui/hyperparameters_selector.py,sha256=UAXZYyhuUOY7d2ZKAx4R5Kz-KQaiFZ7AnY8BDoj3_30,7071
 supervisely/nn/training/gui/input_selector.py,sha256=Jp9PnVVADv1fhndPuZdMlKuzWTOBQZogrOks5dwATlc,2179
 supervisely/nn/training/gui/model_selector.py,sha256=n2Xn6as60bNPtSlImJtyrVEo0gjKnvHLT3yq_m39TXk,4334
@@ -1070,9 +1070,9 @@ supervisely/worker_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 supervisely/worker_proto/worker_api_pb2.py,sha256=VQfi5JRBHs2pFCK1snec3JECgGnua3Xjqw_-b3aFxuM,59142
 supervisely/worker_proto/worker_api_pb2_grpc.py,sha256=3BwQXOaP9qpdi0Dt9EKG--Lm8KGN0C5AgmUfRv77_Jk,28940
 supervisely_lib/__init__.py,sha256=7-3QnN8Zf0wj8NCr2oJmqoQWMKKPKTECvjH9pd2S5vY,159
-supervisely-6.73.279.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.279.dist-info/METADATA,sha256=LtI71cTqLVkLsxFnPgUIWaWidSe5J_2h2Pt7DzEVWXA,33573
-supervisely-6.73.279.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.279.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.279.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.279.dist-info/RECORD,,
+supervisely-6.73.280.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.280.dist-info/METADATA,sha256=xY-ujb2oWVk6XMCZER18NgoGnfZYef8Lt6UAzVtDvkI,33573
+supervisely-6.73.280.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.280.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.280.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.280.dist-info/RECORD,,