Consistency handling None / empty string inputs to norm / act create fns

rwightman · rwightman · commit f7762fee7840 · 2023-11-03T11:01:41.000-07:00
diff --git a/timm/layers/create_act.py b/timm/layers/create_act.py
@@ -132,11 +132,13 @@ def get_act_layer(name: Union[Type[nn.Module], str] = 'relu'):
     Fetching activation layers by name with this function allows export or torch script friendly
     functions to be returned dynamically based on current config.
     """
-    if not name:
+    if name is None:
         return None
     if not isinstance(name, str):
         # callable, module, etc
         return name
+    if not name:
+        return None
     if not (is_no_jit() or is_exportable() or is_scriptable()):
         if name in _ACT_LAYER_ME:
             return _ACT_LAYER_ME[name]
diff --git a/timm/layers/create_norm.py b/timm/layers/create_norm.py
@@ -34,8 +34,7 @@ def create_norm_layer(layer_name, num_features, **kwargs):
 
 
 def get_norm_layer(norm_layer):
-    if not norm_layer:
-        # None or '' should return None
+    if norm_layer is None:
         return None
     assert isinstance(norm_layer, (type, str, types.FunctionType, functools.partial))
     norm_kwargs = {}
@@ -46,6 +45,8 @@ def get_norm_layer(norm_layer):
         norm_layer = norm_layer.func
 
     if isinstance(norm_layer, str):
+        if not norm_layer:
+            return None
         layer_name = norm_layer.replace('_', '')
         norm_layer = _NORM_MAP[layer_name]
     else:
diff --git a/timm/layers/create_norm_act.py b/timm/layers/create_norm_act.py
@@ -50,6 +50,8 @@ def create_norm_act_layer(layer_name, num_features, act_layer=None, apply_act=Tr
 
 
 def get_norm_act_layer(norm_layer, act_layer=None):
+    if norm_layer is None:
+        return None
     assert isinstance(norm_layer, (type, str,  types.FunctionType, functools.partial))
     assert act_layer is None or isinstance(act_layer, (type, str, types.FunctionType, functools.partial))
     norm_act_kwargs = {}
@@ -60,8 +62,10 @@ def get_norm_act_layer(norm_layer, act_layer=None):
         norm_layer = norm_layer.func
 
     if isinstance(norm_layer, str):
+        if not norm_layer:
+            return None
         layer_name = norm_layer.replace('_', '').lower().split('-')[0]
-        norm_act_layer = _NORM_ACT_MAP.get(layer_name, None)
+        norm_act_layer = _NORM_ACT_MAP[layer_name]
     elif norm_layer in _NORM_ACT_TYPES:
         norm_act_layer = norm_layer
     elif isinstance(norm_layer,  types.FunctionType):
