cleanup resnet; tuts; configs

Author: slegroux

config/model/image/convnetx.yaml

@@ -4,7 +4,7 @@ num_classes: 10 #default value overridden by hydra at instantiation if necessary
 
 nnet:
   _target_: nimrod.models.conv.ConvNet
-  n_features: [1, 8, 16, 32, 64, 128]  # channel/feature expansion
+  n_features: [1, 8, 16, 32, 16]  # channel/feature expansion
   num_classes: ${..num_classes}  # number of output classes
   kernel_size: 3  # convolution kernel size
   bias: null  # disable bias since using BatchNorm

config/model/image/resnetx.yaml

@@ -1,19 +1,11 @@
-_target_: nimrod.models.conv.ConvNetX
+_target_: nimrod.models.resnet.ResNetX
 _partial_: true
 num_classes: 10 #default value overridden by hydra at instantiation if necessary
 
 nnet:
-  _target_: nimrod.models.conv.ConvNet
-  n_features: [1, 8, 16, 32, 64, 128]  # channel/feature expansion
+  _target_: nimrod.models.resnet.ResNet
+  n_features: [1, 8, 16, 32, 16]  # channel/feature expansion
   num_classes: ${..num_classes}  # number of output classes
-  kernel_size: 3  # convolution kernel size
-  bias: null  # disable bias since using BatchNorm
-  normalization: 
-    _target_: hydra.utils.get_class
-    path: torch.nn.BatchNorm2d
-  activation:
-    _target_: hydra.utils.get_class
-    path: torch.nn.ReLU
 
 # optimizer
 # scheduler

nbs/models.conv.ipynb

@@ -20,16 +20,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "The autoreload extension is already loaded. To reload it, use:\n",
-      "  %reload_ext autoreload\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "#| hide\n",
     "%load_ext autoreload\n",
@@ -41,7 +32,16 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "[15:21:53] INFO - PyTorch version 2.5.1 available.\n",
+      "Seed set to 42\n"
+     ]
+    }
+   ],
    "source": [
     "#| export\n",
     "import torch.nn as nn\n",
@@ -479,6 +479,11 @@
     "### Usage"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1695,7 +1700,15 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "Seed set to 42\n"
+     ]
+    }
+   ],
    "source": [
     "cfg = OmegaConf.load('../config/model/image/convnetx.yaml')\n",
     "model = instantiate(cfg.nnet)"