Fixed multiprocessing bugs

Author: rjc8237

py/optimize_impl/analysis.py

@@ -40,27 +40,28 @@ def generate_histogram(
     log=False
 ):
     # Set width and height of figure
-	matplotlib.rcParams['figure.figsize'] = (width, height)
+    matplotlib.rcParams['figure.figsize'] = (width, height)
 
     # Set percentage or absolute scale for y axis
-	if use_percentage:
-		hist = seaborn.histplot(X, bins = 21, stat='percent', binrange=binrange)
-		hist.yaxis.set_major_formatter(mtick.PercentFormatter(decimals=0))
-		plt.ylim(0, ylim)
-	else:
-		hist = seaborn.histplot(X, bins = 21, binrange=binrange)
+    fig, ax = plt.subplots(1)
+    if use_percentage:
+        hist = seaborn.histplot(X, bins = 21, stat='percent', binrange=binrange, ax=ax)
+        hist.yaxis.set_major_formatter(mtick.PercentFormatter(decimals=0))
+        ax.set_ylim(0, ylim)
+    else:
+        hist = seaborn.histplot(X, bins = 21, binrange=binrange)
 
     # Set axes labels
-	hist.set_xlabel(label, fontsize=50)
-	hist.set_ylabel("")
-	hist.tick_params(labelsize=30)
+    hist.set_xlabel(label, fontsize=50)
+    hist.set_ylabel("")
+    hist.tick_params(labelsize=30)
 
     # Optionally use log scale
-	if log:
-		hist.set_xscale('log')
+    if log:
+        hist.set_xscale('log')
 
     # Save figure to file
-	plt.savefig(output_path, bbox_inches='tight')
+    fig.savefig(output_path, bbox_inches='tight')
 
 def generate_comparison_histogram(
     X,

scripts/script_util.py

@@ -350,7 +350,7 @@ def count_running_processes(p_list):
 def run_many(method, args):
     args_list = [(args, fname) for fname in args['fname']]
     with multiprocessing.Pool(processes=args['num_processes']) as pool:
-        pool.starmap(method, args_list)
+        pool.starmap(method, args_list, chunksize=1)
 
     return
 

src/optimization/layout.cpp

@@ -768,7 +768,7 @@ get_consistent_layout(
     }
 
     // Pullback cut on the original mesh to the overlay
-    bool is_original_cut = false;
+    bool is_original_cut = !(is_cut_orig.empty());
     std::vector<bool> is_cut_poly;
     if (is_original_cut) {
         is_cut_poly = pullback_cut_to_overlay(m_o, is_cut_orig, true);