fix test

Author: jph00

fastcore/_nbdev.py

@@ -172,8 +172,8 @@
          "threaded": "03a_parallel.ipynb",
          "startthread": "03a_parallel.ipynb",
          "set_num_threads": "03a_parallel.ipynb",
-         "ProcessPoolExecutor": "03a_parallel.ipynb",
          "ThreadPoolExecutor": "03a_parallel.ipynb",
+         "ProcessPoolExecutor": "03a_parallel.ipynb",
          "parallel": "03a_parallel.ipynb",
          "run_procs": "03a_parallel.ipynb",
          "parallel_gen": "03a_parallel.ipynb",

fastcore/parallel.py

@@ -1,6 +1,6 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: nbs/03a_parallel.ipynb (unless otherwise specified).
 
-__all__ = ['threaded', 'startthread', 'set_num_threads', 'ProcessPoolExecutor', 'ThreadPoolExecutor', 'parallel',
+__all__ = ['threaded', 'startthread', 'set_num_threads', 'ThreadPoolExecutor', 'ProcessPoolExecutor', 'parallel',
            'run_procs', 'parallel_gen']
 
 # Cell
@@ -54,8 +54,8 @@ def _call(lock, pause, n, g, item):
     return g(item)
 
 # Cell
-class ProcessPoolExecutor(concurrent.futures.ProcessPoolExecutor):
-    "Same as Python's ProcessPoolExecutor, except can pass `max_workers==0` for serial execution"
+class ThreadPoolExecutor(concurrent.futures.ThreadPoolExecutor):
+    "Same as Python's ThreadPoolExecutor, except can pass `max_workers==0` for serial execution"
     def __init__(self, max_workers=defaults.cpus, on_exc=print, pause=0, **kwargs):
         if max_workers is None: max_workers=defaults.cpus
         store_attr()
@@ -72,8 +72,8 @@ def map(self, f, items, *args, timeout=None, chunksize=1, **kwargs):
         except Exception as e: self.on_exc(e)
 
 # Cell
-class ThreadPoolExecutor(concurrent.futures.ThreadPoolExecutor):
-    "Same as Python's ThreadPoolExecutor, except can pass `max_workers==0` for serial execution"
+class ProcessPoolExecutor(concurrent.futures.ProcessPoolExecutor):
+    "Same as Python's ProcessPoolExecutor, except can pass `max_workers==0` for serial execution"
     def __init__(self, max_workers=defaults.cpus, on_exc=print, pause=0, **kwargs):
         if max_workers is None: max_workers=defaults.cpus
         store_attr()

nbs/03a_parallel.ipynb

@@ -70,7 +70,16 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "first\n",
+      "second\n"
+     ]
+    }
+   ],
    "source": [
     "@threaded\n",
     "def _1():\n",
@@ -83,7 +92,8 @@
     "    print(\"first\")\n",
     "\n",
     "_1()\n",
-    "_2();"
+    "_2()\n",
+    "time.sleep(0.1)"
    ]
   },
   {
@@ -107,7 +117,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "first\n"
+      "first\n",
+      "second\n"
      ]
     }
    ],
@@ -120,7 +131,9 @@
     "@startthread\n",
     "def _():\n",
     "    time.sleep(0.01)\n",
-    "    print(\"first\")"
+    "    print(\"first\")\n",
+    "\n",
+    "time.sleep(0.1)"
    ]
   },
   {
@@ -155,15 +168,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "first\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "#export\n",
     "def _call(lock, pause, n, g, item):\n",
@@ -184,8 +189,8 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "class ProcessPoolExecutor(concurrent.futures.ProcessPoolExecutor):\n",
-    "    \"Same as Python's ProcessPoolExecutor, except can pass `max_workers==0` for serial execution\"\n",
+    "class ThreadPoolExecutor(concurrent.futures.ThreadPoolExecutor):\n",
+    "    \"Same as Python's ThreadPoolExecutor, except can pass `max_workers==0` for serial execution\"\n",
     "    def __init__(self, max_workers=defaults.cpus, on_exc=print, pause=0, **kwargs):\n",
     "        if max_workers is None: max_workers=defaults.cpus\n",
     "        store_attr()\n",
@@ -202,15 +207,41 @@
     "        except Exception as e: self.on_exc(e)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/markdown": [
+       "<h4 id=\"ThreadPoolExecutor\" class=\"doc_header\"><code>class</code> <code>ThreadPoolExecutor</code><a href=\"\" class=\"source_link\" style=\"float:right\">[source]</a></h4>\n",
+       "\n",
+       "> <code>ThreadPoolExecutor</code>(**`max_workers`**=*`64`*, **`on_exc`**=*`print`*, **`pause`**=*`0`*, **\\*\\*`kwargs`**) :: [`ThreadPoolExecutor`](/parallel.html#ThreadPoolExecutor)\n",
+       "\n",
+       "Same as Python's ThreadPoolExecutor, except can pass `max_workers==0` for serial execution"
+      ],
+      "text/plain": [
+       "<IPython.core.display.Markdown object>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
+   "source": [
+    "show_doc(ThreadPoolExecutor, title_level=4)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
     "#export\n",
-    "class ThreadPoolExecutor(concurrent.futures.ThreadPoolExecutor):\n",
-    "    \"Same as Python's ThreadPoolExecutor, except can pass `max_workers==0` for serial execution\"\n",
+    "class ProcessPoolExecutor(concurrent.futures.ProcessPoolExecutor):\n",
+    "    \"Same as Python's ProcessPoolExecutor, except can pass `max_workers==0` for serial execution\"\n",
     "    def __init__(self, max_workers=defaults.cpus, on_exc=print, pause=0, **kwargs):\n",
     "        if max_workers is None: max_workers=defaults.cpus\n",
     "        store_attr()\n",
@@ -368,11 +399,11 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "0 2020-12-11 18:28:04.960255\n",
-      "1 2020-12-11 18:28:05.211221\n",
-      "2 2020-12-11 18:28:05.461427\n",
-      "3 2020-12-11 18:28:05.711582\n",
-      "4 2020-12-11 18:28:05.962502\n"
+      "1 2020-12-11 19:32:27.930895\n",
+      "0 2020-12-11 19:32:28.181040\n",
+      "2 2020-12-11 19:32:28.431867\n",
+      "3 2020-12-11 19:32:28.682935\n",
+      "4 2020-12-11 19:32:28.933846\n"
      ]
     }
    ],

nbs/08_script.ipynb

@@ -375,7 +375,7 @@
     "def f(required:Param(\"Required param\", int),\n",
     "      a:Param(\"param 1\", bool_arg),\n",
     "      b:Param(\"param 2\", str)=\"test\",\n",
-    "      c:Param(\"param 3\", en)=_en.aa):\n",
+    "      c:Param(\"param 3\", _en)=_en.aa):\n",
     "    \"my docs\"\n",
     "    ...\n",
     "\n",