Merge branch 'dev-label-instance-class' into 'master'

Unncessary @abstractmethod

See merge request !6

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)

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:

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):
 

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