biomedisa 2024.5.18__tar.gz → 2024.5.20__tar.gz

{biomedisa-2024.5.18 → biomedisa-2024.5.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: biomedisa
-Version: 2024.5.18
+Version: 2024.5.20
 Summary: Segmentation of 3D volumetric image data
 Author: Philipp Lösel
 Author-email: philipp.loesel@anu.edu.au
@@ -14,7 +14,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-[![biomedisa](biomedisa_app/static/biomedisa_logo.svg)](https://biomedisa.info)
+[![biomedisa](https://raw.githubusercontent.com/biomedisa/biomedisa/master/biomedisa_app/static/biomedisa_logo.svg)](https://biomedisa.info)
 -----------
 - [Overview](#overview)
 - [Hardware Requirements](#hardware-requirements)
@@ -55,7 +55,7 @@ Biomedisa (https://biomedisa.info) is a free and easy-to-use open-source applica
 
 #### Python example
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data, save_data
+from biomedisa.features.biomedisa_helper import load_data, save_data
 from biomedisa.interpolation import smart_interpolation
 
 # load data
@@ -84,7 +84,7 @@ python -m biomedisa.interpolation C:\Users\%USERNAME%\Downloads\tumor.tif C:\Use
 
 #### Python example (training)
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data
+from biomedisa.features.biomedisa_helper import load_data
 from biomedisa.deeplearning import deep_learning
 
 # load image data
@@ -124,7 +124,7 @@ If running into ResourceExhaustedError due to out of memory (OOM), try to use sm
 
 #### Python example (prediction)
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data, save_data
+from biomedisa.features.biomedisa_helper import load_data, save_data
 from biomedisa.deeplearning import deep_learning
 
 # load data
@@ -140,15 +140,14 @@ save_data('final.Head5.am', results['regular'], results['header'])
 
 #### Command-line based (prediction)
 ```
-# start prediction with a batch size of 6
-python -m biomedisa.deeplearning C:\Users\%USERNAME%\Downloads\testing_axial_crop_pat13.nii.gz C:\Users\%USERNAME%\Downloads\heart.h5 -p -bs 6
+python -m biomedisa.deeplearning C:\Users\%USERNAME%\Downloads\testing_axial_crop_pat13.nii.gz C:\Users\%USERNAME%\Downloads\heart.h5 -p
 ```
 
 # Biomedisa Features
 
 #### Load and save data (such as Amira Mesh, TIFF, NRRD, NIfTI or DICOM)
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data, save_data
+from biomedisa.features.biomedisa_helper import load_data, save_data
 
 # load data as numpy array
 # for DICOM, PNG files, or similar formats, 'path_to_data' must reference
@@ -161,7 +160,7 @@ save_data(path_to_data, data, header)
 
 #### Create STL mesh from segmentation (label values are saved as attributes)
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data, save_data
+from biomedisa.features.biomedisa_helper import load_data, save_data
 from biomedisa.mesh import get_voxel_spacing, save_mesh
 
 # load segmentation
@@ -194,7 +193,7 @@ python -m biomedisa.mesh <path_to_data>
 
 #### Resize data
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import img_resize
+from biomedisa.features.biomedisa_helper import img_resize
 
 # resize image data
 zsh, ysh, xsh = data.shape
@@ -207,7 +206,7 @@ label_data = img_resize(label_data, new_zsh, new_ysh, new_xsh, labels=True)
 
 #### Remove outliers and fill holes
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import clean, fill
+from biomedisa.features.biomedisa_helper import clean, fill
 
 # delete outliers smaller than 90% of the segment
 label_data = clean(label_data, 0.9)
@@ -218,28 +217,28 @@ label_data = fill(label_data, 0.9)
 
 #### Accuracy assessment
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import Dice_score, ASSD
+from biomedisa.features.biomedisa_helper import Dice_score, ASSD
 dice = Dice_score(ground_truth, result)
 assd = ASSD(ground_truth, result)
 ```
 
 # Update Biomedisa
-If you installed Biomedisa via Pip.
+If you installed Biomedisa via Pip
 ```
 pip install --upgrade biomedisa
 ```
-If you used `git clone`, change to the Biomedisa directory and make a pull request.
+If you used `git clone`, change to the Biomedisa directory and make a pull request
 ```
 cd git/biomedisa
 git pull
 ```
 
-If you installed the browser based version of Biomedisa (including MySQL database), you also need to update the database.
+If you installed the browser based version of Biomedisa (including MySQL database), you also need to update the database
 ```
 python manage.py migrate
 ```
 
-If you installed an [Apache Server](https://github.com/biomedisa/biomedisa/blob/master/README/APACHE_SERVER.md), you need to restart the server.
+If you installed an [Apache Server](https://github.com/biomedisa/biomedisa/blob/master/README/APACHE_SERVER.md), you need to restart the server
 ```
 sudo service apache2 restart
 ```

{biomedisa-2024.5.18 → biomedisa-2024.5.20}/README.md

@@ -1,4 +1,4 @@
-[![biomedisa](biomedisa_app/static/biomedisa_logo.svg)](https://biomedisa.info)
+[![biomedisa](https://raw.githubusercontent.com/biomedisa/biomedisa/master/biomedisa_app/static/biomedisa_logo.svg)](https://biomedisa.info)
 -----------
 - [Overview](#overview)
 - [Hardware Requirements](#hardware-requirements)
@@ -39,7 +39,7 @@ Biomedisa (https://biomedisa.info) is a free and easy-to-use open-source applica
 
 #### Python example
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data, save_data
+from biomedisa.features.biomedisa_helper import load_data, save_data
 from biomedisa.interpolation import smart_interpolation
 
 # load data
@@ -68,7 +68,7 @@ python -m biomedisa.interpolation C:\Users\%USERNAME%\Downloads\tumor.tif C:\Use
 
 #### Python example (training)
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data
+from biomedisa.features.biomedisa_helper import load_data
 from biomedisa.deeplearning import deep_learning
 
 # load image data
@@ -108,7 +108,7 @@ If running into ResourceExhaustedError due to out of memory (OOM), try to use sm
 
 #### Python example (prediction)
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data, save_data
+from biomedisa.features.biomedisa_helper import load_data, save_data
 from biomedisa.deeplearning import deep_learning
 
 # load data
@@ -124,15 +124,14 @@ save_data('final.Head5.am', results['regular'], results['header'])
 
 #### Command-line based (prediction)
 ```
-# start prediction with a batch size of 6
-python -m biomedisa.deeplearning C:\Users\%USERNAME%\Downloads\testing_axial_crop_pat13.nii.gz C:\Users\%USERNAME%\Downloads\heart.h5 -p -bs 6
+python -m biomedisa.deeplearning C:\Users\%USERNAME%\Downloads\testing_axial_crop_pat13.nii.gz C:\Users\%USERNAME%\Downloads\heart.h5 -p
 ```
 
 # Biomedisa Features
 
 #### Load and save data (such as Amira Mesh, TIFF, NRRD, NIfTI or DICOM)
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data, save_data
+from biomedisa.features.biomedisa_helper import load_data, save_data
 
 # load data as numpy array
 # for DICOM, PNG files, or similar formats, 'path_to_data' must reference
@@ -145,7 +144,7 @@ save_data(path_to_data, data, header)
 
 #### Create STL mesh from segmentation (label values are saved as attributes)
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import load_data, save_data
+from biomedisa.features.biomedisa_helper import load_data, save_data
 from biomedisa.mesh import get_voxel_spacing, save_mesh
 
 # load segmentation
@@ -178,7 +177,7 @@ python -m biomedisa.mesh <path_to_data>
 
 #### Resize data
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import img_resize
+from biomedisa.features.biomedisa_helper import img_resize
 
 # resize image data
 zsh, ysh, xsh = data.shape
@@ -191,7 +190,7 @@ label_data = img_resize(label_data, new_zsh, new_ysh, new_xsh, labels=True)
 
 #### Remove outliers and fill holes
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import clean, fill
+from biomedisa.features.biomedisa_helper import clean, fill
 
 # delete outliers smaller than 90% of the segment
 label_data = clean(label_data, 0.9)
@@ -202,28 +201,28 @@ label_data = fill(label_data, 0.9)
 
 #### Accuracy assessment
 ```python
-from biomedisa.biomedisa_features.biomedisa_helper import Dice_score, ASSD
+from biomedisa.features.biomedisa_helper import Dice_score, ASSD
 dice = Dice_score(ground_truth, result)
 assd = ASSD(ground_truth, result)
 ```
 
 # Update Biomedisa
-If you installed Biomedisa via Pip.
+If you installed Biomedisa via Pip
 ```
 pip install --upgrade biomedisa
 ```
-If you used `git clone`, change to the Biomedisa directory and make a pull request.
+If you used `git clone`, change to the Biomedisa directory and make a pull request
 ```
 cd git/biomedisa
 git pull
 ```
 
-If you installed the browser based version of Biomedisa (including MySQL database), you also need to update the database.
+If you installed the browser based version of Biomedisa (including MySQL database), you also need to update the database
 ```
 python manage.py migrate
 ```
 
-If you installed an [Apache Server](https://github.com/biomedisa/biomedisa/blob/master/README/APACHE_SERVER.md), you need to restart the server.
+If you installed an [Apache Server](https://github.com/biomedisa/biomedisa/blob/master/README/APACHE_SERVER.md), you need to restart the server
 ```
 sudo service apache2 restart
 ```

{biomedisa-2024.5.18 → biomedisa-2024.5.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "biomedisa"
-version = "2024.5.18"
+version = "2024.5.20"
 authors = [
   { name="Philipp Lösel"}, {email="philipp.loesel@anu.edu.au" },
 ]

{biomedisa-2024.5.18 → biomedisa-2024.5.20}/src/biomedisa/__init__.py

@@ -1,15 +1,11 @@
 import os
-import sys
 import subprocess
 
 # from source base directory
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-# pip base directory
-if not os.path.exists(os.path.join(BASE_DIR,'biomedisa_features')):
-    BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-    # add BASE_DIR to PYTHONPATH for absolute imports
-    sys.path.append(BASE_DIR)
+# pip installation
+if not os.path.exists(os.path.join(BASE_DIR,'biomedisa/settings.py')):
 
     # metadata
     import importlib_metadata

{biomedisa-2024.5.18 → biomedisa-2024.5.20}/src/biomedisa/deeplearning.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 ##########################################################################
 ##                                                                      ##
-##  Copyright (c) 2024 Philipp Lösel. All rights reserved.              ##
+##  Copyright (c) 2019-2024 Philipp Lösel. All rights reserved.         ##
 ##                                                                      ##
 ##  This file is part of the open source project biomedisa.             ##
 ##                                                                      ##
@@ -27,13 +27,11 @@
 ##                                                                      ##
 ##########################################################################
 
-import sys, os
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-sys.path.append(BASE_DIR)
+import os
 import biomedisa
-import biomedisa_features.crop_helper as ch
-from biomedisa_features.keras_helper import *
-from biomedisa_features.biomedisa_helper import _error_, unique_file_path
+import biomedisa.features.crop_helper as ch
+from biomedisa.features.keras_helper import *
+from biomedisa.features.biomedisa_helper import _error_, unique_file_path
 from tensorflow.python.framework.errors_impl import ResourceExhaustedError
 import tensorflow as tf
 import numpy as np
@@ -43,6 +41,7 @@ import h5py
 import time
 import subprocess
 import glob
+import tempfile
 
 class Biomedisa(object):
      pass
@@ -120,7 +119,7 @@ def deep_learning(img_data, label_data=None, val_img_data=None, val_label_data=N
             project = os.path.splitext(bm.shortfilename)[0]
 
             # path to model
-            bm.path_to_model = BASE_DIR + f'/private_storage/images/{bm.username}/{project}.h5'
+            bm.path_to_model = biomedisa.BASE_DIR + f'/private_storage/images/{bm.username}/{project}.h5'
             if not bm.remote:
                 bm.path_to_model = unique_file_path(bm.path_to_model)
 
@@ -128,7 +127,7 @@ def deep_learning(img_data, label_data=None, val_img_data=None, val_label_data=N
             project = os.path.splitext(os.path.basename(bm.path_to_model))[0]
 
         # create pid object
-        from biomedisa_features.django_env import create_pid_object
+        from biomedisa.features.django_env import create_pid_object
         create_pid_object(os.getpid(), bm.remote, bm.queue, bm.img_id, (bm.path_to_model if bm.train else ''))
 
         # write in log file
@@ -227,81 +226,83 @@ def deep_learning(img_data, label_data=None, val_img_data=None, val_label_data=N
         crop_data = True if 'cropping_weights' in hf else False
         hf.close()
 
-        # extract image files
-        bm.tmp_dir = None
-        if bm.path_to_images is not None and (os.path.splitext(bm.path_to_images)[1]=='.tar' or bm.path_to_images[-7:]=='.tar.gz'):
-            path_to_dir = os.path.dirname(bm.path_to_images) + '/final.'+os.path.basename(bm.path_to_images)
-            if path_to_dir[-3:]=='.gz':
-                path_to_dir = path_to_dir[:-3]
-            if bm.django_env and not bm.remote:
-                path_to_dir = unique_file_path(path_to_dir)
-            bm.tmp_dir = BASE_DIR + '/tmp/' + id_generator(40)
-            tar = tarfile.open(bm.path_to_images)
-            tar.extractall(path=bm.tmp_dir)
-            tar.close()
-            bm.path_to_images = bm.tmp_dir
-            bm.save_cropped, bm.acwe = False, False
-            bm.clean, bm.fill = None, None
-
-        # list of images
-        path_to_finals = []
-        if bm.path_to_images is not None and os.path.isdir(bm.path_to_images):
-            files = glob.glob(bm.path_to_images+'/**/*', recursive=True)
-            bm.path_to_images = [f for f in files if os.path.isfile(f)]
-        else:
-            bm.path_to_images = [bm.path_to_images]
-
-        # loop over all images
-        for bm.path_to_image in bm.path_to_images:
-
-            # create path_to_final
-            if bm.path_to_image:
-                filename = os.path.basename(bm.path_to_image)
-                filename = os.path.splitext(filename)[0]
-                if filename[-4:] == '.nii':
-                    filename = filename[:-4]
-                bm.path_to_cropped_image = os.path.dirname(bm.path_to_image) + '/' + filename + '.cropped.tif'
-                if bm.django_env and not bm.remote and not bm.tmp_dir:
-                    bm.path_to_cropped_image = unique_file_path(bm.path_to_cropped_image)
-                filename = 'final.' + filename
-                bm.path_to_final = os.path.dirname(bm.path_to_image) + '/' + filename + extension
-                if bm.django_env and not bm.remote and not bm.tmp_dir:
-                    bm.path_to_final = unique_file_path(bm.path_to_final)
-
-            # crop data
-            region_of_interest, cropped_volume = None, None
-            if crop_data:
-                region_of_interest, cropped_volume = ch.crop_data(bm.path_to_image, bm.path_to_model, bm.path_to_cropped_image,
-                    bm.batch_size, bm.debug_cropping, bm.save_cropped, img_data, bm.x_range, bm.y_range, bm.z_range)
-
-            # load prediction data
-            img, img_header, z_shape, y_shape, x_shape, region_of_interest, img_data = load_prediction_data(bm.path_to_image,
-                channels, bm.x_scale, bm.y_scale, bm.z_scale, bm.no_scaling, normalize, normalization_parameters,
-                region_of_interest, img_data, img_header)
-
-            # make prediction
-            results, bm = predict_semantic_segmentation(bm, img, bm.path_to_model,
-                bm.z_patch, bm.y_patch, bm.x_patch, z_shape, y_shape, x_shape, bm.compression, header,
-                img_header, bm.stride_size, allLabels, bm.batch_size, region_of_interest,
-                bm.no_scaling, extension, img_data)
-
-            # results
-            if cropped_volume is not None:
-                results['cropped_volume'] = cropped_volume
-
-            # path to results
-            if bm.path_to_image:
-                path_to_finals.append(bm.path_to_final)
-
-        # write tar file and delete extracted image files
-        if bm.tmp_dir is not None and os.path.exists(bm.tmp_dir):
-            with tarfile.open(path_to_dir, 'w') as tar:
-                for file_path in path_to_finals:
-                    file_name = os.path.basename(file_path)
-                    tar.add(file_path, arcname=file_name)
-            shutil.rmtree(bm.tmp_dir)
-            bm.path_to_final = path_to_dir
-            bm.path_to_cropped_image = None
+        # make temporary directory
+        with tempfile.TemporaryDirectory() as temp_dir:
+
+            # extract image files from tar file
+            bm.tarfile = False
+            if bm.path_to_images is not None and (os.path.splitext(bm.path_to_images)[1]=='.tar' or bm.path_to_images[-7:]=='.tar.gz'):
+                bm.tarfile = True
+                path_to_result = os.path.dirname(bm.path_to_images) + '/final.'+os.path.basename(bm.path_to_images)
+                if path_to_result[-3:]=='.gz':
+                    path_to_result = path_to_result[:-3]
+                if bm.django_env and not bm.remote:
+                    path_to_result = unique_file_path(path_to_result)
+                tar = tarfile.open(bm.path_to_images)
+                tar.extractall(path=temp_dir)
+                tar.close()
+                bm.path_to_images = temp_dir
+                bm.save_cropped, bm.acwe = False, False
+                bm.clean, bm.fill = None, None
+
+            # list of images
+            path_to_finals = []
+            if bm.path_to_images is not None and os.path.isdir(bm.path_to_images):
+                files = glob.glob(bm.path_to_images+'/**/*', recursive=True)
+                bm.path_to_images = [f for f in files if os.path.isfile(f)]
+            else:
+                bm.path_to_images = [bm.path_to_images]
+
+            # loop over all images
+            for bm.path_to_image in bm.path_to_images:
+
+                # create path_to_final
+                if bm.path_to_image:
+                    filename = os.path.basename(bm.path_to_image)
+                    filename = os.path.splitext(filename)[0]
+                    if filename[-4:] == '.nii':
+                        filename = filename[:-4]
+                    bm.path_to_cropped_image = os.path.dirname(bm.path_to_image) + '/' + filename + '.cropped.tif'
+                    if bm.django_env and not bm.remote and not bm.tarfile:
+                        bm.path_to_cropped_image = unique_file_path(bm.path_to_cropped_image)
+                    filename = 'final.' + filename
+                    bm.path_to_final = os.path.dirname(bm.path_to_image) + '/' + filename + extension
+                    if bm.django_env and not bm.remote and not bm.tarfile:
+                        bm.path_to_final = unique_file_path(bm.path_to_final)
+
+                # crop data
+                region_of_interest, cropped_volume = None, None
+                if crop_data:
+                    region_of_interest, cropped_volume = ch.crop_data(bm.path_to_image, bm.path_to_model, bm.path_to_cropped_image,
+                        bm.batch_size, bm.debug_cropping, bm.save_cropped, img_data, bm.x_range, bm.y_range, bm.z_range)
+
+                # load prediction data
+                img, img_header, z_shape, y_shape, x_shape, region_of_interest, img_data = load_prediction_data(bm.path_to_image,
+                    channels, bm.x_scale, bm.y_scale, bm.z_scale, bm.no_scaling, normalize, normalization_parameters,
+                    region_of_interest, img_data, img_header)
+
+                # make prediction
+                results, bm = predict_semantic_segmentation(bm, img, bm.path_to_model,
+                    bm.z_patch, bm.y_patch, bm.x_patch, z_shape, y_shape, x_shape, bm.compression, header,
+                    img_header, bm.stride_size, allLabels, bm.batch_size, region_of_interest,
+                    bm.no_scaling, extension, img_data)
+
+                # results
+                if cropped_volume is not None:
+                    results['cropped_volume'] = cropped_volume
+
+                # path to results
+                if bm.path_to_image:
+                    path_to_finals.append(bm.path_to_final)
+
+            # write tar file and delete extracted image files
+            if bm.tarfile and os.path.exists(temp_dir):
+                with tarfile.open(path_to_result, 'w') as tar:
+                    for file_path in path_to_finals:
+                        file_name = os.path.basename(file_path)
+                        tar.add(file_path, arcname=file_name)
+                bm.path_to_final = path_to_result
+                bm.path_to_cropped_image = None
 
     # computation time
     t = int(time.time() - TIC)
@@ -316,7 +317,7 @@ def deep_learning(img_data, label_data=None, val_img_data=None, val_label_data=N
     # django environment
     if bm.django_env:
         from biomedisa_app.config import config
-        from biomedisa_features.django_env import post_processing
+        from biomedisa.features.django_env import post_processing
         validation=True if bm.validation_split or (bm.val_images is not None and bm.val_images[0] is not None) else False
         post_processing(bm.path_to_final, time_str, config['SERVER_ALIAS'], bm.remote, bm.queue,
             img_id=bm.img_id, label_id=bm.label_id, path_to_model=bm.path_to_model,
@@ -324,7 +325,7 @@ def deep_learning(img_data, label_data=None, val_img_data=None, val_label_data=N
             train=bm.train, predict=bm.predict, validation=validation)
 
         # write in log file
-        path_to_time = BASE_DIR + '/log/time.txt'
+        path_to_time = biomedisa.BASE_DIR + '/log/time.txt'
         with open(path_to_time, 'a') as timefile:
             if predict:
                 message = 'Successfully segmented ' + bm.shortfilename
@@ -487,7 +488,7 @@ if __name__ == '__main__':
             reference_image_path = bm.path_to_images
         bm.username = os.path.basename(os.path.dirname(reference_image_path))
         bm.shortfilename = os.path.basename(reference_image_path)
-        bm.path_to_logfile = BASE_DIR + '/log/logfile.txt'
+        bm.path_to_logfile = biomedisa.BASE_DIR + '/log/logfile.txt'
     else:
         bm.django_env = False
 
@@ -497,13 +498,9 @@ if __name__ == '__main__':
     try:
         deep_learning(None, **kwargs)
     except InputError:
-        if any(InputError.img_names):
-            remove_extracted_data(InputError.img_names, InputError.label_names)
         print(traceback.format_exc())
         bm = _error_(bm, f'{InputError.message}')
     except ch.InputError:
-        if any(ch.InputError.img_names):
-            remove_extracted_data(ch.InputError.img_names, ch.InputError.label_names)
         print(traceback.format_exc())
         bm = _error_(bm, f'{ch.InputError.message}')
     except MemoryError:

{biomedisa-2024.5.18/src/biomedisa/biomedisa_features → biomedisa-2024.5.20/src/biomedisa/features}/DataGenerator.py

@@ -1,6 +1,6 @@
 ##########################################################################
 ##                                                                      ##
-##  Copyright (c) 2024 Philipp Lösel. All rights reserved.              ##
+##  Copyright (c) 2019-2024 Philipp Lösel. All rights reserved.         ##
 ##                                                                      ##
 ##  This file is part of the open source project biomedisa.             ##
 ##                                                                      ##

{biomedisa-2024.5.18/src/biomedisa/biomedisa_features → biomedisa-2024.5.20/src/biomedisa/features}/DataGeneratorCrop.py

@@ -1,6 +1,6 @@
 ##########################################################################
 ##                                                                      ##
-##  Copyright (c) 2024 Philipp Lösel. All rights reserved.              ##
+##  Copyright (c) 2019-2024 Philipp Lösel. All rights reserved.         ##
 ##                                                                      ##
 ##  This file is part of the open source project biomedisa.             ##
 ##                                                                      ##

{biomedisa-2024.5.18/src/biomedisa/biomedisa_features → biomedisa-2024.5.20/src/biomedisa/features}/PredictDataGenerator.py

@@ -1,6 +1,6 @@
 ##########################################################################
 ##                                                                      ##
-##  Copyright (c) 2024 Philipp Lösel. All rights reserved.              ##
+##  Copyright (c) 2019-2024 Philipp Lösel. All rights reserved.         ##
 ##                                                                      ##
 ##  This file is part of the open source project biomedisa.             ##
 ##                                                                      ##

{biomedisa-2024.5.18/src/biomedisa/biomedisa_features → biomedisa-2024.5.20/src/biomedisa/features}/PredictDataGeneratorCrop.py

@@ -1,6 +1,6 @@
 ##########################################################################
 ##                                                                      ##
-##  Copyright (c) 2022 Philipp Lösel. All rights reserved.              ##
+##  Copyright (c) 2019-2024 Philipp Lösel. All rights reserved.         ##
 ##                                                                      ##
 ##  This file is part of the open source project biomedisa.             ##
 ##                                                                      ##

{biomedisa-2024.5.18/src/biomedisa/biomedisa_features → biomedisa-2024.5.20/src/biomedisa/features}/active_contour.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 ##########################################################################
 ##                                                                      ##
-##  Copyright (c) 2024 Philipp Lösel. All rights reserved.              ##
+##  Copyright (c) 2019-2024 Philipp Lösel. All rights reserved.         ##
 ##                                                                      ##
 ##  This file is part of the open source project biomedisa.             ##
 ##                                                                      ##
@@ -27,13 +27,10 @@
 ##                                                                      ##
 ##########################################################################
 
-import sys, os
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-if not BASE_DIR in sys.path:
-    sys.path.append(BASE_DIR)
+import os
 import biomedisa
-from biomedisa_features.curvop_numba import curvop, evolution
-from biomedisa_features.biomedisa_helper import (unique_file_path, load_data, save_data,
+from biomedisa.features.curvop_numba import curvop, evolution
+from biomedisa.features.biomedisa_helper import (unique_file_path, load_data, save_data,
     pre_processing, img_to_uint8, silent_remove)
 import numpy as np
 import numba
@@ -143,7 +140,7 @@ def activeContour(data, labelData, alpha=1.0, smooth=1, steps=3,
     if bm.django_env:
         bm.username = os.path.basename(os.path.dirname(bm.path_to_data))
         bm.shortfilename = os.path.basename(bm.path_to_data)
-        bm.path_to_logfile = BASE_DIR + '/log/logfile.txt'
+        bm.path_to_logfile = biomedisa.BASE_DIR + '/log/logfile.txt'
 
     # pre-processing
     bm = pre_processing(bm)
@@ -234,13 +231,13 @@ def refinement(bm):
 
 def post_processing(path_to_acwe, image_id=None, friend_id=None, simple=False, remote=False):
     if remote:
-        with open(BASE_DIR + '/log/config_4', 'w') as configfile:
+        with open(biomedisa.BASE_DIR + '/log/config_4', 'w') as configfile:
             print(path_to_acwe, 'phantom', file=configfile)
     else:
         import django
         django.setup()
         from biomedisa_app.models import Upload
-        from biomedisa_features.create_slices import create_slices
+        from biomedisa.features.create_slices import create_slices
         from redis import Redis
         from rq import Queue
 
@@ -300,7 +297,7 @@ def init_active_contour(image_id, friend_id, label_id, simple=False):
 
     # get host information
     host = ''
-    host_base = BASE_DIR
+    host_base = biomedisa.BASE_DIR
     subhost, qsub_pid = None, None
     if 'REMOTE_QUEUE_HOST' in config:
         host = config['REMOTE_QUEUE_HOST']
@@ -313,8 +310,8 @@ def init_active_contour(image_id, friend_id, label_id, simple=False):
         if host:
 
             # command
-            cmd = ['python3', host_base+'/biomedisa_features/active_contour.py']
-            cmd += [image.pic.path.replace(BASE_DIR,host_base), friend.pic.path.replace(BASE_DIR,host_base)]
+            cmd = ['python3', host_base+'/biomedisa/features/active_contour.py']
+            cmd += [image.pic.path.replace(biomedisa.BASE_DIR,host_base), friend.pic.path.replace(biomedisa.BASE_DIR,host_base)]
             cmd += [f'-iid={image.id}', f'-fid={friend.id}', '-r']
 
             # command (append only on demand)
@@ -338,8 +335,8 @@ def init_active_contour(image_id, friend_id, label_id, simple=False):
 
             # send data to host
             success=0
-            success+=send_data_to_host(image.pic.path, host+':'+image.pic.path.replace(BASE_DIR,host_base))
-            success+=send_data_to_host(friend.pic.path, host+':'+friend.pic.path.replace(BASE_DIR,host_base))
+            success+=send_data_to_host(image.pic.path, host+':'+image.pic.path.replace(biomedisa.BASE_DIR,host_base))
+            success+=send_data_to_host(friend.pic.path, host+':'+friend.pic.path.replace(biomedisa.BASE_DIR,host_base))
 
             if success==0:
 
@@ -355,14 +352,14 @@ def init_active_contour(image_id, friend_id, label_id, simple=False):
                 subprocess.Popen(cmd).wait()
 
                 # config
-                success = subprocess.Popen(['scp', host+':'+host_base+'/log/config_4', BASE_DIR+'/log/config_4']).wait()
+                success = subprocess.Popen(['scp', host+':'+host_base+'/log/config_4', biomedisa.BASE_DIR+'/log/config_4']).wait()
 
                 if success==0:
-                    with open(BASE_DIR + '/log/config_4', 'r') as configfile:
+                    with open(biomedisa.BASE_DIR + '/log/config_4', 'r') as configfile:
                         acwe_on_host, _ = configfile.read().split()
 
                     # local file names
-                    path_to_acwe = unique_file_path(acwe_on_host.replace(host_base,BASE_DIR))
+                    path_to_acwe = unique_file_path(acwe_on_host.replace(host_base,biomedisa.BASE_DIR))
 
                     # get results
                     subprocess.Popen(['scp', host+':'+acwe_on_host, path_to_acwe]).wait()