merge

MIC-DKFZ · Feb 19, 2024 · 7cec1a5 · 7cec1a5
1 parent f00d6b8
commit 7cec1a5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/nnunetv2/training/nnUNetTrainer/variants/network_architecture/nnUNetTrainerBN.py b/nnunetv2/training/nnUNetTrainer/variants/network_architecture/nnUNetTrainerBN.py
@@ -1,15 +1,5 @@
-<<<<<<< HEAD
-from dynamic_network_architectures.architectures.residual_unet import ResidualEncoderUNet
-from dynamic_network_architectures.architectures.unet import PlainConvUNet
-from dynamic_network_architectures.building_blocks.helper import convert_dim_to_conv_op, get_matching_batchnorm
-from dynamic_network_architectures.initialization.weight_init import init_last_bn_before_add_to_0, InitWeights_He
-from nnunetv2.training.nnUNetTrainer.nnUNetTrainer import nnUNetTrainer
-from nnunetv2.utilities.plans_handling.plans_handler import ConfigurationManager, PlansManager
-=======
 from typing import Union, Tuple, List
-
 from dynamic_network_architectures.building_blocks.helper import get_matching_batchnorm
->>>>>>> feature/improved_network_arch_definition_in_plans
 from torch import nn
 
 from nnunetv2.training.nnUNetTrainer.nnUNetTrainer import nnUNetTrainer

diff --git a/nnunetv2/utilities/get_network_from_plans.py b/nnunetv2/utilities/get_network_from_plans.py
@@ -1,15 +1,5 @@
-<<<<<<< HEAD
-from dynamic_network_architectures.architectures.unet import PlainConvUNet
-from dynamic_network_architectures.architectures.residual_unet import ResidualEncoderUNet
-from dynamic_network_architectures.building_blocks.helper import get_matching_instancenorm, convert_dim_to_conv_op
-from dynamic_network_architectures.initialization.weight_init import init_last_bn_before_add_to_0
-from nnunetv2.utilities.network_initialization import InitWeights_He
-from nnunetv2.utilities.plans_handling.plans_handler import ConfigurationManager, PlansManager
-from torch import nn
-=======
 import pydoc
 from typing import Union
->>>>>>> feature/improved_network_arch_definition_in_plans
 
 
 def get_network_from_plans(arch_class_name, arch_kwargs, arch_kwargs_req_import, input_channels, output_channels,