Skip to content

Commit ea1e7a8

Browse files
jph00jph00
committed
CI
1 parent e3c90ec commit ea1e7a8

2 files changed

Lines changed: 28 additions & 28 deletions

File tree

‎fastcore/parallel.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,18 +191,18 @@ def _f_pg(obj, queue, batch, start_idx):
191191
def _done_pg(queue, items): return (queue.get() for _ in items)
192192

193193
# %% ../nbs/03a_parallel.ipynb #1122caee
194-
def parallel_gen(cls, items, n_workers=defaults.cpus, progress=True, **kwargs):
194+
def parallel_gen(cls, items, n_workers=defaults.cpus, progress=False, **kwargs):
195195
"Instantiate `cls` in `n_workers` procs & call each on a subset of `items` in parallel."
196-
try: from fastprogress import progress_bar
197-
except ImportError: return None
198196
if not parallelable('n_workers', n_workers): n_workers = 0
199197
if n_workers==0:
200198
yield from enumerate(list(cls(**kwargs)(items)))
201199
return
202200
batches = L(chunked(items, n_chunks=n_workers))
203201
idx = L(itertools.accumulate(0 + batches.map(len)))
204202
queue = Queue()
205-
if progress_bar and progress: items = progress_bar(items, leave=False)
203+
if progress:
204+
from fastprogress import progress_bar
205+
items = progress_bar(items, leave=False)
206206
f=partial(_f_pg, cls(**kwargs), queue)
207207
done=partial(_done_pg, queue, items)
208208
yield from run_procs(f, done, L(batches,idx).zip())

