diff --git a/svlt-core/src/svlt/conf/testing.py b/svlt-core/src/svlt/conf/testing.py index da11763dcf2042970e0bf6b1e62af50cfd27d1dd..6e0e7cf8c938fd7b3578abb8aa674e5e52cbd488 100644 --- a/svlt-core/src/svlt/conf/testing.py +++ b/svlt-core/src/svlt/conf/testing.py @@ -250,12 +250,3 @@ class DummyInstanceMaskSegmentationModel(InstanceMaskSegmentationModel): return img.__class__( (mask.data / mask.data.max()).astype('uint16') ) - - def label_instance_class( - self, img: GenericImageDataAccessor, mask: GenericImageDataAccessor, **kwargs - ) -> GenericImageDataAccessor: - """ - Returns a trivial segmentation, i.e. the input mask with value 1 - """ - super(DummyInstanceMaskSegmentationModel, self).label_instance_class(img, mask, **kwargs) - return self.infer(img, mask) diff --git a/svlt-core/src/svlt/models.py b/svlt-core/src/svlt/models.py index 657091791c101af34cf234d391bac15c5814a927..d229503e98e4a11d4bd55b8f4db83c5fe96e69a7 100644 --- a/svlt-core/src/svlt/models.py +++ b/svlt-core/src/svlt/models.py @@ -119,7 +119,6 @@ class InstanceMaskSegmentationModel(ImageToImageModel): def infer(self, img: GenericImageDataAccessor, mask: GenericImageDataAccessor, **kwargs) -> GenericImageDataAccessor: pass - @abstractmethod def label_instance_class( self, img: GenericImageDataAccessor, mask: GenericImageDataAccessor, **kwargs ) -> GenericImageDataAccessor: diff --git a/svlt-ilastik/src/svlt/ilastik/models.py b/svlt-ilastik/src/svlt/ilastik/models.py index 54b959240292f0a7d66fb49947fd1a86ebf279f7..afbfd25de8fbc0e43bc608440d56edcb1fc55d84 100644 --- a/svlt-ilastik/src/svlt/ilastik/models.py +++ b/svlt-ilastik/src/svlt/ilastik/models.py @@ -252,10 +252,6 @@ class IlastikObjectClassifierFromMaskSegmentationModel(IlastikModel, InstanceMas ) return InMemoryDataAccessor(data=yxcz) - def label_instance_class(self, img: GenericImageDataAccessor, mask: GenericImageDataAccessor, **kwargs): - super(IlastikObjectClassifierFromMaskSegmentationModel, self).label_instance_class(img, mask, **kwargs) - return self.infer(img, mask) - class IlastikObjectClassifierFromPixelPredictionsModel(IlastikModel, ImageToImageModel): diff --git a/svlt-pheno/src/svlt/rois/models.py b/svlt-pheno/src/svlt/rois/models.py index 50ac29adbd8317eb1f20674ced865798f63a3ab5..14b6d1db44426332a08b55ab7a63b20c17ebc33c 100644 --- a/svlt-pheno/src/svlt/rois/models.py +++ b/svlt-pheno/src/svlt/rois/models.py @@ -56,12 +56,6 @@ class IntensityThresholdInstanceMaskSegmentationModel(InstanceMaskSegmentationMo return InMemoryDataAccessor(om) - def label_instance_class( - self, img: GenericImageDataAccessor, mask: GenericImageDataAccessor, **kwargs - ) -> GenericImageDataAccessor: - super().label_instance_class(img, mask, **kwargs) - return self.infer(img, mask) - class Error(Exception): pass