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
4 changes: 2 additions & 2 deletions scripts/test_zarr_reading.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import glob
import time

import micro_dl.utils.aux_utils as aux_utils
import micro_dl.cli.preprocess_script as preprocess_script
import viscy.utils.aux_utils as aux_utils
import viscy.cli.preprocess_script as preprocess_script

def parse_args():
"""Parse command line arguments
Expand Down
4 changes: 2 additions & 2 deletions scripts/visualize_data_augmentation.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
sys.path.insert(0, "/home/shalin.mehta/code/microDL")

import microDL.micro_dl.training.training as training
import micro_dl.utils.aux_utils as aux_utils
import viscy.utils.aux_utils as aux_utils
import microDL.micro_dl.utils.cli_utils as torch_io_utils
import micro_dl.plotting.plot_utils as plot_utils
import viscy.plotting.plot_utils as plot_utils


def visualize_dataloading(
Expand Down
4 changes: 2 additions & 2 deletions tests/cli/inference_script_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from unittest.mock import patch
import yaml

import micro_dl.cli.inference_script as inference_script
import micro_dl.utils.aux_utils as aux_utils
import viscy.cli.inference_script as inference_script
import viscy.utils.aux_utils as aux_utils


class TestInferenceScript(unittest.TestCase):
Expand Down
6 changes: 3 additions & 3 deletions tests/cli/metrics_script_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from unittest.mock import patch
import yaml

import micro_dl.cli.metrics_script as metrics_script
import micro_dl.utils.aux_utils as aux_utils
import micro_dl.utils.normalize as normalize
import viscy.cli.metrics_script as metrics_script
import viscy.utils.aux_utils as aux_utils
import viscy.utils.normalize as normalize


class TestMetricsScript(unittest.TestCase):
Expand Down
6 changes: 3 additions & 3 deletions tests/cli/preprocess_script_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
from testfixtures import TempDirectory
import unittest

import micro_dl.cli.preprocess_script as pp
import micro_dl.utils.aux_utils as aux_utils
import micro_dl.utils.io_utils as io_utils
import viscy.cli.preprocess_script as pp
import viscy.utils.aux_utils as aux_utils
import viscy.utils.io_utils as io_utils


class TestPreprocessScript(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/evaluation/evaluation_metrics_tests.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import nose.tools
import numpy as np

import micro_dl.evaluation.evaluation_metrics as metrics
import viscy.evaluation.evaluation_metrics as metrics


im_shape = (35, 45, 25)
Expand Down
2 changes: 1 addition & 1 deletion tests/input/dataset_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from testfixtures import TempDirectory
import unittest

import micro_dl.input.transformations as transformations
import viscy.input.transformations as transformations


class TestBaseDataSet(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/input/dataset_with_mask_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from testfixtures import TempDirectory
import unittest

import micro_dl.input.dataset_with_mask as dataset_mask
import viscy.input.dataset_with_mask as dataset_mask


class TestDataSetWithMask(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/input/inference_dataset_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from testfixtures import TempDirectory
import unittest

import micro_dl.inference.inference_dataset as inference_dataset
import micro_dl.utils.aux_utils as aux_utils
import viscy.inference.inference_dataset as inference_dataset
import viscy.utils.aux_utils as aux_utils


class TestInferenceDataSet(unittest.TestCase):
Expand Down
6 changes: 3 additions & 3 deletions tests/networks/conv_blocks_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import numpy as np
import unittest

from micro_dl.networks import conv_blocks as conv_blocks
from micro_dl.utils.aux_utils import get_channel_axis
from micro_dl.utils.network_utils import get_keras_layer
from viscy.networks import conv_blocks as conv_blocks
from viscy.utils.aux_utils import get_channel_axis
from viscy.utils.network_utils import get_keras_layer


class TestConvBlocks(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/networks/image2D_to_vector_net_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np
import unittest

from micro_dl.networks import Image2DToVectorNet
from viscy.networks import Image2DToVectorNet


class TestImage2DToVectorNet(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/networks/image3D_to_vector_net_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import numpy as np
import unittest

from micro_dl.networks import Image3DToVectorNet
from viscy.networks import Image3DToVectorNet


class TestImage3DToVectorNet(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/networks/unet2D_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np
import unittest

from micro_dl.networks import UNet2D
from viscy.networks import UNet2D


class TestUNet2D(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/networks/unet3D_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import numpy as np
from keras import Model

from micro_dl.networks import UNet3D
from viscy.networks import UNet3D


class TestUNet3D(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/networks/unet_stack_2D_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import numpy as np
import unittest

from micro_dl.networks import UNetStackTo2D
from viscy.networks import UNetStackTo2D


class TestUNetStackTo2D(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/networks/unet_stack_to_stack_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import numpy as np
import unittest

from micro_dl.networks import UNetStackToStack
from viscy.networks import UNetStackToStack


class TestUNetStackToStack(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/plotting/plot_utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import os
from testfixtures import TempDirectory

import micro_dl.plotting.plot_utils as plot_utils
import viscy.plotting.plot_utils as plot_utils


def test_save_predicted_images():
Expand Down
4 changes: 2 additions & 2 deletions tests/preprocessing/generate_masks_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import unittest
import warnings

from micro_dl.utils import aux_utils as aux_utils
from micro_dl.preprocessing.generate_masks import MaskProcessor
from viscy.utils import aux_utils as aux_utils
from viscy.preprocessing.generate_masks import MaskProcessor


class TestMaskProcessor(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/preprocessing/resize_images_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from testfixtures import TempDirectory
import unittest

import micro_dl.preprocessing.resize_images as resize_images
import micro_dl.utils.aux_utils as aux_utils
import viscy.preprocessing.resize_images as resize_images
import viscy.utils.aux_utils as aux_utils


class TestResizeImages(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/torch_unet/networks/Unet25D_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import itertools
import unittest

from micro_dl.torch_unet.networks.Unet25D import Unet25d
import micro_dl.utils.cli_utils as io_utils
from viscy.torch_unet.networks.Unet25D import Unet25d
import viscy.utils.cli_utils as io_utils


class TestUnet25d(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/torch_unet/networks/Unet2D_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import itertools
import unittest

from micro_dl.torch_unet.networks.Unet2D import Unet2d
import micro_dl.utils.cli_utils as io_utils
from viscy.torch_unet.networks.Unet2D import Unet2d
import viscy.utils.cli_utils as io_utils


class TestUnet2d(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/torch_unet/networks/layers/ConvBlock2D_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import itertools
import unittest

from micro_dl.torch_unet.networks.layers.ConvBlock2D import ConvBlock2D
import micro_dl.utils.cli_utils as io_utils
from viscy.torch_unet.networks.layers.ConvBlock2D import ConvBlock2D
import viscy.utils.cli_utils as io_utils


class TestConvBlock2D(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/torch_unet/networks/layers/ConvBlock3D_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import itertools
import unittest

from micro_dl.torch_unet.networks.layers.ConvBlock3D import ConvBlock3D
import micro_dl.utils.cli_utils as io_utils
from viscy.torch_unet.networks.layers.ConvBlock3D import ConvBlock3D
import viscy.utils.cli_utils as io_utils


class TestConvBlock3D(unittest.TestCase):
Expand Down
6 changes: 3 additions & 3 deletions tests/torch_unet/utils/dataset_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

sys.path.insert(0, "/home/christian.foley/virtual_staining/workspaces/microDL")

import micro_dl.torch_unet.utils.dataset as dataset_utils
import micro_dl.utils.io_utils as io_utils
import micro_dl.cli.preprocess_script as preprocess_script
import viscy.torch_unet.utils.dataset as dataset_utils
import viscy.utils.io_utils as io_utils
import viscy.cli.preprocess_script as preprocess_script


class TestDataset(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/torch_unet/utils/training_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import unittest


from micro_dl.input.dataset import ToTensor
from micro_dl.training.training import TorchTrainer
from viscy.input.dataset import ToTensor
from viscy.training.training import TorchTrainer
from tests.torch_unet.utils.dataset_tests import TestDataset


Expand Down
2 changes: 1 addition & 1 deletion tests/utils/aux_utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import os
from testfixtures import TempDirectory

import micro_dl.utils.aux_utils as aux_utils
import viscy.utils.aux_utils as aux_utils


# Create test metadata table
Expand Down
8 changes: 4 additions & 4 deletions tests/utils/image_utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

# Create a test image and its corresponding coordinates and values
# Create a test image with a bright block to the right
import micro_dl.utils.aux_utils as aux_utils
import micro_dl.utils.image_utils as image_utils
import micro_dl.utils.io_utils as io_utils
import micro_dl.utils.normalize as normalize
import viscy.utils.aux_utils as aux_utils
import viscy.utils.image_utils as image_utils
import viscy.utils.io_utils as io_utils
import viscy.utils.normalize as normalize
from tests.utils.masks_utils_tests import uni_thr_tst_image

test_im = np.zeros((10, 15), np.uint16) + 100
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/io_utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import unittest
import zarr

import micro_dl.utils.io_utils as io_utils
import viscy.utils.io_utils as io_utils


class TestZarrReader(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/masks_utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from skimage import draw
from skimage.filters import gaussian

import micro_dl.utils.masks as masks_utils
import viscy.utils.masks as masks_utils


uni_thr_tst_image = np.zeros((31, 31))
Expand Down
4 changes: 2 additions & 2 deletions tests/utils/meta_utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from testfixtures import TempDirectory
import unittest

import micro_dl.utils.aux_utils as aux_utils
import micro_dl.utils.meta_utils as meta_utils
import viscy.utils.aux_utils as aux_utils
import viscy.utils.meta_utils as meta_utils


class TestMetaUtils(unittest.TestCase):
Expand Down
8 changes: 4 additions & 4 deletions tests/utils/mp_utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
import unittest
import warnings

import micro_dl.utils.aux_utils as aux_utils
import micro_dl.utils.mp_utils as mp_utils
import micro_dl.utils.image_utils as image_utils
import viscy.utils.aux_utils as aux_utils
import viscy.utils.mp_utils as mp_utils
import viscy.utils.image_utils as image_utils

from micro_dl.utils.masks import create_otsu_mask
from viscy.utils.masks import create_otsu_mask


class TestMpUtilsBaseClass(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/utils/preprocess_utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from testfixtures import TempDirectory
import unittest

import micro_dl.utils.aux_utils as aux_utils
import micro_dl.utils.preprocess_utils as preprocess_utils
import viscy.utils.aux_utils as aux_utils
import viscy.utils.preprocess_utils as preprocess_utils


class TestPreprocessUtils(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/utils/tile_utils_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from testfixtures import TempDirectory
import unittest

import micro_dl.utils.tile_utils as tile_utils
import micro_dl.utils.aux_utils as aux_utils
import viscy.utils.tile_utils as tile_utils
import viscy.utils.aux_utils as aux_utils


class TestTileUtils(unittest.TestCase):
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions micro_dl/cli/cli.py → viscy/cli/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from jsonargparse import lazy_instance
from lightning.pytorch.cli import LightningCLI
from lightning.pytorch.loggers import TensorBoardLogger
from micro_dl.light.data import HCSDataModule
from micro_dl.light.engine import PhaseToNuc25D
from viscy.light.data import HCSDataModule
from viscy.light.engine import PhaseToNuc25D


class VSLightningCLI(LightningCLI):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import iohub.ngff as ngff
import argparse

import micro_dl.evaluation.evaluation_metrics as metrics
import micro_dl.utils.aux_utils as aux_utils
import viscy.evaluation.evaluation_metrics as metrics
import viscy.utils.aux_utils as aux_utils
# from waveorder.focus import focus_from_transverse_band

# %% read the below details from the config file
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import argparse
import pandas as pd

import micro_dl.evaluation.evaluation_metrics as metrics
import micro_dl.utils.aux_utils as aux_utils
import viscy.evaluation.evaluation_metrics as metrics
import viscy.utils.aux_utils as aux_utils

# %% read the below details from the config file

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import torch

sys.path.insert(0, "/home/christian.foley/virtual_staining/workspaces/microDL")
import micro_dl.inference.inference as inference
import viscy.inference.inference as inference

def parse_args():
"""
Expand Down
File renamed without changes.
Loading