tests parameters refactor

Author: ayasyrev

tests/parameters.py

@@ -0,0 +1,14 @@
+from torch import nn
+
+
+def value_name(value) -> str:  # pragma: no cover
+    name = getattr(value, "__name__", None)
+    if name is not None:
+        return name
+    if isinstance(value, nn.Module):
+        return value._get_name()  # pylint: disable=W0212
+    return value
+
+
+def ids_fn(key, value):
+    return [f"{key[:2]}_{value_name(v)}" for v in value]

tests/test_Net.py

@@ -1,10 +1,10 @@
 import torch
-import torch.nn as nn
 
 from model_constructor.net import Net, NewResBlock, ResBlock
 
-# from model_constructor.layers import SEModule, SimpleSelfAttention
+from .parameters import ids_fn
 
+# from model_constructor.layers import SEModule, SimpleSelfAttention
 
 bs_test = 4
 
@@ -24,19 +24,6 @@
 )
 
 
-def value_name(value) -> str:  # pragma: no cover
-    name = getattr(value, "__name__", None)
-    if name is not None:
-        return name
-    if isinstance(value, nn.Module):
-        return value._get_name()  # pylint: disable=W0212
-    return value
-
-
-def ids_fn(key, value):
-    return [f"{key[:2]}_{value_name(v)}" for v in value]
-
-
 def pytest_generate_tests(metafunc):
     for key, value in params.items():
         if key in metafunc.fixturenames:

tests/test_block.py

@@ -1,12 +1,15 @@
 # import pytest
 from functools import partial
+
 import torch
-import torch.nn as nn
-from model_constructor.layers import SEModule, SimpleSelfAttention
+from torch import nn
 
+from model_constructor.layers import SEModule, SimpleSelfAttention
 from model_constructor.model_constructor import ResBlock
 from model_constructor.yaresnet import YaResBlock
 
+from .parameters import ids_fn
+
 bs_test = 4
 img_size = 16
 
@@ -23,19 +26,6 @@
 )
 
 
-def value_name(value) -> str:
-    name = getattr(value, "__name__", None)
-    if name is not None:
-        return name
-    if isinstance(value, nn.Module):
-        return value._get_name()  # pylint: disable=W0212
-    return value
-
-
-def ids_fn(key, value):
-    return [f"{key[:2]}_{value_name(v)}" for v in value]
-
-
 def pytest_generate_tests(metafunc):
     for key, value in params.items():
         if key in metafunc.fixturenames:

tests/test_convmixer.py

@@ -1,8 +1,9 @@
 import torch
-import torch.nn as nn
 
 from model_constructor.convmixer import ConvMixer, ConvMixerOriginal
 
+from .parameters import ids_fn
+
 bs_test = 4
 img_size = 16
 
@@ -13,19 +14,6 @@
 )
 
 
-def value_name(value) -> str:  # pragma: no cover
-    name = getattr(value, "__name__", None)
-    if name is not None:
-        return name
-    if isinstance(value, nn.Module):
-        return value._get_name()  # pylint: disable=W0212
-    return value
-
-
-def ids_fn(key, value):
-    return [f"{key[:2]}_{value_name(v)}" for v in value]
-
-
 def pytest_generate_tests(metafunc):
     for key, value in params.items():
         if key in metafunc.fixturenames:

tests/test_layers.py

@@ -1,16 +1,9 @@
 import torch
-import torch.nn as nn
-
-from model_constructor.layers import (
-    ConvBnAct,
-    Flatten,
-    Noop,
-    SEModule,
-    SEModuleConv,
-    SimpleSelfAttention,
-    noop,
-)
 
+from model_constructor.layers import (ConvBnAct, Flatten, Noop, SEModule,
+                                      SEModuleConv, SimpleSelfAttention, noop)
+
+from .parameters import ids_fn
 
 bs_test = 4
 
@@ -37,19 +30,6 @@
 )
 
 
-def value_name(value) -> str:
-    name = getattr(value, "__name__", None)
-    if name is not None:
-        return name
-    if isinstance(value, nn.Module):  # pragma: no cover
-        return value._get_name()  # pylint: disable=W0212
-    return value
-
-
-def ids_fn(key, value):
-    return [f"{key[:2]}_{value_name(v)}" for v in value]
-
-
 def pytest_generate_tests(metafunc):
     for key, value in params.items():
         if key in metafunc.fixturenames:

tests/test_layers_depr.py

@@ -1,9 +1,9 @@
 # old (deprecated layers)
 import torch
-import torch.nn as nn
 
 from model_constructor.layers import ConvLayer, SEBlock, SEBlockConv
 
+from .parameters import ids_fn
 
 bs_test = 4
 
@@ -28,19 +28,6 @@
 )
 
 
-def value_name(value) -> str:  # pragma: no cover
-    name = getattr(value, "__name__", None)
-    if name is not None:
-        return name
-    if isinstance(value, nn.Module):
-        return value._get_name()  # pylint: disable=W0212
-    return value
-
-
-def ids_fn(key, value):
-    return [f"{key[:2]}_{value_name(v)}" for v in value]
-
-
 def pytest_generate_tests(metafunc):
     for key, value in params.items():
         if key in metafunc.fixturenames:

tests/test_mc.py

@@ -1,8 +1,8 @@
 import torch
 
 from model_constructor import ModelConstructor
-from model_constructor.layers import SEModule, SEModuleConv, SimpleSelfAttention
-
+from model_constructor.layers import (SEModule, SEModuleConv,
+                                      SimpleSelfAttention)
 
 bs_test = 4
 

tests/test_models.py

@@ -1,6 +1,6 @@
 import pytest
 import torch
-import torch.nn as nn
+from torch import nn
 
 from model_constructor.model_constructor import XResNet34, XResNet50
 from model_constructor.yaresnet import YaResNet34, YaResNet50

tests/test_models_old.py

@@ -1,6 +1,6 @@
 import pytest
 import torch
-import torch.nn as nn
+from torch import nn
 
 from model_constructor.mxresnet import mxresnet34, mxresnet50
 from model_constructor.xresnet import xresnet18, xresnet34, xresnet50