From e4766eed0ea515dc4930687d43cf234ded7acc5f Mon Sep 17 00:00:00 2001 From: Behrooz <3968947+behxyz@users.noreply.github.com> Date: Fri, 5 Mar 2021 12:37:07 -0500 Subject: [PATCH 1/2] Raise import error for openslide and cuimage Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com> --- monai/data/image_reader.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/monai/data/image_reader.py b/monai/data/image_reader.py index 16e8514f48..aa8a037dfb 100644 --- a/monai/data/image_reader.py +++ b/monai/data/image_reader.py @@ -639,13 +639,13 @@ class WSIReader(ImageReader): """ - def __init__(self, reader_lib: str = "cuClaraImage"): + def __init__(self, reader_lib: str = "OpenSlide"): super().__init__() self.reader_lib = reader_lib.lower() if self.reader_lib == "openslide": if has_osl: self.wsi_reader = openslide.OpenSlide - print("> OpenSlide is being used.") + print("> OpenSlide is being used.") elif self.reader_lib == "cuclaraimage": if has_cux: self.wsi_reader = cuimage.CuImage @@ -672,6 +672,11 @@ def read(self, data: Union[Sequence[str], str, np.ndarray], **kwargs): data: file name or a list of file names to read. """ + if (self.reader_lib == "openslide") and (not has_osl): + raise ImportError("No module named 'openslide'") + elif (self.reader_lib == "cuclaraimage") and (not has_cux): + raise ImportError("No module named 'cuimage'") + img_: List = [] filenames: Sequence[str] = ensure_tuple(data) From 6bc94b52572745534897cba4339e12aa18030dfa Mon Sep 17 00:00:00 2001 From: Behrooz <3968947+behxyz@users.noreply.github.com> Date: Fri, 5 Mar 2021 13:11:23 -0500 Subject: [PATCH 2/2] White space removed Signed-off-by: Behrooz <3968947+behxyz@users.noreply.github.com> --- monai/data/image_reader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/data/image_reader.py b/monai/data/image_reader.py index aa8a037dfb..39fc1f46b4 100644 --- a/monai/data/image_reader.py +++ b/monai/data/image_reader.py @@ -645,7 +645,7 @@ def __init__(self, reader_lib: str = "OpenSlide"): if self.reader_lib == "openslide": if has_osl: self.wsi_reader = openslide.OpenSlide - print("> OpenSlide is being used.") + print("> OpenSlide is being used.") elif self.reader_lib == "cuclaraimage": if has_cux: self.wsi_reader = cuimage.CuImage