twist - fix permute param

Author: ayasyrev

docs/Twist.html

@@ -234,7 +234,7 @@ <h1 id="ConvLayerTwist">ConvLayerTwist<a class="anchor-link" href="#ConvLayerTwi
 
 
 <div class="output_markdown rendered_html output_subarea ">
-<h2 id="ConvLayerTwist" class="doc_header"><code>class</code> <code>ConvLayerTwist</code><a href="https://github.com/ayasyrev/model_constructor/tree/master/model_constructor/twist.py#L105" class="source_link" style="float:right">[source]</a></h2><blockquote><p><code>ConvLayerTwist</code>(<strong><code>ni</code></strong>, <strong><code>nf</code></strong>, <strong><code>ks</code></strong>=<em><code>3</code></em>, <strong><code>stride</code></strong>=<em><code>1</code></em>, <strong><code>act</code></strong>=<em><code>True</code></em>, <strong><code>act_fn</code></strong>=<em><code>ReLU(inplace=True)</code></em>, <strong><code>bn_layer</code></strong>=<em><code>True</code></em>, <strong><code>bn_1st</code></strong>=<em><code>True</code></em>, <strong><code>zero_bn</code></strong>=<em><code>False</code></em>, <strong><code>padding</code></strong>=<em><code>None</code></em>, <strong><code>bias</code></strong>=<em><code>False</code></em>, <strong><code>groups</code></strong>=<em><code>1</code></em>, <strong>**<code>kwargs</code></strong>) :: <a href="/model_constructor/layers#ConvLayer"><code>ConvLayer</code></a></p>
+<h2 id="ConvLayerTwist" class="doc_header"><code>class</code> <code>ConvLayerTwist</code><a href="https://github.com/ayasyrev/model_constructor/tree/master/model_constructor/twist.py#L104" class="source_link" style="float:right">[source]</a></h2><blockquote><p><code>ConvLayerTwist</code>(<strong><code>ni</code></strong>, <strong><code>nf</code></strong>, <strong><code>ks</code></strong>=<em><code>3</code></em>, <strong><code>stride</code></strong>=<em><code>1</code></em>, <strong><code>act</code></strong>=<em><code>True</code></em>, <strong><code>act_fn</code></strong>=<em><code>ReLU(inplace=True)</code></em>, <strong><code>bn_layer</code></strong>=<em><code>True</code></em>, <strong><code>bn_1st</code></strong>=<em><code>True</code></em>, <strong><code>zero_bn</code></strong>=<em><code>False</code></em>, <strong><code>padding</code></strong>=<em><code>None</code></em>, <strong><code>bias</code></strong>=<em><code>False</code></em>, <strong><code>groups</code></strong>=<em><code>1</code></em>, <strong>**<code>kwargs</code></strong>) :: <a href="/model_constructor/layers#ConvLayer"><code>ConvLayer</code></a></p>
 </blockquote>
 <p>Basic conv layers block</p>
 
@@ -728,7 +728,7 @@ <h1 id="NewResBlockTwist">NewResBlockTwist<a class="anchor-link" href="#NewResBl
 
 
 <div class="output_markdown rendered_html output_subarea ">
-<h2 id="NewResBlockTwist" class="doc_header"><code>class</code> <code>NewResBlockTwist</code><a href="https://github.com/ayasyrev/model_constructor/tree/master/model_constructor/twist.py#L109" class="source_link" style="float:right">[source]</a></h2><blockquote><p><code>NewResBlockTwist</code>(<strong><code>expansion</code></strong>, <strong><code>ni</code></strong>, <strong><code>nh</code></strong>, <strong><code>stride</code></strong>=<em><code>1</code></em>, <strong><code>conv_layer</code></strong>=<em><code>'ConvLayer'</code></em>, <strong><code>act_fn</code></strong>=<em><code>ReLU(inplace=True)</code></em>, <strong><code>bn_1st</code></strong>=<em><code>True</code></em>, <strong><code>pool</code></strong>=<em><code>AvgPool2d(kernel_size=2, stride=2, padding=0)</code></em>, <strong><code>sa</code></strong>=<em><code>False</code></em>, <strong><code>sym</code></strong>=<em><code>False</code></em>, <strong><code>zero_bn</code></strong>=<em><code>True</code></em>) :: <code>Module</code></p>
+<h2 id="NewResBlockTwist" class="doc_header"><code>class</code> <code>NewResBlockTwist</code><a href="https://github.com/ayasyrev/model_constructor/tree/master/model_constructor/twist.py#L108" class="source_link" style="float:right">[source]</a></h2><blockquote><p><code>NewResBlockTwist</code>(<strong><code>expansion</code></strong>, <strong><code>ni</code></strong>, <strong><code>nh</code></strong>, <strong><code>stride</code></strong>=<em><code>1</code></em>, <strong><code>conv_layer</code></strong>=<em><code>'ConvLayer'</code></em>, <strong><code>act_fn</code></strong>=<em><code>ReLU(inplace=True)</code></em>, <strong><code>bn_1st</code></strong>=<em><code>True</code></em>, <strong><code>pool</code></strong>=<em><code>AvgPool2d(kernel_size=2, stride=2, padding=0)</code></em>, <strong><code>sa</code></strong>=<em><code>False</code></em>, <strong><code>sym</code></strong>=<em><code>False</code></em>, <strong><code>zero_bn</code></strong>=<em><code>True</code></em>) :: <code>Module</code></p>
 </blockquote>
 <p>Base class for all neural network modules.</p>
 <p>Your models should also subclass this class.</p>
@@ -940,7 +940,7 @@ <h1 id="ResBlockTwist">ResBlockTwist<a class="anchor-link" href="#ResBlockTwist"
 
 
 <div class="output_markdown rendered_html output_subarea ">
-<h2 id="ResBlockTwist" class="doc_header"><code>class</code> <code>ResBlockTwist</code><a href="https://github.com/ayasyrev/model_constructor/tree/master/model_constructor/twist.py#L135" class="source_link" style="float:right">[source]</a></h2><blockquote><p><code>ResBlockTwist</code>(<strong><code>expansion</code></strong>, <strong><code>ni</code></strong>, <strong><code>nh</code></strong>, <strong><code>stride</code></strong>=<em><code>1</code></em>, <strong><code>conv_layer</code></strong>=<em><code>'ConvLayer'</code></em>, <strong><code>act_fn</code></strong>=<em><code>ReLU(inplace=True)</code></em>, <strong><code>zero_bn</code></strong>=<em><code>True</code></em>, <strong><code>bn_1st</code></strong>=<em><code>True</code></em>, <strong><code>pool</code></strong>=<em><code>AvgPool2d(kernel_size=2, stride=2, padding=0)</code></em>, <strong><code>sa</code></strong>=<em><code>False</code></em>, <strong><code>sym</code></strong>=<em><code>False</code></em>) :: <code>Module</code></p>
+<h2 id="ResBlockTwist" class="doc_header"><code>class</code> <code>ResBlockTwist</code><a href="https://github.com/ayasyrev/model_constructor/tree/master/model_constructor/twist.py#L134" class="source_link" style="float:right">[source]</a></h2><blockquote><p><code>ResBlockTwist</code>(<strong><code>expansion</code></strong>, <strong><code>ni</code></strong>, <strong><code>nh</code></strong>, <strong><code>stride</code></strong>=<em><code>1</code></em>, <strong><code>conv_layer</code></strong>=<em><code>'ConvLayer'</code></em>, <strong><code>act_fn</code></strong>=<em><code>ReLU(inplace=True)</code></em>, <strong><code>zero_bn</code></strong>=<em><code>True</code></em>, <strong><code>bn_1st</code></strong>=<em><code>True</code></em>, <strong><code>pool</code></strong>=<em><code>AvgPool2d(kernel_size=2, stride=2, padding=0)</code></em>, <strong><code>sa</code></strong>=<em><code>False</code></em>, <strong><code>sym</code></strong>=<em><code>False</code></em>) :: <code>Module</code></p>
 </blockquote>
 <p>Base class for all neural network modules.</p>
 <p>Your models should also subclass this class.</p>

docs/_data/sidebars/home_sidebar.yml

@@ -27,9 +27,6 @@ entries:
     - output: web,pdf
       title: Twist.
       url: /Twist
-    - output: web,pdf
-      title: Title
-      url: /test_xresnet
     output: web
     title: model_constructor
   output: web

docs/sidebar.json

