ANL-CEEESA/MIPLearn
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/MIPLearn.git synced 2025-12-06 01:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Only use p_tqdm is n_jobs>1

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-05-20 08:39:51 -05:00
parent 13373c2573
commit 659131c8cf
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
miplearn/components/component.py
View File

@@ -198,6 +198,9 @@ class Component:
instance.free() instance.free()
return pre_instance return pre_instance
if n_jobs == 1:
pre = [_pre_sample_xy(instance) for instance in instances]
else:
pre = p_umap(_pre_sample_xy, instances, num_cpus=n_jobs) pre = p_umap(_pre_sample_xy, instances, num_cpus=n_jobs)
pre_combined: Dict = {} pre_combined: Dict = {}
for (cname, comp) in components.items(): for (cname, comp) in components.items():
@@ -229,6 +232,9 @@ class Component:
instance.free() instance.free()
return x_instance, y_instance return x_instance, y_instance
if n_jobs == 1:
xy = [_sample_xy(instance) for instance in instances]
else:
xy = p_umap(_sample_xy, instances) xy = p_umap(_sample_xy, instances)
for (cname, comp) in components.items(): for (cname, comp) in components.items():

2
setup.py
View File

@@ -9,7 +9,7 @@ with open("README.md", "r") as fh:
setup( setup(
name="miplearn", name="miplearn",
version="0.2.0.dev6", version="0.2.0.dev7",
author="Alinson S. Xavier", author="Alinson S. Xavier",
author_email="axavier@anl.gov", author_email="axavier@anl.gov",
description="Extensible framework for Learning-Enhanced Mixed-Integer Optimization", description="Extensible framework for Learning-Enhanced Mixed-Integer Optimization",