Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: patho-sam
channels:
- conda-forge
dependencies:
- micro_sam
- micro_sam >=1.8.1
# Note: installing the pytorch package from conda-forge will generally
# give you the most optmized version for your system, if you have a modern
# enough OS and CUDA version (CUDA >= 12). For older versions, you can
Expand Down
2 changes: 1 addition & 1 deletion experiments/benchmarking/cellvit/eval_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import numpy as np
import pandas as pd
import imageio.v3 as imageio
from skimage.measure import label
from bioimage_cpp.segmentation import label

from elf.evaluation import mean_segmentation_accuracy

Expand Down
2 changes: 1 addition & 1 deletion experiments/benchmarking/hovernet/eval_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import numpy as np
import pandas as pd
import imageio.v3 as imageio
from skimage.measure import label
from bioimage_cpp.segmentation import label

from elf.evaluation import mean_segmentation_accuracy

Expand Down
2 changes: 1 addition & 1 deletion experiments/benchmarking/hovernext/evaluate_ais_hover.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import numpy as np
import pandas as pd
import imageio.v3 as imageio
from skimage.measure import label
from bioimage_cpp.segmentation import label

from elf.evaluation import mean_segmentation_accuracy

Expand Down
2 changes: 1 addition & 1 deletion experiments/benchmarking/instanseg/instanseg_inference.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import numpy as np
import pandas as pd
import imageio.v3 as imageio
from skimage.measure import label
from bioimage_cpp.segmentation import label

from tukra.io import read_image
from tukra.inference import segment_using_instanseg
Expand Down
2 changes: 1 addition & 1 deletion experiments/benchmarking/outdated/cellvitplusplus/eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import numpy as np
import pandas as pd
import imageio.v3 as imageio
from skimage.measure import label
from bioimage_cpp.segmentation import label

from elf.evaluation import mean_segmentation_accuracy

Expand Down
2 changes: 1 addition & 1 deletion experiments/benchmarking/stardist/stardist_inference.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import numpy as np
import pandas as pd
import imageio.v3 as imageio
from skimage.measure import label
from bioimage_cpp.segmentation import label

from tukra.io import read_image
from tukra.inference import segment_using_stardist
Expand Down
2 changes: 1 addition & 1 deletion experiments/patho-sam/per_image_eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import numpy as np
import pandas as pd
import imageio.v3 as imageio
from skimage.measure import label
from bioimage_cpp.segmentation import label

from elf.evaluation import mean_segmentation_accuracy

Expand Down
12 changes: 6 additions & 6 deletions patho_sam/semantic_segmentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np
from numpy.typing import ArrayLike

from nifty.tools import blocking
from bioimage_cpp.utils import Blocking

import torch

Expand Down Expand Up @@ -238,7 +238,7 @@ def initialize(
self._predictor, image, image_embeddings, tile_shape, halo,
verbose=verbose, batch_size=batch_size, mask=mask, i=i,
)
tiling = blocking([0, 0], original_size, tile_shape)
tiling = Blocking([0, 0], original_size, tile_shape)

if semantic_segmentation is None:
semantic_segmentation = np.zeros(original_size, dtype="uint8")
Expand All @@ -250,7 +250,7 @@ def initialize(

msg = "Initialize tiled semantic segmentation with decoder"
if tiles_in_mask is None:
n_tiles = tiling.numberOfBlocks
n_tiles = tiling.number_of_blocks
all_tile_ids = list(range(n_tiles))
else:
n_tiles = len(tiles_in_mask)
Expand Down Expand Up @@ -282,11 +282,11 @@ def initialize(
output = np.argmax(output, axis=0)

# Set the predictions in the output for this tile.
block = tiling.getBlockWithHalo(tile_id, halo=list(halo))
block = tiling.get_block_with_halo(tile_id, halo=list(halo))
local_bb = tuple(
slice(beg, end) for beg, end in zip(block.innerBlockLocal.begin, block.innerBlockLocal.end)
slice(beg, end) for beg, end in zip(block.inner_block_local.begin, block.inner_block_local.end)
)
inner_bb = tuple(slice(beg, end) for beg, end in zip(block.innerBlock.begin, block.innerBlock.end))
inner_bb = tuple(slice(beg, end) for beg, end in zip(block.inner_block.begin, block.inner_block.end))
semantic_segmentation[inner_bb] = output[local_bb]
pbar_update(1)

Expand Down
2 changes: 1 addition & 1 deletion scripts/test_pannuke.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import h5py
import numpy as np
import imageio.v3 as imageio
from skimage.segmentation import relabel_sequential
from bioimage_cpp.segmentation import relabel_sequential

from torch_em.data.datasets.histopathology import pannuke, monuseg

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
url='https://github.com/computational-cell-analytics/patho-sam',
packages=find_packages(include=['patho_sam', 'patho_sam.*']),
license="MIT",
install_requires=["micro_sam>=1.8.1"],
entry_points={
"console_scripts": [
"patho_sam.example_data=patho_sam.util:get_example_wsi_data",
Expand Down
Loading