diff --git a/chameleon/base/blocks/conv_block.py b/chameleon/base/blocks/conv_block.py index 6afb808..372976a 100644 --- a/chameleon/base/blocks/conv_block.py +++ b/chameleon/base/blocks/conv_block.py @@ -67,6 +67,10 @@ def __init__( groups=in_channels, bias=False, ) + if inner_norm is not None: + self.inner_norm = COMPONENTS.build(inner_norm) if isinstance(inner_norm, dict) else inner_norm + if inner_act is not None: + self.inner_act = COMPONENTS.build(inner_act) if isinstance(inner_act, dict) else inner_act self.pw_conv = nn.Conv2d( in_channels, out_channels, @@ -75,10 +79,6 @@ def __init__( padding=0, bias=bias, ) - if inner_norm is not None: - self.inner_norm = COMPONENTS.build(inner_norm) if isinstance(inner_norm, dict) else inner_norm - if inner_act is not None: - self.inner_act = COMPONENTS.build(inner_act) if isinstance(inner_act, dict) else inner_act if norm is not None: self.norm = COMPONENTS.build(norm) if isinstance(norm, dict) else norm if act is not None: