docs and fixes at models

Author: ayasyrev

Nbs/001_Blocks.ipynb

@@ -18,27 +18,9 @@
     "#hide\n",
     "import torch\n",
     "import torch.nn as nn\n",
-    "import torch.nn.functional as F\n",
-    "import numpy as np\n",
-    "from collections import OrderedDict\n",
     "\n",
     "from model_constructor.net import Net\n",
-    "from model_constructor.layers import ConvLayer, noop, act_fn, SimpleSelfAttention\n",
-    "\n",
-    "from nbdev.showdoc import show_doc\n",
-    "from IPython.display import Markdown, display"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# hide\n",
-    "def print_doc(func_name):\n",
-    "    doc = show_doc(func_name, title_level=4, disp=False)\n",
-    "    display(Markdown(doc))"
+    "from model_constructor.layers import ConvLayer\n"
    ]
   },
   {
@@ -57,16 +39,6 @@
     "from model_constructor.twist import ConvTwist"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# hide_input\n",
-    "# print_doc(ConvTwist)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -150,7 +122,7 @@
     }
    ],
    "source": [
-    "ConvTwist(64,64)"
+    "ConvTwist(64, 64)"
    ]
   },
   {
@@ -175,7 +147,7 @@
    "source": [
     "ConvTwist.twist = True\n",
     "ConvTwist.permute = False\n",
-    "ConvTwist(64,64)"
+    "ConvTwist(64, 64)"
    ]
   },
   {
@@ -219,7 +191,7 @@
     }
    ],
    "source": [
-    "ConvLayerTwist(64,64, stride=1)"
+    "ConvLayerTwist(64, 64, stride=1)"
    ]
   },
   {
@@ -558,16 +530,6 @@
     "from model_constructor.twist import NewResBlockTwist"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# hide_input\n",
-    "# print_doc(NewResBlockTwist)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -610,7 +572,7 @@
    ],
    "source": [
     "#collapse_output\n",
-    "bl = NewResBlockTwist(4,64,64,sa=True)\n",
+    "bl = NewResBlockTwist(4, 64, 64, sa=True)\n",
     "bl"
    ]
   },
@@ -676,7 +638,7 @@
    ],
    "source": [
     "#collapse_output\n",
-    "bl = NewResBlockTwist(4,64,64,stride=2)\n",
+    "bl = NewResBlockTwist(4, 64, 64, stride=2)\n",
     "bl"
    ]
   },
@@ -746,7 +708,7 @@
    ],
    "source": [
     "#collapse_output\n",
-    "bl = NewResBlockTwist(4,64,128,stride=2)\n",
+    "bl = NewResBlockTwist(4, 64, 128, stride=2)\n",
     "bl"
    ]
   },
@@ -806,7 +768,7 @@
    ],
    "source": [
     "#hide\n",
-    "bl = NewResBlockTwist(1,64,64,sa=True)\n",
+    "bl = NewResBlockTwist(1, 64, 64, sa=True)\n",
     "bl"
    ]
   },
@@ -876,7 +838,14 @@
    ],
    "source": [
     "#collapse_output\n",
-    "bl = NewResBlockTwist(4,64,128,stride=2,act_fn=nn.LeakyReLU(), bn_1st=False)\n",
+    "bl = NewResBlockTwist(\n",
+    "    4,\n",
+    "    64,\n",
+    "    128,\n",
+    "    stride=2,\n",
+    "    act_fn=nn.LeakyReLU(),\n",
+    "    bn_1st=False,\n",
+    ")\n",
     "bl"
    ]
   },
@@ -918,16 +887,6 @@
     "from model_constructor.twist import ResBlockTwist"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#hide_input\n",
-    "# print_doc(ResBlockTwist)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -970,7 +929,7 @@
    ],
    "source": [
     "#collapse_output\n",
-    "bl = ResBlockTwist(4,64,64,sa=True)\n",
+    "bl = ResBlockTwist(4, 64, 64, sa=True)\n",
     "bl"
    ]
   },
@@ -1036,7 +995,7 @@
    ],
    "source": [
     "#collapse_output\n",
-    "bl = ResBlockTwist(4,64,64,stride=2)\n",
+    "bl = ResBlockTwist(4, 64, 64, stride=2)\n",
     "bl"
    ]
   },
@@ -1106,7 +1065,7 @@
    ],
    "source": [
     "#collapse_output\n",
-    "bl = ResBlockTwist(4,64,128,stride=2)\n",
+    "bl = ResBlockTwist(4, 64, 128, stride=2)\n",
     "bl"
    ]
   },
@@ -1145,7 +1104,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "model  = Net(expansion=4, layers=[3,4,6,3])"
+    "model  = Net(expansion=4, layers=[3, 4, 6, 3])"
    ]
   },
   {
@@ -1569,14 +1528,6 @@
      "text": [
       "torch.Size([16, 64, 32, 32])\n"
      ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/home/jzz/anaconda3/envs/mc_dev/lib/python3.9/site-packages/torch/nn/functional.py:718: UserWarning: Named tensors and all their associated APIs are an experimental feature and subject to change. Please do not use them for anything important until they are released as stable. (Triggered internally at  /opt/conda/conda-bld/pytorch_1623448255797/work/c10/core/TensorImpl.h:1156.)\n",
-      "  return torch.max_pool2d(input, kernel_size, stride, padding, dilation, ceil_mode)\n"
-     ]
     }
    ],
    "source": [