biomedisa 24.7.1__py3-none-any.whl → 24.8.1__py3-none-any.whl

biomedisa/deeplearning.py

@@ -220,7 +220,7 @@ def deep_learning(img_data, label_data=None, val_img_data=None, val_label_data=N
             normalization_parameters = np.array(meta['normalization'], dtype=float)
         else:
             normalization_parameters = np.array([[mu],[sig]])
-        allLabels = np.array(meta.get('labels'))
+        bm.allLabels = np.array(meta.get('labels'))
         if 'patch_normalization' in meta:
             bm.patch_normalization = bool(meta['patch_normalization'][()])
         if 'scaling' in meta:
@@ -293,7 +293,7 @@ def deep_learning(img_data, label_data=None, val_img_data=None, val_label_data=N
 
                 # make prediction
                 results, bm = predict_semantic_segmentation(bm,
-                    header, img_header, allLabels,
+                    header, img_header,
                     region_of_interest, extension, img_data,
                     channels, normalization_parameters)
 
@@ -479,6 +479,8 @@ if __name__ == '__main__':
                         help='Processing queue when using a remote server')
     parser.add_argument('-hf','--header_file', type=str, metavar='PATH', default=None,
                         help='Location of header file')
+    parser.add_argument('-ext','--extension', type=str, default='.tif',
+                        help='Save data for example as NRRD file using --extension=".nrrd"')
     bm = parser.parse_args()
     bm.success = True
 

biomedisa/features/biomedisa_helper.py

@@ -416,25 +416,33 @@ def pre_processing(bm):
     if bm.labelData is None:
         return _error_(bm, 'Invalid label data.')
 
+    # dimension errors
     if len(bm.labelData.shape) != 3:
-        return _error_(bm, 'Label must be three-dimensional.')
-
+        return _error_(bm, 'Label data must be three-dimensional.')
     if bm.data.shape != bm.labelData.shape:
-        return _error_(bm, 'Image and label must have the same x,y,z-dimensions.')
+        return _error_(bm, 'Image and label data must have the same x,y,z-dimensions.')
+
+    # label data type
+    if bm.labelData.dtype in ['float16','float32','float64']:
+        if bm.django_env:
+            return _error_(bm, 'Label data must be of integer type.')
+        print(f'Warning: Potential label loss during conversion from {bm.labelData.dtype} to int32.')
+        bm.labelData = bm.labelData.astype(np.int32)
 
     # get labels
     bm.allLabels = np.unique(bm.labelData)
     index = np.argwhere(bm.allLabels<0)
     bm.allLabels = np.delete(bm.allLabels, index)
 
-    if bm.django_env and np.any(bm.allLabels > 255):
-        return _error_(bm, 'No labels higher than 255 allowed.')
-
+    # labels greater than 255
     if np.any(bm.allLabels > 255):
-        bm.labelData[bm.labelData > 255] = 0
-        index = np.argwhere(bm.allLabels > 255)
-        bm.allLabels = np.delete(bm.allLabels, index)
-        print('Warning: Only labels <=255 are allowed. Labels higher than 255 will be removed.')
+        if bm.django_env:
+            return _error_(bm, 'No labels greater than 255 allowed.')
+        else:
+            bm.labelData[bm.labelData > 255] = 0
+            index = np.argwhere(bm.allLabels > 255)
+            bm.allLabels = np.delete(bm.allLabels, index)
+            print('Warning: Only labels <=255 are allowed. Labels greater than 255 will be removed.')
 
     # add background label if not existing
     if not np.any(bm.allLabels==0):
@@ -486,7 +494,8 @@ def save_data(path_to_final, final, header=None, final_image_type=None, compress
         np_to_nc(path_to_final, final, header)
     elif final_image_type in ['.hdr', '.mhd', '.mha', '.nrrd', '.nii', '.nii.gz']:
         simg = sitk.GetImageFromArray(final)
-        simg.CopyInformation(header)
+        if header is not None:
+            simg.CopyInformation(header)
         sitk.WriteImage(simg, path_to_final, useCompression=compress)
     elif final_image_type in ['.zip', 'directory', '']:
         with tempfile.TemporaryDirectory() as temp_dir:

biomedisa/features/crop_helper.py

@@ -542,7 +542,8 @@ def load_and_train(normalize,path_to_img,path_to_labels,path_to_model,
                 cropping_weights.append(arr)
 
     # configuration data
-    cropping_config = np.array([channels, x_scale, y_scale, z_scale, normalize, 0, 1])
+    cropping_config = np.array([channels, x_scale, y_scale, z_scale, normalize,
+        normalization_parameters[0,0], normalization_parameters[1,0]])
 
     return cropping_weights, cropping_config, normalization_parameters
 

biomedisa/features/keras_helper.py

@@ -780,7 +780,9 @@ def train_semantic_segmentation(bm,
                     bm.only, bm.ignore, img, label, None, None, header, extension)
 
     # configuration data
-    configuration_data = np.array([bm.channels, bm.x_scale, bm.y_scale, bm.z_scale, bm.normalize, 0, 1])
+    configuration_data = np.array([bm.channels,
+        bm.x_scale, bm.y_scale, bm.z_scale, bm.normalize,
+        normalization_parameters[0,0], normalization_parameters[1,0]])
 
     # img shape
     zsh, ysh, xsh, _ = img.shape
@@ -959,6 +961,10 @@ def load_prediction_data(bm, channels, normalize, normalization_parameters,
             img_header = None
             tif = TiffFile(bm.path_to_image)
             img = imread(bm.path_to_image, key=range(z,min(len(tif.pages),z+bm.z_patch)))
+            if img.shape[0] < bm.z_patch:
+                rest = bm.z_patch - img.shape[0]
+                tmp = imread(bm.path_to_image, key=range(len(tif.pages)-rest,len(tif.pages)))
+                img = np.append(img, tmp[::-1], axis=0)
         else:
             img, img_header = load_data(bm.path_to_image, 'first_queue')
 
@@ -1032,7 +1038,7 @@ def append_ghost_areas(bm, img):
     return img, z_rest, y_rest, x_rest
 
 def predict_semantic_segmentation(bm,
-    header, img_header, allLabels,
+    header, img_header,
     region_of_interest, extension, img_data,
     channels, normalization_parameters):
 
@@ -1040,7 +1046,8 @@ def predict_semantic_segmentation(bm,
     results = {}
 
     # number of labels
-    nb_labels = len(allLabels)
+    nb_labels = len(bm.allLabels)
+    results['allLabels'] = bm.allLabels
 
     # load model
     if bm.dice_loss:
@@ -1222,7 +1229,7 @@ def predict_semantic_segmentation(bm,
                     rest = ID % (ysh*xsh)
                     l = rest // xsh
                     m = rest % xsh
-                    if i < max_i:
+                    if step*bm.batch_size+i < max_i:
                         probs[:,l:l+bm.y_patch,m:m+bm.x_patch] += Y[i]
 
             # overlap in z direction
@@ -1280,7 +1287,7 @@ def predict_semantic_segmentation(bm,
         label = np.copy(tmp, order='C')
 
     # get result
-    label = get_labels(label, allLabels)
+    label = get_labels(label, bm.allLabels)
     results['regular'] = label
 
     # load header from file

biomedisa/interpolation.py

@@ -154,6 +154,7 @@ def smart_interpolation(data, labelData, nbrw=10, sorw=4000, acwe=False, acwe_al
                 bm.data /= np.amax(bm.data)
                 bm.data *= 255.0
             if bm.labelData.dtype in ['uint32','int64','uint64']:
+                print(f'Warning: Potential label loss during conversion from {bm.labelData.dtype} to int32.')
                 bm.labelData = bm.labelData.astype(np.int32)
 
             # denoise image data

{biomedisa-24.7.1.dist-info → biomedisa-24.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: biomedisa
-Version: 24.7.1
+Version: 24.8.1
 Summary: Segmentation of 3D volumetric image data
 Author: Philipp Lösel
 Author-email: philipp.loesel@anu.edu.au
@@ -36,17 +36,17 @@ License-File: LICENSE
 Biomedisa (https://biomedisa.info) is a free and easy-to-use open-source application for segmenting large 3D volumetric images such as CT and MRI scans, developed at [The Australian National University CTLab](https://ctlab.anu.edu.au/). Biomedisa's smart interpolation of sparsely pre-segmented slices enables accurate semi-automated segmentation by considering the complete underlying image data. Additionally, Biomedisa enables deep learning for fully automated segmentation across similar samples and structures. It is compatible with segmentation tools like Amira/Avizo, ImageJ/Fiji and 3D Slicer. If you are using Biomedisa or the data for your research please cite: Lösel, P.D. et al. [Introducing Biomedisa as an open-source online platform for biomedical image segmentation.](https://www.nature.com/articles/s41467-020-19303-w) *Nat. Commun.* **11**, 5577 (2020).
 
 ## Hardware Requirements
-+ One or more NVIDIA GPUs with compute capability 3.0 or higher or an Intel CPU
++ One or more NVIDIA GPUs with compute capability 3.0 or higher.
 
 ## Installation (command-line based)
-+ [Ubuntu 22.04 + CUDA + GPU (recommended)](https://github.com/biomedisa/biomedisa/blob/master/README/ubuntu2204_cuda11.8_gpu_cli.md)
-+ [Ubuntu 22.04 + OpenCL + CPU (very slow)](https://github.com/biomedisa/biomedisa/blob/master/README/ubuntu2204_opencl_cpu_cli.md)
-+ [Windows 10 + CUDA + GPU (recommended)](https://github.com/biomedisa/biomedisa/blob/master/README/windows10_cuda_gpu_cli.md)
-+ [Windows 10 + OpenCL + GPU (easy to install but lacks features like allaxis, smoothing, uncertainty, optimized GPU memory usage)](https://github.com/biomedisa/biomedisa/blob/master/README/windows10_opencl_gpu_cli.md)
-+ [Windows 10 + OpenCL + CPU (very slow)](https://github.com/biomedisa/biomedisa/blob/master/README/windows10_opencl_cpu_cli.md)
++ [Ubuntu 22.04 + Smart Interpolation](https://github.com/biomedisa/biomedisa/blob/master/README/ubuntu2204_interpolation_cli.md)
++ [Ubuntu 22.04 + Smart Interpolation + Deep Learning](https://github.com/biomedisa/biomedisa/blob/master/README/ubuntu2204_cuda11.8_gpu_cli.md)
++ [Windows 10 + Smart Interpolation + Deep Learning](https://github.com/biomedisa/biomedisa/blob/master/README/windows10_cuda_gpu_cli.md)
++ [Windows (WSL) + Smart Interpolation + Deep Learning](https://github.com/biomedisa/biomedisa/blob/master/README/windows_wsl.md)
 
 ## Installation (3D Slicer extension)
-+ [Ubuntu 22.04 + CUDA + GPU](https://github.com/biomedisa/biomedisa/blob/master/README/ubuntu2204_cuda11.8_gpu_slicer.md)
++ [Ubuntu 22.04 + Smart Interpolation + Deep Learning](https://github.com/biomedisa/biomedisa/blob/master/README/ubuntu2204_cuda11.8_gpu_slicer.md)
++ [Windows 10 + Smart Interpolation](https://github.com/biomedisa/biomedisa/blob/master/README/windows10_cuda_gpu_slicer.md)
 
 ## Installation (browser based)
 + [Ubuntu 22.04](https://github.com/biomedisa/biomedisa/blob/master/README/ubuntu2204_cuda11.8.md)
@@ -58,6 +58,7 @@ Biomedisa (https://biomedisa.info) is a free and easy-to-use open-source applica
 24.7.1
 + 3D Slicer extension
 + Prediction of large data block by block
+
 24.5.22
 + Pip is the preferred installation method
 + Commands, module names and imports have been changed to conform to the Pip standard

{biomedisa-24.7.1.dist-info → biomedisa-24.8.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 biomedisa/__init__.py,sha256=hw4mzEjGFXm-vxus2DBfKFW0nKoG0ibL5SH6ShfchrY,1526
 biomedisa/__main__.py,sha256=a1--8vhtztWEloHVtbM43FZLCfrFo4BELgdsgtWE8ls,536
-biomedisa/deeplearning.py,sha256=eVFoy3FsSb8h2hqFBdI8kz63tATLUvuMfSPzSa_wX5Q,27813
-biomedisa/interpolation.py,sha256=tehhMhm3WEVzUpfAemujMixJMK6BMNLQ6uw7Z9TR9Go,17163
+biomedisa/deeplearning.py,sha256=Tfi1iSpsYi9RetgJpff_-mHx_VxlDybHZqTBJURwTBM,27970
+biomedisa/interpolation.py,sha256=i10aqwEl-wsVU_nQ-zyubhAs27NSKF4ial7LyhaBLv0,17273
 biomedisa/mesh.py,sha256=8-iuVsrfW5JovaMrAez7qSxv1LCU3eiqOdik0s0DV1w,16062
 biomedisa/features/DataGenerator.py,sha256=MYPSY9-ssMwPx9UOI_ZfE7_5rddOSn4aHbVQ0HtYQVA,12757
 biomedisa/features/DataGeneratorCrop.py,sha256=23R4Z-8tB1CsjYTYfhHGovlJpAny_q9OV9hq8kc2GJg,5454
@@ -10,12 +10,12 @@ biomedisa/features/PredictDataGeneratorCrop.py,sha256=HF5tJbGtlJMHr7lMT9IiIdLG2C
 biomedisa/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomedisa/features/active_contour.py,sha256=FnPuvYck_KL4xYRFqwzm4Grdm288EdlcLFt88E0OtqA,17938
 biomedisa/features/assd.py,sha256=q9NUQXEoA4Pi3d8b5fmys615CWu06Sm0N9-OGwJOFnw,6537
-biomedisa/features/biomedisa_helper.py,sha256=d5wCtiP8pRTUbXv-jrN-b7cNStm8T1B_FtQR2Msd5OY,32286
+biomedisa/features/biomedisa_helper.py,sha256=oIsOmIJ8xUQVwgbzMgw65dXcZmzwePpFQoIdbgLTnF8,32727
 biomedisa/features/create_slices.py,sha256=uSDH1OcEYc5BFPZHSy3UpS4P2DuoVnxOZ-l7wmyT_Po,13108
-biomedisa/features/crop_helper.py,sha256=si72n9Q-C7U0cXYOD9Ux2UqIbZdXbZSOARBYDeqRggI,24533
+biomedisa/features/crop_helper.py,sha256=5do03z_DT13qWRR6IGtkFn4BNaw0mWmUXgg3Lk-U6QY,24597
 biomedisa/features/curvop_numba.py,sha256=AjKQJcUBoURTB8pq1HmugQYpBwBELthhcEu51_r_xPI,7049
 biomedisa/features/django_env.py,sha256=pdiPcBpqu1BWuyvh-palIGVwHFaY-leQ4Gatlbm8hIg,8942
-biomedisa/features/keras_helper.py,sha256=0rgMLD3mvLuV9PFbsOwypH4fr3IhPkQveCtUiqTCZdc,57270
+biomedisa/features/keras_helper.py,sha256=Y48N8VizQ2F7yrFzdUPOIFS19wm8fFWguQJqVFLVHWA,57637
 biomedisa/features/nc_reader.py,sha256=RoRMwu3ELSNfoV3qZtaT2OWACnXb2EhNFu_DAF1T93o,7406
 biomedisa/features/pid.py,sha256=Jmn1VIp0fBlgBrqZ-yUIQVVb5-NAxNBdibXALVr2PPI,2545
 biomedisa/features/process_image.py,sha256=VtS3fGDvglqJiiJLPK1toe76J58j914NJ8XQKg3CRwo,11091
@@ -37,8 +37,8 @@ biomedisa/features/random_walk/pyopencl_large.py,sha256=q79AxG3p3qFjxfiAZfUK9I5B
 biomedisa/features/random_walk/pyopencl_small.py,sha256=opNlS-qzOa9qWafBNJdvf6r1aRAFf7_JXf6ISDnkdXE,17068
 biomedisa/features/random_walk/rw_large.py,sha256=ZnITvk00Y11ZZlGuBRaJO1EwU0wYBdEwdpj9vvXCqF4,19805
 biomedisa/features/random_walk/rw_small.py,sha256=RPzZe24YrEwYelJukDjvqaoD_SyhgdriEi7uV3kZGXI,14881
-biomedisa-24.7.1.dist-info/LICENSE,sha256=sehayP6UhydNnmstfL4yFR3genMRdpuUh6uZVWJN1H0,14152
-biomedisa-24.7.1.dist-info/METADATA,sha256=4ziBlBpd6JbYp9YSmxs0ptZpm_XX3J4pERQAL6Kg118,10631
-biomedisa-24.7.1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-biomedisa-24.7.1.dist-info/top_level.txt,sha256=opsf1Eb4vCguPSxev4HHSeiUKCccT_C_RcUCdAYbHWQ,10
-biomedisa-24.7.1.dist-info/RECORD,,
+biomedisa-24.8.1.dist-info/LICENSE,sha256=sehayP6UhydNnmstfL4yFR3genMRdpuUh6uZVWJN1H0,14152
+biomedisa-24.8.1.dist-info/METADATA,sha256=GRHftPc4P9kZG5mgWe0KYpu-QMYWYBg2mSJqKuVitiE,10569
+biomedisa-24.8.1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+biomedisa-24.8.1.dist-info/top_level.txt,sha256=opsf1Eb4vCguPSxev4HHSeiUKCccT_C_RcUCdAYbHWQ,10
+biomedisa-24.8.1.dist-info/RECORD,,

{biomedisa-24.7.1.dist-info → biomedisa-24.8.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any