96008235c70ebd1fed4f65cb17b0e99046f99396,ilastik/workflows/carving/opPreprocessing.py,OpSimpleBlockwiseWatershed,execute,#OpSimpleBlockwiseWatershed#Any#Any#Any#Any#,170

Before Change

        result_view = result[0,...,0]
        with Timer() as watershedTimer:
            if self.Input.meta.getTaggedShape()["z"] > 1:
                sys.stdout.write("Blockwise Watershed 3D..."); sys.stdout.flush()

                if not self.DoAgglo.value:
                    result_view[...] = vigra.analysis.watersheds(volume_feat[...])[0].astype(numpy.int32)

                else:
                    result_view[...] = watershed_and_agglomerate(
                        volume_feat,
                        max_workers=Request.global_thread_pool.num_workers,
                        size_regularizer=self.SizeRegularizer.value,
                        reduce_to=self.ReduceTo.value)
                logger.info( "done {}".format(numpy.max(result[...]) ) )
            else:
                if not self.DoAgglo.value:
                    result_view[...] = vigra.analysis.watersheds(volume_feat[:,:,0])[0].astype(numpy.int32)
                else:
                    sys.stdout.write("Blockwise Watershed..."); sys.stdout.flush()
                    labelVolume = watershed_and_agglomerate(
                        volume_feat[:, :, 0],
                        max_workers=Request.global_thread_pool.num_workers,
                        size_regularizer=self.SizeRegularizer.value,

After Change

                else:
                    result_view[...], max_id = vigra.analysis.watersheds(volume_feat[:,:,0])

            logger.info( "done {}".format(max_id) )

        logger.info( "Blockwise Watershed took {} seconds".format( watershedTimer.seconds() ) )
        return result

Instances