‎nbs/03a_parallel.ipynb‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369
"\n",
370370
"---\n",
371371
"\n",
372-
"[source](https://github.com/AnswerDotAI/fastcore/blob/main/fastcore/parallel.py#L84){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
372+
"[source](https://github.com/AnswerDotAI/fastcore/blob/main/fastcore/parallel.py#L87){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
373373
"\n",
374374
"#### ThreadPoolExecutor\n",
375375
"\n",
@@ -446,7 +446,7 @@
446446
"\n",
447447
"---\n",
448448
"\n",
449-
"[source](https://github.com/AnswerDotAI/fastcore/blob/main/fastcore/parallel.py#L103){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
449+
"[source](https://github.com/AnswerDotAI/fastcore/blob/main/fastcore/parallel.py#L106){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
450450
"\n",
451451
"#### ProcessPoolExecutor\n",
452452
"\n",
@@ -580,7 +580,7 @@
580580
"name": "stdout",
581581
"output_type": "stream",
582582
"text": [
583-
"2026-05-13 12:03:52.455303"
583+
"2026-05-13 13:25:26.977693"
584584
]
585585
},
586586
{
@@ -608,7 +608,7 @@
608608
"name": "stdout",
609609
"output_type": "stream",
610610
"text": [
611-
"2026-05-13 12:03:52.557054"
611+
"2026-05-13 13:25:27.079169"
612612
]
613613
},
614614
{
@@ -636,7 +636,7 @@
636636
"name": "stdout",
637637
"output_type": "stream",
638638
"text": [
639-
"2026-05-13 12:03:52.657376"
639+
"2026-05-13 13:25:27.180193"
640640
]
641641
},
642642
{
@@ -664,7 +664,7 @@
664664
"name": "stdout",
665665
"output_type": "stream",
666666
"text": [
667-
"2026-05-13 12:03:52.759358"
667+
"2026-05-13 13:25:27.281662"
668668
]
669669
},
670670
{
@@ -692,7 +692,7 @@
692692
"name": "stdout",
693693
"output_type": "stream",
694694
"text": [
695-
"2026-05-13 12:03:52.861305"
695+
"2026-05-13 13:25:27.382139"
696696
]
697697
},
698698
{
@@ -778,12 +778,12 @@
778778
"name": "stdout",
779779
"output_type": "stream",
780780
"text": [
781-
"0 2026-05-13 12:03:53.038233 2026-05-13 12:03:53.042792 0.003980359732221225\n",
782-
"3 2026-05-13 12:03:53.042931 2026-05-13 12:03:53.043358 0.0003544993380723523\n",
783-
"1 2026-05-13 12:03:53.038254 2026-05-13 12:03:53.050549 0.01144644161379336\n",
784-
"4 2026-05-13 12:03:53.043382 2026-05-13 12:03:53.053678 0.009921241493268762\n",
785-
"2 2026-05-13 12:03:53.038261 2026-05-13 12:03:53.054528 0.01614412958800752\n",
786-
"5 2026-05-13 12:03:53.050601 2026-05-13 12:03:53.071502 0.019838832903686602\n"
781+
"2 2026-05-13 13:25:27.564974 2026-05-13 13:25:27.569803 0.004192140760309271\n",
782+
"1 2026-05-13 13:25:27.564969 2026-05-13 13:25:27.569908 0.004733583519831327\n",
783+
"4 2026-05-13 13:25:27.570059 2026-05-13 13:25:27.575066 0.004417952090144302\n",
784+
"3 2026-05-13 13:25:27.570047 2026-05-13 13:25:27.577781 0.007399881148787446\n",
785+
"0 2026-05-13 13:25:27.564949 2026-05-13 13:25:27.580303 0.015048152922976935\n",
786+
"5 2026-05-13 13:25:27.575107 2026-05-13 13:25:27.580550 0.005396135128260119\n"
787787
]
788788
}
789789
],
@@ -819,24 +819,24 @@
819819
"name": "stdout",
820820
"output_type": "stream",
821821
"text": [
822-
"0 2026-05-13 12:03:53.094637 2026-05-13 12:03:53.103523 0.007845536618852244\n",
823-
"1 2026-05-13 12:03:53.195626 2026-05-13 12:03:53.211603 0.014942779172981509\n"
822+
"0 2026-05-13 13:25:27.603860 2026-05-13 13:25:27.617834 0.012897349937030123\n",
823+
"1 2026-05-13 13:25:27.704777 2026-05-13 13:25:27.735915 0.02999927582214811\n"
824824
]
825825
},
826826
{
827827
"name": "stdout",
828828
"output_type": "stream",
829829
"text": [
830-
"2 2026-05-13 12:03:53.295724 2026-05-13 12:03:53.316481 0.020648367875254866\n",
831-
"3 2026-05-13 12:03:53.395680 2026-05-13 12:03:53.418257 0.021434007873905845\n",
832-
"4 2026-05-13 12:03:53.495474 2026-05-13 12:03:53.504053 0.007492717605635113\n"
830+
"2 2026-05-13 13:25:27.804897 2026-05-13 13:25:27.830147 0.024032506917510476\n",
831+
"3 2026-05-13 13:25:27.904851 2026-05-13 13:25:27.911237 0.005580292386023334\n",
832+
"4 2026-05-13 13:25:28.004162 2026-05-13 13:25:28.006516 0.001997318249937352\n"
833833
]
834834
},
835835
{
836836
"name": "stdout",
837837
"output_type": "stream",
838838
"text": [
839-
"5 2026-05-13 12:03:53.595719 2026-05-13 12:03:53.615570 0.018688364392410103\n"
839+
"5 2026-05-13 13:25:28.104945 2026-05-13 13:25:28.117438 0.011197564731975381\n"
840840
]
841841
}
842842
],
@@ -935,7 +935,7 @@
935935
"output_type": "stream",
936936
"text": [
937937
"Traceback (most recent call last):\n",
938-
" File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_58354/1179310912.py\", line 2, in _fail\n",
938+
" File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_62209/1179310912.py\", line 2, in _fail\n",
939939
" async def _fail(): raise ValueError(\"this error will be printed\")\n",
940940
" ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
941941
"ValueError: this error will be printed\n"
@@ -991,18 +991,18 @@
991991
"outputs": [],
992992
"source": [
993993
"#| export\n",
994-
"def parallel_gen(cls, items, n_workers=defaults.cpus, progress=True, **kwargs):\n",
994+
"def parallel_gen(cls, items, n_workers=defaults.cpus, progress=False, **kwargs):\n",
995995
" \"Instantiate `cls` in `n_workers` procs & call each on a subset of `items` in parallel.\"\n",
996-
" try: from fastprogress import progress_bar\n",
997-
" except ImportError: return None\n",
998996
" if not parallelable('n_workers', n_workers): n_workers = 0\n",
999997
" if n_workers==0:\n",
1000998
" yield from enumerate(list(cls(**kwargs)(items)))\n",
1001999
" return\n",
10021000
" batches = L(chunked(items, n_chunks=n_workers))\n",
10031001
" idx = L(itertools.accumulate(0 + batches.map(len)))\n",
10041002
" queue = Queue()\n",
1005-
" if progress_bar and progress: items = progress_bar(items, leave=False)\n",
1003+
" if progress:\n",
1004+
" from fastprogress import progress_bar\n",
1005+
" items = progress_bar(items, leave=False)\n",
10061006
" f=partial(_f_pg, cls(**kwargs), queue)\n",
10071007
" done=partial(_done_pg, queue, items)\n",
10081008
" yield from run_procs(f, done, L(batches,idx).zip())"

0 commit comments

Comments
 (0)
⚡