Skip to content

Commit d5a9da3

Browse files
committed
Update
1 parent 5ed1135 commit d5a9da3

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

Images/8.png

33.1 KB
Loading

particleanalyzer/core/CustomDetectron2Model.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
from sahi.models.detectron2 import Detectron2DetectionModel
2-
from detectron2.config import get_cfg
3-
import os
42

53
"""Переопределяем load_model для скрытия ошибки"""
64
class CustomDetectron2Model(Detectron2DetectionModel):
75
def load_model(self):
86
from detectron2.config import get_cfg
97
from detectron2.data import MetadataCatalog
108
from detectron2.engine import DefaultPredictor
11-
from detectron2.model_zoo import model_zoo
12-
9+
1310
cfg = get_cfg()
1411

1512
try: # Переделываем импорт конфига и модели для скрытия ошибки "{} not available in Model Zoo!"

particleanalyzer/core/ParticleAnalyzer.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from tqdm import tqdm
1010
from typing import Optional, Tuple, List, Dict, Any, Union
1111
from scipy.spatial.distance import pdist
12-
1312
try:
1413
from detectron2.engine import DefaultPredictor
1514
from particleanalyzer.core.CustomDetectron2Model import CustomDetectron2Model
@@ -136,7 +135,6 @@ def analyze_image(self, image: np.ndarray, image2: Optional[np.ndarray],
136135

137136
# Выбор стратегии обработки
138137
processor = self._select_processor(model_change, sahi_mode)
139-
140138
output_image, particle_data, annotations = processor(image,
141139
scale_input, confidence_threshold,
142140
scale_selector, confidence_iou,

0 commit comments

Comments
 (0)