@@ -6,7 +6,6 @@
     "resnet": "/resnet",
     "xresnet": "/xresnet",
     "Net.": "/Net",
-    "Twist.": "/Twist",
-    "Title": "/test_xresnet"
+    "Twist.": "/Twist"
   }
 }

model_constructor/_nbdev.py

@@ -7,9 +7,9 @@
          "Body": "00_constructor.ipynb",
          "Head": "00_constructor.ipynb",
          "init_model": "00_constructor.ipynb",
-         "Net": "81_Net.ipynb",
+         "Net": "04_Net.ipynb",
          "ConvLayer": "01_layers.ipynb",
-         "act_fn": "81_Net.ipynb",
+         "act_fn": "04_Net.ipynb",
          "Flatten": "01_layers.ipynb",
          "noop": "01_layers.ipynb",
          "Noop": "01_layers.ipynb",
@@ -22,33 +22,30 @@
          "SimpleSelfAttention": "01_layers.ipynb",
          "ConvBlockBasic": "01_layers.ipynb",
          "ConvBlockBottle": "01_layers.ipynb",
-         "ResBlock": "81_Net.ipynb",
+         "ResBlock": "04_Net.ipynb",
          "resnet18": "02_resnet.ipynb",
          "resnet34": "02_resnet.ipynb",
          "resnet50": "02_resnet.ipynb",
          "xresnet18": "03_xresnet.ipynb",
          "xresnet34": "03_xresnet.ipynb",
-         "xresnet50": "81_Net.ipynb",
-         "init_cnn": "81_Net.ipynb",
-         "NewResBlock": "81_Net.ipynb",
+         "xresnet50": "03_xresnet.ipynb",
+         "init_cnn": "04_Net.ipynb",
+         "NewResBlock": "04_Net.ipynb",
          "net34": "04_Net.ipynb",
          "net50": "04_Net.ipynb",
          "nn": "05_Twist.ipynb",
          "F": "05_Twist.ipynb",
          "ConvTwist": "05_Twist.ipynb",
          "ConvLayerTwist": "05_Twist.ipynb",
          "NewResBlockTwist": "05_Twist.ipynb",
-         "ResBlockTwist": "05_Twist.ipynb",
-         "NewConvLayer": "81_Net.ipynb",
-         "me": "81_Net.ipynb"}
+         "ResBlockTwist": "05_Twist.ipynb"}
 
 modules = ["constructor.py",
            "layers.py",
            "resnet.py",
            "xresnet.py",
            "net.py",
-           "twist.py",
-           "tst_net_2.py"]
+           "twist.py"]
 
 doc_url = "https://ayasyrev.github.io/model_constructor/"
 

model_constructor/twist.py

@@ -66,10 +66,9 @@ def full_kernel(self, kernel): # permuting the groups
         return KK
 
     def _conv(self, inpt, kernel=None):
-        permute = True
         if kernel is None:
             kernel = self.conv.weight
-        if permute is False:
+        if self.permute is False:
             return F.conv2d(inpt, kernel, padding=1, stride=self.stride, groups=self.groups)
         else:
             return F.conv2d(inpt, self.full_kernel(kernel), padding=1, stride=self.stride, groups=1)

nbs/05_Twist.ipynb

@@ -120,10 +120,9 @@
     "        return KK\n",
     "    \n",
     "    def _conv(self, inpt, kernel=None):\n",
-    "        permute = True\n",
     "        if kernel is None:\n",
     "            kernel = self.conv.weight\n",
-    "        if permute is False:\n",
+    "        if self.permute is False:\n",
     "            return F.conv2d(inpt, kernel, padding=1, stride=self.stride, groups=self.groups)\n",
     "        else:\n",
     "            return F.conv2d(inpt, self.full_kernel(kernel), padding=1, stride=self.stride, groups=1)\n",
@@ -2737,9 +2736,6 @@
       "Converted 03_xresnet.ipynb.\n",
       "Converted 04_Net.ipynb.\n",
       "Converted 05_Twist.ipynb.\n",
-      "Converted 80_test_net.ipynb.\n",
-      "Converted 81_Net.ipynb.\n",
-      "Converted 81_test_xresnet.ipynb.\n",
       "Converted index.ipynb.\n"
      ]
     }