fixes #2931 #2920

.gitignore

@@ -1,3 +1,4 @@
+Untitled*.ipynb
 *.bak
 token
 .idea/

fastai/_nbdev.py

@@ -148,7 +148,7 @@
          "Mish": "01_layers.ipynb",
          "ParameterModule": "01_layers.ipynb",
          "children_and_parameters": "01_layers.ipynb",
-         "nn.Module.has_children": "01_layers.ipynb",
+         "has_children": "01_layers.ipynb",
          "flatten_model": "01_layers.ipynb",
          "NoneReduce": "01_layers.ipynb",
          "in_channels": "01_layers.ipynb",

fastai/layers.py

@@ -7,8 +7,8 @@
            'AvgPool', 'trunc_normal_', 'Embedding', 'SelfAttention', 'PooledSelfAttention2d', 'SimpleSelfAttention',
            'icnr_init', 'PixelShuffle_ICNR', 'sequential', 'SequentialEx', 'MergeLayer', 'Cat', 'SimpleCNN',
            'ProdLayer', 'inplace_relu', 'SEModule', 'ResBlock', 'SEBlock', 'SEResNeXtBlock', 'SeparableBlock', 'swish',
-           'Swish', 'MishJitAutoFn', 'mish', 'Mish', 'ParameterModule', 'children_and_parameters', 'flatten_model',
-           'NoneReduce', 'in_channels']
+           'Swish', 'MishJitAutoFn', 'mish', 'Mish', 'ParameterModule', 'children_and_parameters', 'has_children',
+           'flatten_model', 'NoneReduce', 'in_channels']
 
 # Cell
 from .imports import *
@@ -568,17 +568,15 @@ def children_and_parameters(m):
     return children
 
 # Cell
-def _has_children(m:nn.Module):
+def has_children(m):
     try: next(m.children())
     except StopIteration: return False
     return True
 
-nn.Module.has_children = property(_has_children)
-
 # Cell
 def flatten_model(m):
     "Return the list of all submodules and parameters of `m`"
-    return sum(map(flatten_model,children_and_parameters(m)),[]) if m.has_children else [m]
+    return sum(map(flatten_model,children_and_parameters(m)),[]) if has_children(m) else [m]
 
 # Cell
 class NoneReduce():

nbs/01_layers.ipynb

@@ -137,9 +137,7 @@
       ]
      },
      "execution_count": null,
-     "metadata": {
-      "tags": []
-     },
+     "metadata": {},
      "output_type": "execute_result"
     }
    ],
@@ -1884,12 +1882,10 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "def _has_children(m:nn.Module):\n",
+    "def has_children(m):\n",
     "    try: next(m.children())\n",
     "    except StopIteration: return False\n",
-    "    return True\n",
-    "\n",
-    "nn.Module.has_children = property(_has_children)"
+    "    return True"
    ]
   },
   {
@@ -1899,8 +1895,8 @@
    "outputs": [],
    "source": [
     "class A(Module): pass\n",
-    "assert not A().has_children\n",
-    "assert TstModule().has_children"
+    "assert not has_children(A())\n",
+    "assert has_children(TstModule())"
    ]
   },
   {
@@ -1912,7 +1908,7 @@
     "# export\n",
     "def flatten_model(m):\n",
     "    \"Return the list of all submodules and parameters of `m`\"\n",
-    "    return sum(map(flatten_model,children_and_parameters(m)),[]) if m.has_children else [m]"
+    "    return sum(map(flatten_model,children_and_parameters(m)),[]) if has_children(m) else [m]"
    ]
   },
   {