Add leave_pbar support for linear least squares and maxeig

mikgroup · Jun 12, 2019 · cdfcb46 · cdfcb46
1 parent c8d76bb
commit cdfcb46
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/sigpy/app.py b/sigpy/app.py
@@ -104,10 +104,10 @@ class MaxEig(App):
     """
 
     def __init__(self, A, dtype=np.float, device=backend.cpu_device,
-                 max_iter=30, show_pbar=True):
+                 max_iter=30, show_pbar=True, leave_pbar=True):
         self.x = util.randn(A.ishape, dtype=dtype, device=device)
         alg = PowerMethod(A, self.x, max_iter=max_iter)
-        super().__init__(alg, show_pbar=show_pbar)
+        super().__init__(alg, show_pbar=show_pbar, leave_pbar=leave_pbar)
 
     def _summarize(self):
         if self.show_pbar:
@@ -167,7 +167,8 @@ def __init__(self, A, y, x=None, proxg=None,
                  alg_name=None, max_iter=100,
                  P=None, alpha=None, max_power_iter=30, accelerate=True,
                  tau=None, sigma=None,
-                 save_objective_values=False, show_pbar=True):
+                 save_objective_values=False,
+                 show_pbar=True, leave_pbar=False):
         self.A = A
         self.y = y
         self.x = x
@@ -188,6 +189,7 @@ def __init__(self, A, y, x=None, proxg=None,
         self.sigma = sigma
         self.save_objective_values = save_objective_values
         self.show_pbar = show_pbar
+        self.leave_pbar = leave_pbar
 
         self.y_device = backend.get_device(y)
         if self.x is None:
@@ -199,8 +201,6 @@ def __init__(self, A, y, x=None, proxg=None,
         if self.save_objective_values:
             self.objective_values = []
 
-        super().__init__(self.alg, show_pbar=show_pbar)
-
     def _summarize(self):
         if self.save_objective_values:
             self.objective_values.append(self.objective())

diff --git a/sigpy/mri/app.py b/sigpy/mri/app.py
@@ -474,7 +474,8 @@ def min_mps_ker():
                 self.mps_ker,
                 lamda=self.lamda,
                 max_iter=self.max_inner_iter,
-                show_pbar=self.show_pbar).run()
+                show_pbar=self.show_pbar,
+                leave_pbar=False).run()
 
         def min_img_ker():
             self.A_img_ker = linop.ConvSense(
@@ -489,7 +490,8 @@ def min_img_ker():
                 self.img_ker,
                 lamda=self.lamda,
                 max_iter=self.max_inner_iter,
-                show_pbar=self.show_pbar).run()
+                show_pbar=self.show_pbar,
+                leave_pbar=False).run()
 
         self.alg = sp.alg.AltMin(
             min_mps_ker, min_img_ker, max_iter=self.max_iter)