diff --git a/Brain_study/ABSTRACT/figures.py b/Brain_study/ABSTRACT/figures.py index b6f6f51dbe3c9c1b3480560602b51a65cc6ff3c5..991961b0eb56f2a43587d5324de22397e426108e 100644 --- a/Brain_study/ABSTRACT/figures.py +++ b/Brain_study/ABSTRACT/figures.py @@ -10,7 +10,7 @@ from matplotlib import cm from matplotlib.colors import ListedColormap, LinearSegmentedColormap, to_rgba, CSS4_COLORS import tikzplotlib -from DeepDeformationMapRegistration.utils.misc import segmentation_ohe_to_cardinal +from ddmr.utils.misc import segmentation_ohe_to_cardinal # segm_cm = np.asarray([to_rgba(CSS4_COLORS[c], 1) for c in CSS4_COLORS.keys()]) # # segm_cm.sort() diff --git a/Brain_study/Build_test_set.py b/Brain_study/Build_test_set.py index 9997fa40560fc75c55d415a3e3608d5989b94843..62cd7939f75e22a71af3a62a53e3685f2323c3c0 100644 --- a/Brain_study/Build_test_set.py +++ b/Brain_study/Build_test_set.py @@ -14,11 +14,11 @@ import tensorflow as tf import numpy as np import h5py -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.layers import AugmentationLayer -from DeepDeformationMapRegistration.utils.visualization import save_disp_map_img, plot_predictions -from DeepDeformationMapRegistration.utils.misc import get_segmentations_centroids, DisplacementMapInterpolator +import ddmr.utils.constants as C +from ddmr.utils.nifti_utils import save_nifti +from ddmr.layers import AugmentationLayer +from ddmr.utils.visualization import save_disp_map_img, plot_predictions +from ddmr.utils.misc import get_segmentations_centroids, DisplacementMapInterpolator from tqdm import tqdm diff --git a/Brain_study/Evaluate_network.py b/Brain_study/Evaluate_network.py index 6310bd50f22bedb28bf6ba8daf7e19de62abc013..1f1feb27ef98800d7d54c3fed73f93fa7b3743ef 100644 --- a/Brain_study/Evaluate_network.py +++ b/Brain_study/Evaluate_network.py @@ -16,14 +16,14 @@ import numpy as np import pandas as pd import voxelmorph as vxm -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.layers import AugmentationLayer -from DeepDeformationMapRegistration.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated -from DeepDeformationMapRegistration.utils.visualization import save_disp_map_img, plot_predictions -from DeepDeformationMapRegistration.utils.misc import segmentation_ohe_to_cardinal +import ddmr.utils.constants as C +from ddmr.utils.nifti_utils import save_nifti +from ddmr.layers import AugmentationLayer +from ddmr.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity +from ddmr.utils.acummulated_optimizer import AdamAccumulated +from ddmr.utils.visualization import save_disp_map_img, plot_predictions +from ddmr.utils.misc import segmentation_ohe_to_cardinal from EvaluationScripts.Evaluate_class import EvaluationFigures, resize_pts_to_original_space, resize_img_to_original_space, resize_transformation from scipy.interpolate import RegularGridInterpolator from tqdm import tqdm diff --git a/Brain_study/Evaluate_network__test_fixed.py b/Brain_study/Evaluate_network__test_fixed.py index e22f9eed9bfabe9687554c2dbbc2002a5aed0089..4d582d33aeae409433070a619d2a3b0a4847e60e 100644 --- a/Brain_study/Evaluate_network__test_fixed.py +++ b/Brain_study/Evaluate_network__test_fixed.py @@ -17,16 +17,16 @@ import numpy as np import pandas as pd import voxelmorph as vxm -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.operators import min_max_norm, safe_medpy_metric -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.layers import AugmentationLayer, UncertaintyWeighting -from DeepDeformationMapRegistration.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion, target_registration_error -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated -from DeepDeformationMapRegistration.utils.visualization import save_disp_map_img, plot_predictions -from DeepDeformationMapRegistration.utils.misc import resize_displacement_map, scale_transformation -from DeepDeformationMapRegistration.utils.misc import DisplacementMapInterpolator, get_segmentations_centroids, segmentation_ohe_to_cardinal +import ddmr.utils.constants as C +from ddmr.utils.operators import min_max_norm, safe_medpy_metric +from ddmr.utils.nifti_utils import save_nifti +from ddmr.layers import AugmentationLayer, UncertaintyWeighting +from ddmr.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion, target_registration_error +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity +from ddmr.utils.acummulated_optimizer import AdamAccumulated +from ddmr.utils.visualization import save_disp_map_img, plot_predictions +from ddmr.utils.misc import resize_displacement_map, scale_transformation +from ddmr.utils.misc import DisplacementMapInterpolator, get_segmentations_centroids, segmentation_ohe_to_cardinal from EvaluationScripts.Evaluate_class import EvaluationFigures, resize_pts_to_original_space, resize_img_to_original_space, resize_transformation from scipy.ndimage import zoom from tqdm import tqdm diff --git a/Brain_study/MultiTrain_config.py b/Brain_study/MultiTrain_config.py index ef5bc89454dbfefc9787af6343b3755dc21ad9a8..f8d858adc2de9002e36905259521ca7eaad33c05 100644 --- a/Brain_study/MultiTrain_config.py +++ b/Brain_study/MultiTrain_config.py @@ -7,7 +7,7 @@ import argparse from configparser import ConfigParser from datetime import datetime -import DeepDeformationMapRegistration.utils.constants as C +import ddmr.utils.constants as C TRAIN_DATASET = '/mnt/EncryptedData1/Users/javier/ext_datasets/IXI_dataset/T1/training' diff --git a/Brain_study/Train_Baseline.py b/Brain_study/Train_Baseline.py index f4e81ad0107618e886dd13284647561f2fec0739..93883a5240c87f93d6aad9aa3b2f073c9da6ae47 100644 --- a/Brain_study/Train_Baseline.py +++ b/Brain_study/Train_Baseline.py @@ -19,13 +19,13 @@ import neurite as ne import h5py import pickle -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.losses import NCC, StructuralSimilarity, StructuralSimilarity_simplified -from DeepDeformationMapRegistration.utils.misc import try_mkdir, DatasetCopy, function_decorator -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated -from DeepDeformationMapRegistration.layers import AugmentationLayer -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity, _MSSSIM_WEIGHTS +import ddmr.utils.constants as C +from ddmr.losses import NCC, StructuralSimilarity, StructuralSimilarity_simplified +from ddmr.utils.misc import try_mkdir, DatasetCopy, function_decorator +from ddmr.utils.acummulated_optimizer import AdamAccumulated +from ddmr.layers import AugmentationLayer +from ddmr.utils.nifti_utils import save_nifti +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity, _MSSSIM_WEIGHTS from Brain_study.data_generator import BatchGenerator from Brain_study.utils import SummaryDictionary, named_logs diff --git a/Brain_study/Train_SegmentationGuided.py b/Brain_study/Train_SegmentationGuided.py index f2eeda63051769b57d804bed8a3bfd05db092421..7e4501f33db70c47dcbbf6ceacd16aea58b300f0 100644 --- a/Brain_study/Train_SegmentationGuided.py +++ b/Brain_study/Train_SegmentationGuided.py @@ -18,13 +18,13 @@ import h5py from datetime import datetime import pickle -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.misc import try_mkdir, function_decorator -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.losses import NCC, HausdorffDistanceErosion, GeneralizedDICEScore, StructuralSimilarity_simplified -from DeepDeformationMapRegistration.layers import AugmentationLayer -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity, _MSSSIM_WEIGHTS -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated +import ddmr.utils.constants as C +from ddmr.utils.misc import try_mkdir, function_decorator +from ddmr.utils.nifti_utils import save_nifti +from ddmr.losses import NCC, HausdorffDistanceErosion, GeneralizedDICEScore, StructuralSimilarity_simplified +from ddmr.layers import AugmentationLayer +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity, _MSSSIM_WEIGHTS +from ddmr.utils.acummulated_optimizer import AdamAccumulated from Brain_study.data_generator import BatchGenerator from Brain_study.utils import SummaryDictionary, named_logs diff --git a/Brain_study/Train_UncertaintyWeighted.py b/Brain_study/Train_UncertaintyWeighted.py index c255a5e20649b251f514f3c31ab184151f2a0054..e26a1a83c52378b152c00b1351145f33d5cb468f 100644 --- a/Brain_study/Train_UncertaintyWeighted.py +++ b/Brain_study/Train_UncertaintyWeighted.py @@ -16,13 +16,13 @@ import h5py from datetime import datetime import pickle -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.misc import try_mkdir, DatasetCopy, function_decorator -from DeepDeformationMapRegistration.networks import WeaklySupervised -from DeepDeformationMapRegistration.losses import HausdorffDistanceErosion, NCC, StructuralSimilarity_simplified, GeneralizedDICEScore -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity, _MSSSIM_WEIGHTS -from DeepDeformationMapRegistration.layers import UncertaintyWeighting, AugmentationLayer -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated +import ddmr.utils.constants as C +from ddmr.utils.misc import try_mkdir, DatasetCopy, function_decorator +from ddmr.networks import WeaklySupervised +from ddmr.losses import HausdorffDistanceErosion, NCC, StructuralSimilarity_simplified, GeneralizedDICEScore +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity, _MSSSIM_WEIGHTS +from ddmr.layers import UncertaintyWeighting, AugmentationLayer +from ddmr.utils.acummulated_optimizer import AdamAccumulated from Brain_study.data_generator import BatchGenerator from Brain_study.utils import SummaryDictionary, named_logs diff --git a/Brain_study/data_generator.py b/Brain_study/data_generator.py index cabaa9ae7d15d54e9280f089603ddfb8eeec3ee7..c3c3c7012307c8feb042c2e0c38a709f5ad75421 100644 --- a/Brain_study/data_generator.py +++ b/Brain_study/data_generator.py @@ -12,10 +12,10 @@ from skimage.exposure import equalize_adapthist from scipy.ndimage import zoom import tensorflow as tf -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.operators import min_max_norm -from DeepDeformationMapRegistration.utils.misc import segmentation_cardinal_to_ohe -from DeepDeformationMapRegistration.utils.thin_plate_splines import ThinPlateSplines +import ddmr.utils.constants as C +from ddmr.utils.operators import min_max_norm +from ddmr.utils.misc import segmentation_cardinal_to_ohe +from ddmr.utils.thin_plate_splines import ThinPlateSplines from voxelmorph.tf.layers import SpatialTransformer from Brain_study.format_dataset import SEGMENTATION_NR2LBL_LUT, SEGMENTATION_LBL2NR_LUT diff --git a/Brain_study/test_datagenerator.py b/Brain_study/test_datagenerator.py index 8aa53f3dbe84d675ddd4c6660f8f85323b4e7a9e..a21e1a8b91ccde69ffae1cb14c48acb9ba23b35c 100644 --- a/Brain_study/test_datagenerator.py +++ b/Brain_study/test_datagenerator.py @@ -1,6 +1,6 @@ from Brain_study.data_generator import BatchGenerator -import DeepDeformationMapRegistration.utils.constants as C +import ddmr.utils.constants as C from tqdm import tqdm from tensorflow import keras @@ -8,8 +8,8 @@ import tensorflow as tf from tensorflow.keras.callbacks import TensorBoard import os import voxelmorph as vxm -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated -from DeepDeformationMapRegistration.losses import NCC, StructuralSimilarity, StructuralSimilarity_simplified +from ddmr.utils.acummulated_optimizer import AdamAccumulated +from ddmr.losses import NCC, StructuralSimilarity, StructuralSimilarity_simplified def named_logs(model, logs, validation=False): diff --git a/Brain_study/utils.py b/Brain_study/utils.py index 4244b8c69c4aa3590cd18b408ca5efad67b05f67..85eb756bfc18aad5ae9b87f810759816fa424c45 100644 --- a/Brain_study/utils.py +++ b/Brain_study/utils.py @@ -1,5 +1,5 @@ import numpy as np -import DeepDeformationMapRegistration.utils.constants as C +import ddmr.utils.constants as C class SummaryDictionary: def __init__(self, model, batch_size, accumulative_gradients_step=None): diff --git a/COMET/Build_test_set.py b/COMET/Build_test_set.py index ff0a8bed88008ed5749d5f685fc0f5a646f2f702..26c21a07d1cb2a2e8a4196366ff51edca4708d9f 100644 --- a/COMET/Build_test_set.py +++ b/COMET/Build_test_set.py @@ -14,11 +14,11 @@ import tensorflow as tf import numpy as np import h5py -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.layers import AugmentationLayer -from DeepDeformationMapRegistration.utils.visualization import save_disp_map_img, plot_predictions -from DeepDeformationMapRegistration.utils.misc import DisplacementMapInterpolator +import ddmr.utils.constants as C +from ddmr.utils.nifti_utils import save_nifti +from ddmr.layers import AugmentationLayer +from ddmr.utils.visualization import save_disp_map_img, plot_predictions +from ddmr.utils.misc import DisplacementMapInterpolator from tqdm import tqdm from Brain_study.data_generator import BatchGenerator diff --git a/COMET/COMET_train.py b/COMET/COMET_train.py index 8fc589ead300145185907848ba80dd8db66fb252..837d406e075a2345e05664092cfd36a398aca73b 100644 --- a/COMET/COMET_train.py +++ b/COMET/COMET_train.py @@ -14,14 +14,14 @@ from tensorflow.keras import Input from tensorflow.keras.models import Model from tensorflow.python.framework.errors import InvalidArgumentError -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity -from DeepDeformationMapRegistration.ms_ssim_tf import _MSSSIM_WEIGHTS -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated -from DeepDeformationMapRegistration.utils.misc import function_decorator -from DeepDeformationMapRegistration.layers import AugmentationLayer -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti +import ddmr.utils.constants as C +from ddmr.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity +from ddmr.ms_ssim_tf import _MSSSIM_WEIGHTS +from ddmr.utils.acummulated_optimizer import AdamAccumulated +from ddmr.utils.misc import function_decorator +from ddmr.layers import AugmentationLayer +from ddmr.utils.nifti_utils import save_nifti from Brain_study.data_generator import BatchGenerator from Brain_study.utils import SummaryDictionary, named_logs diff --git a/COMET/COMET_train_UW.py b/COMET/COMET_train_UW.py index b6fc71925f4aa7cc9f1d2a2f3840c507a4403307..2bc5655e4b088f0e3d2c20353eb6affe838fc0b7 100644 --- a/COMET/COMET_train_UW.py +++ b/COMET/COMET_train_UW.py @@ -12,15 +12,15 @@ from tensorflow.keras import Input from tensorflow.keras.models import Model from tensorflow.python.framework.errors import InvalidArgumentError -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, \ +import ddmr.utils.constants as C +from ddmr.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, \ HausdorffDistanceErosion -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity -from DeepDeformationMapRegistration.ms_ssim_tf import _MSSSIM_WEIGHTS -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated -from DeepDeformationMapRegistration.utils.misc import function_decorator -from DeepDeformationMapRegistration.layers import AugmentationLayer, UncertaintyWeighting -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity +from ddmr.ms_ssim_tf import _MSSSIM_WEIGHTS +from ddmr.utils.acummulated_optimizer import AdamAccumulated +from ddmr.utils.misc import function_decorator +from ddmr.layers import AugmentationLayer, UncertaintyWeighting +from ddmr.utils.nifti_utils import save_nifti from Brain_study.data_generator import BatchGenerator from Brain_study.utils import SummaryDictionary, named_logs diff --git a/COMET/COMET_train_seggguided.py b/COMET/COMET_train_seggguided.py index 97b02fabd6eedf3e8cadc1d47b586d8ab938d37f..e706456029e76330244599c2a3481861f52d1810 100644 --- a/COMET/COMET_train_seggguided.py +++ b/COMET/COMET_train_seggguided.py @@ -14,14 +14,14 @@ from tensorflow.keras import Input from tensorflow.keras.models import Model from tensorflow.python.framework.errors import InvalidArgumentError -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity -from DeepDeformationMapRegistration.ms_ssim_tf import _MSSSIM_WEIGHTS -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated -from DeepDeformationMapRegistration.utils.misc import function_decorator -from DeepDeformationMapRegistration.layers import AugmentationLayer -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti +import ddmr.utils.constants as C +from ddmr.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity +from ddmr.ms_ssim_tf import _MSSSIM_WEIGHTS +from ddmr.utils.acummulated_optimizer import AdamAccumulated +from ddmr.utils.misc import function_decorator +from ddmr.layers import AugmentationLayer +from ddmr.utils.nifti_utils import save_nifti from Brain_study.data_generator import BatchGenerator from Brain_study.utils import SummaryDictionary, named_logs diff --git a/COMET/Evaluate_network.py b/COMET/Evaluate_network.py index cdffcccbcd957c393ec5c9a96167f90f8494c2b9..f45177f1f43e361381b76b1f023162b5157e1f75 100644 --- a/COMET/Evaluate_network.py +++ b/COMET/Evaluate_network.py @@ -19,16 +19,16 @@ import pandas as pd import voxelmorph as vxm from voxelmorph.tf.layers import SpatialTransformer -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.operators import min_max_norm, safe_medpy_metric -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.layers import AugmentationLayer, UncertaintyWeighting -from DeepDeformationMapRegistration.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion, target_registration_error -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity -from DeepDeformationMapRegistration.utils.acummulated_optimizer import AdamAccumulated -from DeepDeformationMapRegistration.utils.visualization import save_disp_map_img, plot_predictions -from DeepDeformationMapRegistration.utils.misc import DisplacementMapInterpolator, get_segmentations_centroids, segmentation_ohe_to_cardinal, segmentation_cardinal_to_ohe -from DeepDeformationMapRegistration.utils.misc import resize_displacement_map, scale_transformation, GaussianFilter +import ddmr.utils.constants as C +from ddmr.utils.operators import min_max_norm, safe_medpy_metric +from ddmr.utils.nifti_utils import save_nifti +from ddmr.layers import AugmentationLayer, UncertaintyWeighting +from ddmr.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion, target_registration_error +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity +from ddmr.utils.acummulated_optimizer import AdamAccumulated +from ddmr.utils.visualization import save_disp_map_img, plot_predictions +from ddmr.utils.misc import DisplacementMapInterpolator, get_segmentations_centroids, segmentation_ohe_to_cardinal, segmentation_cardinal_to_ohe +from ddmr.utils.misc import resize_displacement_map, scale_transformation, GaussianFilter import medpy.metric as medpy_metrics from EvaluationScripts.Evaluate_class import EvaluationFigures, resize_pts_to_original_space, resize_img_to_original_space, resize_transformation from scipy.interpolate import RegularGridInterpolator diff --git a/COMET/MultiTrain_config.py b/COMET/MultiTrain_config.py index 0cb5f70e961ca0e1b0c30d3c16d32146cd9c86fd..0e3680c6f193da71fb30e49a4e87b3a3a71ae5e9 100644 --- a/COMET/MultiTrain_config.py +++ b/COMET/MultiTrain_config.py @@ -8,7 +8,7 @@ from configparser import ConfigParser from shutil import copy2 import os from datetime import datetime -import DeepDeformationMapRegistration.utils.constants as C +import ddmr.utils.constants as C import re from COMET.augmentation_constants import LAYER_SELECTION TRAIN_DATASET = '/mnt/EncryptedData1/Users/javier/ext_datasets/COMET_dataset/OSLO_COMET_CT/Formatted_128x128x128/train' diff --git a/COMET/format_dataset.py b/COMET/format_dataset.py index f3f3bbc0e9f11739a538d46d42cf1e7583d730ba..28abd12214cf648282c4da2f959de4d690a0062f 100644 --- a/COMET/format_dataset.py +++ b/COMET/format_dataset.py @@ -16,8 +16,8 @@ from scipy.ndimage.morphology import binary_dilation, generate_binary_structure import pandas as pd -from DeepDeformationMapRegistration.utils import constants as C -from DeepDeformationMapRegistration.utils.misc import segmentation_cardinal_to_ohe, segmentation_ohe_to_cardinal +from ddmr.utils import constants as C +from ddmr.utils.misc import segmentation_cardinal_to_ohe, segmentation_ohe_to_cardinal SEGMENTATION_NR2LBL_LUT = {0: 'background', 1: 'parenchyma', diff --git a/Centerline/centerline.py b/Centerline/centerline.py index 61eafc1542eb7141e9b03562e550411390e71029..5a660bcf69cd77be974633a11b05368da5d47127 100644 --- a/Centerline/centerline.py +++ b/Centerline/centerline.py @@ -29,8 +29,8 @@ from Centerline.graph_utils import graph_to_ndarray, deform_graph, get_bifurcati from Centerline.skeleton_to_graph import get_graph_from_skeleton from Centerline.visualization_utils import plot_skeleton, compare_graphs -from DeepDeformationMapRegistration.utils.operators import min_max_norm -from DeepDeformationMapRegistration.utils import constants as C +from ddmr.utils.operators import min_max_norm +from ddmr.utils import constants as C import cupy from cupyx.scipy.ndimage import zoom as zoom_gpu @@ -39,7 +39,7 @@ from cupyx.scipy.ndimage import map_coordinates DATASET_LOCATION = '/mnt/EncryptedData1/Users/javier/vessel_registration/3Dirca/dataset/EVAL' DATASET_NAMES = ['Affine', 'None', 'Translation'] DATASET_FILENAME = 'volume' -IMGS_FOLDER = '/home/jpdefrutos/workspace/DeepDeformationMapRegistration/Centerline/centerlines' +IMGS_FOLDER = '/home/jpdefrutos/workspace/ddmr/Centerline/centerlines' DATASTE_RAW_FILES = '/mnt/EncryptedData1/Users/javier/vessel_registration/3Dirca/nifti3' LITS_SEGMENTATION_FILE = 'segmentation' diff --git a/Centerline/get_vessels.py b/Centerline/get_vessels.py index 66445f037efafb064956a5607219f12410e6c0fb..404867f3443ff8737cf4c0ea3b42ae720f49bbbd 100644 --- a/Centerline/get_vessels.py +++ b/Centerline/get_vessels.py @@ -1,8 +1,8 @@ -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti +from ddmr.utils.nifti_utils import save_nifti from tqdm import tqdm import os import h5py -import DeepDeformationMapRegistration.utils.constants as C +import ddmr.utils.constants as C DATASET_LOCATION = '/mnt/EncryptedData1/Users/javier/vessel_registration/3Dirca/dataset/EVAL' DATASET_NAMES = ['Affine', 'None', 'Translation'] diff --git a/Centerline/visualization_utils.py b/Centerline/visualization_utils.py index 365ee402d1bf78a44112d4fef2786c814d232361..88cd6ca317806ba320365d656e243553eb15c281 100644 --- a/Centerline/visualization_utils.py +++ b/Centerline/visualization_utils.py @@ -2,7 +2,7 @@ import matplotlib.pyplot as plt from mpl_toolkits.mplot3d import Axes3D from matplotlib.lines import Line2D import numpy as np -from DeepDeformationMapRegistration.utils.visualization import add_axes_arrows_3d, remove_tick_labels, set_axes_size +from ddmr.utils.visualization import add_axes_arrows_3d, remove_tick_labels, set_axes_size import os diff --git a/Datasets/check_dataset.py b/Datasets/check_dataset.py index a1193d9a75c70440da338ecb322275d4266d57d8..63907f1c2e80380bb06911ba00041d227760f15e 100644 --- a/Datasets/check_dataset.py +++ b/Datasets/check_dataset.py @@ -2,7 +2,7 @@ import os import h5py import numpy as np from tqdm import tqdm -import DeepDeformationMapRegistration.utils.constants as C +import ddmr.utils.constants as C os.environ['CUDA_VISIBLE_DEVICES'] = '0' diff --git a/Datasets/irca_pre_processing.py b/Datasets/irca_pre_processing.py index 45379f062da644ed73778d36576cbfb8d6952e90..89cc323208ceadd46f9299e6b1dc3007539b5ae2 100644 --- a/Datasets/irca_pre_processing.py +++ b/Datasets/irca_pre_processing.py @@ -9,8 +9,8 @@ import zipfile import re import dicom2nifti as d2n import nibabel as nib -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.utils.misc import try_mkdir +from ddmr.utils.nifti_utils import save_nifti +from ddmr.utils.misc import try_mkdir from tqdm import tqdm import shutil diff --git a/Datasets/ircad_dataset.py b/Datasets/ircad_dataset.py index e9783c8aa74b27830434e8f99c1873bf4cea5c37..7abb9333749865a9ec1f9666d448bbf721f16975 100644 --- a/Datasets/ircad_dataset.py +++ b/Datasets/ircad_dataset.py @@ -26,8 +26,8 @@ import re currentdir = os.path.dirname(os.path.realpath(__file__)) parentdir = os.path.dirname(currentdir) sys.path.append(parentdir) # PYTHON > 3.3 does not allow relative referencing -from DeepDeformationMapRegistration.utils.cmd_args_parser import parse_arguments -import DeepDeformationMapRegistration.utils.constants as const +from ddmr.utils.cmd_args_parser import parse_arguments +import ddmr.utils.constants as const from tools.thinPlateSplines_tf import ThinPlateSplines from keras_model.ext.neuron.layers import SpatialTransformer from tools.voxelMorph import interpn diff --git a/EvaluationScripts/Evaluate_3d_weaklySupervised.py b/EvaluationScripts/Evaluate_3d_weaklySupervised.py index e820ed8fd108e596534adf14cc73f30a084521fb..e7882c252ce1208225c13183bf1e82c6d2679ee0 100644 --- a/EvaluationScripts/Evaluate_3d_weaklySupervised.py +++ b/EvaluationScripts/Evaluate_3d_weaklySupervised.py @@ -11,13 +11,13 @@ import voxelmorph as vxm import neurite as ne from datetime import datetime -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.data_generator import DataGeneratorManager -from DeepDeformationMapRegistration.utils.misc import try_mkdir -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.networks import WeaklySupervised -from DeepDeformationMapRegistration.losses import HausdorffDistanceErosion -from DeepDeformationMapRegistration.layers import UncertaintyWeighting +import ddmr.utils.constants as C +from ddmr.data_generator import DataGeneratorManager +from ddmr.utils.misc import try_mkdir +from ddmr.utils.nifti_utils import save_nifti +from ddmr.networks import WeaklySupervised +from ddmr.losses import HausdorffDistanceErosion +from ddmr.layers import UncertaintyWeighting os.environ['CUDA_DEVICE_ORDER'] = C.DEV_ORDER diff --git a/EvaluationScripts/Evaluate_class.py b/EvaluationScripts/Evaluate_class.py index 71144bebc5028159735e14ba46e407f48733c3e6..9f6cf8f3d235c516bdfe885529e197020833cb33 100644 --- a/EvaluationScripts/Evaluate_class.py +++ b/EvaluationScripts/Evaluate_class.py @@ -6,8 +6,8 @@ from medpy.metric.binary import dc, hd95 import numpy as np import pandas as pd import os -from DeepDeformationMapRegistration.utils.constants import EPS -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti +from ddmr.utils.constants import EPS +from ddmr.utils.nifti_utils import save_nifti from skimage.transform import resize from skimage.measure import regionprops, label diff --git a/SoA_methods/eval_ants.py b/SoA_methods/eval_ants.py index 6c3a1cb7e02a13a380d869ebc3e26de4bfe8af20..1e785e7f4dbc9194c525844b457432c7d8f6788b 100644 --- a/SoA_methods/eval_ants.py +++ b/SoA_methods/eval_ants.py @@ -12,12 +12,12 @@ currentdir = os.path.dirname(os.path.realpath(__file__)) parentdir = os.path.dirname(currentdir) sys.path.append(parentdir) # PYTHON > 3.3 does not allow relative referencing -from DeepDeformationMapRegistration.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion, target_registration_error -from DeepDeformationMapRegistration.ms_ssim_tf import MultiScaleStructuralSimilarity -from DeepDeformationMapRegistration.utils.misc import DisplacementMapInterpolator, segmentation_ohe_to_cardinal -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.utils.visualization import save_disp_map_img, plot_predictions -import DeepDeformationMapRegistration.utils.constants as C +from ddmr.losses import StructuralSimilarity_simplified, NCC, GeneralizedDICEScore, HausdorffDistanceErosion, target_registration_error +from ddmr.ms_ssim_tf import MultiScaleStructuralSimilarity +from ddmr.utils.misc import DisplacementMapInterpolator, segmentation_ohe_to_cardinal +from ddmr.utils.nifti_utils import save_nifti +from ddmr.utils.visualization import save_disp_map_img, plot_predictions +import ddmr.utils.constants as C import shutil import medpy.metric as medpy_metrics @@ -30,7 +30,7 @@ import tensorflow as tf DATASET_LOCATION = '/mnt/EncryptedData1/Users/javier/vessel_registration/3Dirca/dataset/EVAL' DATASET_NAMES = 'test_sample_\d{4}.h5' DATASET_FILENAME = 'volume' -IMGS_FOLDER = '/home/jpdefrutos/workspace/DeepDeformationMapRegistration/Centerline/imgs' +IMGS_FOLDER = '/home/jpdefrutos/workspace/ddmr/Centerline/imgs' WARPED_MOV = 'warpedmovout' WARPED_FIX = 'warpedfixout' diff --git a/TrainingScripts/Train_2d.py b/TrainingScripts/Train_2d.py index 1f122b66583a58161b9ec85dcd71a391a2829b45..121f180ca8ec17fca567c78ca39251f009c16457 100644 --- a/TrainingScripts/Train_2d.py +++ b/TrainingScripts/Train_2d.py @@ -11,10 +11,10 @@ from tensorflow.keras.callbacks import ModelCheckpoint, TensorBoard, EarlyStoppi import voxelmorph as vxm from datetime import datetime -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.data_generator import DataGeneratorManager2D -from DeepDeformationMapRegistration.utils.misc import try_mkdir -from DeepDeformationMapRegistration.losses import HausdorffDistanceErosion +import ddmr.utils.constants as C +from ddmr.data_generator import DataGeneratorManager2D +from ddmr.utils.misc import try_mkdir +from ddmr.losses import HausdorffDistanceErosion os.environ['CUDA_DEVICE_ORDER'] = C.DEV_ORDER diff --git a/TrainingScripts/Train_2d_uncertaintyWeighting.py b/TrainingScripts/Train_2d_uncertaintyWeighting.py index 17af200bcd6827054e8c3f10dc44940f193bf3ae..27cf7fc8d3a6c924ff458a1f9069cc18a52a94e2 100644 --- a/TrainingScripts/Train_2d_uncertaintyWeighting.py +++ b/TrainingScripts/Train_2d_uncertaintyWeighting.py @@ -14,11 +14,11 @@ import neurite as ne import h5py from datetime import datetime -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.data_generator import DataGeneratorManager2D -from DeepDeformationMapRegistration.utils.misc import try_mkdir -from DeepDeformationMapRegistration.losses import HausdorffDistanceErosion -from DeepDeformationMapRegistration.layers import UncertaintyWeighting +import ddmr.utils.constants as C +from ddmr.data_generator import DataGeneratorManager2D +from ddmr.utils.misc import try_mkdir +from ddmr.losses import HausdorffDistanceErosion +from ddmr.layers import UncertaintyWeighting os.environ['CUDA_DEVICE_ORDER'] = C.DEV_ORDER diff --git a/TrainingScripts/Train_3d.py b/TrainingScripts/Train_3d.py index 31bf7f8fa422afd0def178c025abe3e291996f34..ddb57d64cfb9eeb2ae50dd14d2d344b899be6ba0 100644 --- a/TrainingScripts/Train_3d.py +++ b/TrainingScripts/Train_3d.py @@ -13,10 +13,10 @@ import neurite as ne import h5py from datetime import datetime -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.data_generator import DataGeneratorManager -from DeepDeformationMapRegistration.losses import NCC -from DeepDeformationMapRegistration.utils.misc import try_mkdir +import ddmr.utils.constants as C +from ddmr.data_generator import DataGeneratorManager +from ddmr.losses import NCC +from ddmr.utils.misc import try_mkdir os.environ['CUDA_DEVICE_ORDER'] = C.DEV_ORDER diff --git a/TrainingScripts/Train_3d_weaklySupervised.py b/TrainingScripts/Train_3d_weaklySupervised.py index fa746f18bfd54c981d17e1bec0cf859e85c39fbf..f4477481ceb29a7d512a0632f84b2bc81164cacc 100644 --- a/TrainingScripts/Train_3d_weaklySupervised.py +++ b/TrainingScripts/Train_3d_weaklySupervised.py @@ -13,12 +13,12 @@ import neurite as ne import h5py from datetime import datetime -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.data_generator import DataGeneratorManager -from DeepDeformationMapRegistration.utils.misc import try_mkdir -from DeepDeformationMapRegistration.networks import WeaklySupervised -from DeepDeformationMapRegistration.losses import HausdorffDistanceErosion -from DeepDeformationMapRegistration.layers import UncertaintyWeighting +import ddmr.utils.constants as C +from ddmr.data_generator import DataGeneratorManager +from ddmr.utils.misc import try_mkdir +from ddmr.networks import WeaklySupervised +from ddmr.losses import HausdorffDistanceErosion +from ddmr.layers import UncertaintyWeighting os.environ['CUDA_DEVICE_ORDER'] = C.DEV_ORDER diff --git a/DeepDeformationMapRegistration/__init__.py b/ddmr/__init__.py similarity index 100% rename from DeepDeformationMapRegistration/__init__.py rename to ddmr/__init__.py diff --git a/DeepDeformationMapRegistration/callbacks.py b/ddmr/callbacks.py similarity index 100% rename from DeepDeformationMapRegistration/callbacks.py rename to ddmr/callbacks.py diff --git a/DeepDeformationMapRegistration/data_generator.py b/ddmr/data_generator.py similarity index 99% rename from DeepDeformationMapRegistration/data_generator.py rename to ddmr/data_generator.py index f5b514906974ae07c5b3807ba496c2a9aa23a243..5bc3bdfac07163eab91f11dda088c9dceadcc282 100644 --- a/DeepDeformationMapRegistration/data_generator.py +++ b/ddmr/data_generator.py @@ -10,9 +10,9 @@ from skimage.exposure import equalize_adapthist from scipy.ndimage import zoom import tensorflow as tf -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.operators import min_max_norm -from DeepDeformationMapRegistration.utils.thin_plate_splines import ThinPlateSplines +import ddmr.utils.constants as C +from ddmr.utils.operators import min_max_norm +from ddmr.utils.thin_plate_splines import ThinPlateSplines from voxelmorph.tf.layers import SpatialTransformer diff --git a/DeepDeformationMapRegistration/layers.py b/ddmr/layers.py similarity index 99% rename from DeepDeformationMapRegistration/layers.py rename to ddmr/layers.py index 740f0f5ccbac8e653b4cdf0b6ef40401c683a99b..c65aaba63d5f1faf776b40cb96e8ad3c66523da7 100644 --- a/DeepDeformationMapRegistration/layers.py +++ b/ddmr/layers.py @@ -11,7 +11,7 @@ import tensorflow.keras.backend as K import tensorflow as tf import numpy as np -from DeepDeformationMapRegistration.utils.operators import soft_threshold +from ddmr.utils.operators import soft_threshold class UncertaintyWeighting(kl.Layer): diff --git a/DeepDeformationMapRegistration/layers/SpatialTransformer.py b/ddmr/layers/SpatialTransformer.py similarity index 98% rename from DeepDeformationMapRegistration/layers/SpatialTransformer.py rename to ddmr/layers/SpatialTransformer.py index 5265b2460a3f298c13f739fd6825f97f51dacb56..995bcd31d46ccdff8646b5650b6b639be1cef240 100644 --- a/DeepDeformationMapRegistration/layers/SpatialTransformer.py +++ b/ddmr/layers/SpatialTransformer.py @@ -4,7 +4,7 @@ import tensorflow as tf import neurite as ne import h5py -from DeepDeformationMapRegistration.utils.constants import IMG_SHAPE, DISP_MAP_SHAPE +from ddmr.utils.constants import IMG_SHAPE, DISP_MAP_SHAPE class SpatialTransformer(kl.Layer): diff --git a/DeepDeformationMapRegistration/layers/__init__.py b/ddmr/layers/__init__.py similarity index 100% rename from DeepDeformationMapRegistration/layers/__init__.py rename to ddmr/layers/__init__.py diff --git a/DeepDeformationMapRegistration/layers/augmentation.py b/ddmr/layers/augmentation.py similarity index 98% rename from DeepDeformationMapRegistration/layers/augmentation.py rename to ddmr/layers/augmentation.py index 577c1e68816b924720659220e20ddd0b40e6bb2f..e5c92339e79457ae6eac446ead6f70b6b45303fc 100644 --- a/DeepDeformationMapRegistration/layers/augmentation.py +++ b/ddmr/layers/augmentation.py @@ -10,9 +10,9 @@ import tensorflow.keras.layers as kl import tensorflow as tf from tensorflow.python.framework.errors import InvalidArgumentError -from DeepDeformationMapRegistration.utils.operators import soft_threshold, gaussian_kernel, sample_unique -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.thin_plate_splines import ThinPlateSplines +from ddmr.utils.operators import soft_threshold, gaussian_kernel, sample_unique +import ddmr.utils.constants as C +from ddmr.utils.thin_plate_splines import ThinPlateSplines from voxelmorph.tf.layers import SpatialTransformer diff --git a/DeepDeformationMapRegistration/layers/b_splines.py b/ddmr/layers/b_splines.py similarity index 100% rename from DeepDeformationMapRegistration/layers/b_splines.py rename to ddmr/layers/b_splines.py diff --git a/DeepDeformationMapRegistration/layers/depthwise_conv_3d.py b/ddmr/layers/depthwise_conv_3d.py similarity index 100% rename from DeepDeformationMapRegistration/layers/depthwise_conv_3d.py rename to ddmr/layers/depthwise_conv_3d.py diff --git a/DeepDeformationMapRegistration/layers/uncertainty_weighting.py b/ddmr/layers/uncertainty_weighting.py similarity index 98% rename from DeepDeformationMapRegistration/layers/uncertainty_weighting.py rename to ddmr/layers/uncertainty_weighting.py index 917f9b6a4cccf96f3fafa186fc5bd4d590a0e1bb..e0269fbc59aba7d3a58602ab4485bba28b29db6c 100644 --- a/DeepDeformationMapRegistration/layers/uncertainty_weighting.py +++ b/ddmr/layers/uncertainty_weighting.py @@ -12,9 +12,9 @@ import tensorflow as tf import numpy as np import random -from DeepDeformationMapRegistration.utils.operators import soft_threshold, gaussian_kernel, sample_unique -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.thin_plate_splines import ThinPlateSplines +from ddmr.utils.operators import soft_threshold, gaussian_kernel, sample_unique +import ddmr.utils.constants as C +from ddmr.utils.thin_plate_splines import ThinPlateSplines from voxelmorph.tf.layers import SpatialTransformer from neurite.tf.utils import resize #from cupyx.scipy.ndimage import zoom diff --git a/DeepDeformationMapRegistration/layers/upsampling.py b/ddmr/layers/upsampling.py similarity index 100% rename from DeepDeformationMapRegistration/layers/upsampling.py rename to ddmr/layers/upsampling.py diff --git a/DeepDeformationMapRegistration/losses.py b/ddmr/losses.py similarity index 99% rename from DeepDeformationMapRegistration/losses.py rename to ddmr/losses.py index c9c339f12ad9372a72a9894ac513b04bb1f8b54a..9d4e9d03da23d5c2159ed17676bdad22767a13b5 100644 --- a/DeepDeformationMapRegistration/losses.py +++ b/ddmr/losses.py @@ -3,9 +3,9 @@ import tensorflow.keras.backend as K from scipy.ndimage import generate_binary_structure from sklearn.utils.extmath import cartesian -from DeepDeformationMapRegistration.utils.operators import soft_threshold, min_max_norm, hard_threshold -from DeepDeformationMapRegistration.utils.constants import EPS_tf -from DeepDeformationMapRegistration.utils.misc import function_decorator +from ddmr.utils.operators import soft_threshold, min_max_norm, hard_threshold +from ddmr.utils.constants import EPS_tf +from ddmr.utils.misc import function_decorator import numpy as np import warnings diff --git a/DeepDeformationMapRegistration/main.py b/ddmr/main.py similarity index 96% rename from DeepDeformationMapRegistration/main.py rename to ddmr/main.py index 1cb0e2c75496c1bed1c7d445fd97edcc5fcf5086..5fea2bb54140c1ae490dd761a467920150a7c5e3 100644 --- a/DeepDeformationMapRegistration/main.py +++ b/ddmr/main.py @@ -14,13 +14,13 @@ from scipy.ndimage import gaussian_filter, zoom from skimage.measure import regionprops import SimpleITK as sitk -from DeepDeformationMapRegistration.layers.SpatialTransformer import SpatialTransformer -import DeepDeformationMapRegistration.utils.constants as C -from DeepDeformationMapRegistration.utils.nifti_utils import save_nifti -from DeepDeformationMapRegistration.utils.operators import min_max_norm -from DeepDeformationMapRegistration.utils.misc import resize_displacement_map -from DeepDeformationMapRegistration.utils.model_utils import get_models_path, load_model, get_spatialtransformer_model -from DeepDeformationMapRegistration.utils.logger import LOGGER +import ddmr.utils.constants as C +from ddmr.utils.nifti_utils import save_nifti +from ddmr.layers.SpatialTransformer import SpatialTransformer +from ddmr.utils.operators import min_max_norm +from ddmr.utils.misc import resize_displacement_map +from ddmr.utils.model_utils import get_models_path, load_model, get_spatialtransformer_model +from ddmr.utils.logger import LOGGER from importlib.util import find_spec @@ -282,8 +282,7 @@ def main(): ST_MODEL_FILE = get_spatialtransformer_model() network, registration_model = load_model(MODEL_FILE, False, True) - spatialtransformer_model = tf.keras.models.load_model(ST_MODEL_FILE, - custom_objects={'SpatialTransformer': SpatialTransformer}) + spatialtransformer_model = tf.keras.models.load_model(ST_MODEL_FILE, custom_objects={'SpatialTransformer': SpatialTransformer}) LOGGER.info('Computing registration') with sess.as_default(): diff --git a/DeepDeformationMapRegistration/ms_ssim_tf.py b/ddmr/ms_ssim_tf.py similarity index 99% rename from DeepDeformationMapRegistration/ms_ssim_tf.py rename to ddmr/ms_ssim_tf.py index d856dbe82459e059e5b7717dabee9463f95996bb..5a5de0c5781308b77d0380cee1ca92834e295ddb 100644 --- a/DeepDeformationMapRegistration/ms_ssim_tf.py +++ b/ddmr/ms_ssim_tf.py @@ -9,7 +9,7 @@ from tensorflow.python.ops import control_flow_ops from tensorflow.python.ops import nn from tensorflow.python.util.tf_export import tf_export from tensorflow.python.util import dispatch -from DeepDeformationMapRegistration.utils.misc import function_decorator +from ddmr.utils.misc import function_decorator @tf_export('image.convert_image_dtype') @@ -606,7 +606,7 @@ if __name__ == '__main__': tf.enable_eager_execution() import nibabel as nib import numpy as np - from DeepDeformationMapRegistration.utils.operators import min_max_norm + from ddmr.utils.operators import min_max_norm from skimage.metrics import structural_similarity img1 = nib.load('test_images/ixi_image.nii.gz') diff --git a/DeepDeformationMapRegistration/networks.py b/ddmr/networks.py similarity index 100% rename from DeepDeformationMapRegistration/networks.py rename to ddmr/networks.py diff --git a/DeepDeformationMapRegistration/utils/__init__.py b/ddmr/utils/__init__.py similarity index 100% rename from DeepDeformationMapRegistration/utils/__init__.py rename to ddmr/utils/__init__.py diff --git a/DeepDeformationMapRegistration/utils/acummulated_optimizer.py b/ddmr/utils/acummulated_optimizer.py similarity index 100% rename from DeepDeformationMapRegistration/utils/acummulated_optimizer.py rename to ddmr/utils/acummulated_optimizer.py diff --git a/DeepDeformationMapRegistration/utils/cmd_args_parser.py b/ddmr/utils/cmd_args_parser.py similarity index 98% rename from DeepDeformationMapRegistration/utils/cmd_args_parser.py rename to ddmr/utils/cmd_args_parser.py index 42db347aa6782e3cf0d12ef96e24f7330cc38845..ea828c2d1af863badb1c0b268be316e5f56f01ae 100644 --- a/DeepDeformationMapRegistration/utils/cmd_args_parser.py +++ b/ddmr/utils/cmd_args_parser.py @@ -1,5 +1,5 @@ import sys, getopt -import DeepDeformationMapRegistration.utils.constants as C +import ddmr.utils.constants as C import os diff --git a/DeepDeformationMapRegistration/utils/conf_file_utils.py b/ddmr/utils/conf_file_utils.py similarity index 97% rename from DeepDeformationMapRegistration/utils/conf_file_utils.py rename to ddmr/utils/conf_file_utils.py index 143d1d3a3b9dae26eb985b23e71d587d5c2e1dc4..567b1ae71e9215853aa42edc80553d06dbad915e 100644 --- a/DeepDeformationMapRegistration/utils/conf_file_utils.py +++ b/ddmr/utils/conf_file_utils.py @@ -1,4 +1,4 @@ -import DeepDeformationMapRegistration.utils.constants as C +import ddmr.utils.constants as C import re import os diff --git a/DeepDeformationMapRegistration/utils/constants.py b/ddmr/utils/constants.py similarity index 100% rename from DeepDeformationMapRegistration/utils/constants.py rename to ddmr/utils/constants.py diff --git a/DeepDeformationMapRegistration/utils/logger.py b/ddmr/utils/logger.py similarity index 100% rename from DeepDeformationMapRegistration/utils/logger.py rename to ddmr/utils/logger.py diff --git a/DeepDeformationMapRegistration/utils/misc.py b/ddmr/utils/misc.py similarity index 98% rename from DeepDeformationMapRegistration/utils/misc.py rename to ddmr/utils/misc.py index ebbdc3342b7391a84c3ecd904b03da58d5406369..5dbc706eefa63a8ef0b3f1406cae1c8765ff325d 100644 --- a/DeepDeformationMapRegistration/utils/misc.py +++ b/ddmr/utils/misc.py @@ -4,8 +4,8 @@ import shutil import numpy as np from scipy.interpolate import griddata, Rbf, LinearNDInterpolator, NearestNDInterpolator from skimage.measure import regionprops -from DeepDeformationMapRegistration.layers.b_splines import interpolate_spline -from DeepDeformationMapRegistration.utils.thin_plate_splines import ThinPlateSplines +from ddmr.layers.b_splines import interpolate_spline +from ddmr.utils.thin_plate_splines import ThinPlateSplines from tensorflow import squeeze from scipy.ndimage import zoom import tensorflow as tf diff --git a/DeepDeformationMapRegistration/utils/model_utils.py b/ddmr/utils/model_utils.py similarity index 94% rename from DeepDeformationMapRegistration/utils/model_utils.py rename to ddmr/utils/model_utils.py index 275113de63844b8285675c867fcdf98d4b800ee4..80ae3661e8ce5a4cd7cc33f2e8762676c734d1bb 100644 --- a/DeepDeformationMapRegistration/utils/model_utils.py +++ b/ddmr/utils/model_utils.py @@ -2,9 +2,9 @@ import os import requests from datetime import datetime from email.utils import parsedate_to_datetime, formatdate -from DeepDeformationMapRegistration.utils.constants import ANATOMIES, MODEL_TYPES, ENCODER_FILTERS, DECODER_FILTERS, IMG_SHAPE +from ddmr.utils.constants import ANATOMIES, MODEL_TYPES, ENCODER_FILTERS, DECODER_FILTERS, IMG_SHAPE import voxelmorph as vxm -from DeepDeformationMapRegistration.utils.logger import LOGGER +from ddmr.utils.logger import LOGGER # taken from: https://lenon.dev/blog/downloading-and-caching-large-files-using-python/ diff --git a/DeepDeformationMapRegistration/utils/nifti_utils.py b/ddmr/utils/nifti_utils.py similarity index 100% rename from DeepDeformationMapRegistration/utils/nifti_utils.py rename to ddmr/utils/nifti_utils.py diff --git a/DeepDeformationMapRegistration/utils/operators.py b/ddmr/utils/operators.py similarity index 100% rename from DeepDeformationMapRegistration/utils/operators.py rename to ddmr/utils/operators.py diff --git a/DeepDeformationMapRegistration/utils/thin_plate_splines.py b/ddmr/utils/thin_plate_splines.py similarity index 100% rename from DeepDeformationMapRegistration/utils/thin_plate_splines.py rename to ddmr/utils/thin_plate_splines.py diff --git a/DeepDeformationMapRegistration/utils/user_interface.py b/ddmr/utils/user_interface.py similarity index 100% rename from DeepDeformationMapRegistration/utils/user_interface.py rename to ddmr/utils/user_interface.py diff --git a/DeepDeformationMapRegistration/utils/visualization.py b/ddmr/utils/visualization.py similarity index 99% rename from DeepDeformationMapRegistration/utils/visualization.py rename to ddmr/utils/visualization.py index d9b29cd324c3d4aa8f4edc290060f2b7bd3f638d..1a68240ffdc526ea46b73bec6e765ca5f3d8b7b6 100644 --- a/DeepDeformationMapRegistration/utils/visualization.py +++ b/ddmr/utils/visualization.py @@ -8,7 +8,7 @@ from matplotlib import cm from mpl_toolkits.axes_grid1 import make_axes_locatable import tensorflow as tf import numpy as np -import DeepDeformationMapRegistration.utils.constants as C +import ddmr.utils.constants as C from skimage.exposure import rescale_intensity import scipy.misc as scpmisc import os diff --git a/demo/requirements.txt b/demo/requirements.txt index 21d3103c1e63744c5342fbf0b7786c5a3735d708..0603acb4072bc3d5a416e048a123ec06b00fccbc 100644 --- a/demo/requirements.txt +++ b/demo/requirements.txt @@ -1,2 +1,2 @@ -deepdeformationmapregistration @ git+https://github.com/jpdefrutos/DDMR.git +ddmr @ git+https://github.com/jpdefrutos/DDMR.git gradio==3.44.4 diff --git a/setup.py b/setup.py index cf358d6a1de1b994813a7abeb1b8fe4219aeced4..d0fc027a81978ae8fc6137c57b3b3a8c4f801a57 100644 --- a/setup.py +++ b/setup.py @@ -8,9 +8,9 @@ with open("requirements.txt", "r") as f: reqs = [line.strip('\n') for line in f.readlines()] setup( - name='DeepDeformationMapRegistration', - py_modules=['DeepDeformationMapRegistration'], - packages=find_packages(include=['DeepDeformationMapRegistration', 'DeepDeformationMapRegistration.*'], + name='ddmr', + py_modules=['ddmr'], + packages=find_packages(include=['ddmr', 'ddmr.*'], exclude=['test_images', 'test_images.*']), version='1.0', description='Deep-registration training toolkit', @@ -37,6 +37,6 @@ setup( 'h5py' ], entry_points={ - 'console_scripts': ['ddmr=DeepDeformationMapRegistration.main:main'] + 'console_scripts': ['ddmr=ddmr.main:main'] } )