only print timings if verbosity larger than 1

ratt-ru · Oct 30, 2024 · ff2831c · ff2831c
1 parent c974a0a
commit ff2831c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 27 deletions.
diff --git a/pfb/operators/gridder.py b/pfb/operators/gridder.py
@@ -686,7 +686,8 @@ def compute_residual(dsl,
                      nthreads=1,
                      epsilon=1e-7,
                      do_wgridding=True,
-                     double_accum=True):
+                     double_accum=True,
+                     verbosity=1):
     '''
     Function to compute residual and write it to disk
     '''
@@ -780,13 +781,14 @@ def compute_residual(dsl,
 
     ttot = time() - tii
     ttally = tread + tdegrid + tgrid + tdiff + tassign + twrite
-    print(f'tread = {tread/ttot}')
-    print(f'tdegrid = {tdegrid/ttot}')
-    print(f'tgrid = {tgrid/ttot}')
-    print(f'tdiff = {tdiff/ttot}')
-    print(f'tassign = {tassign/ttot}')
-    print(f'twrite = {twrite/ttot}')
-    print(f'ttally = {ttally/ttot}')
+    if verbosity > 1:
+        print(f'tread = {tread/ttot}')
+        print(f'tdegrid = {tdegrid/ttot}')
+        print(f'tgrid = {tgrid/ttot}')
+        print(f'tdiff = {tdiff/ttot}')
+        print(f'tassign = {tassign/ttot}')
+        print(f'twrite = {twrite/ttot}')
+        print(f'ttally = {ttally/ttot}')
     return residual, future
 
 def dataset_to_zarr(ds, output_name):

diff --git a/pfb/opt/pcg.py b/pfb/opt/pcg.py
@@ -246,13 +246,14 @@ def M(x): return x
                 #   file=log)
     ttot = time() - tii
     ttally = tcopy + tA + tvdot + tupdate + tp + tnorm
-    print('tcopy = ', tcopy/ttot)
-    print('tA = ', tA/ttot)
-    print('tvdot = ', tvdot/ttot)
-    print('tupdate = ', tupdate/ttot)
-    print('tp = ', tp/ttot)
-    print('tnorm = ', tnorm/ttot)
-    print('ttally = ', ttally/ttot)
+    if verbosity > 1:
+        print('tcopy = ', tcopy/ttot)
+        print('tA = ', tA/ttot)
+        print('tvdot = ', tvdot/ttot)
+        print('tupdate = ', tupdate/ttot)
+        print('tp = ', tp/ttot)
+        print('tnorm = ', tnorm/ttot)
+        print('ttally = ', ttally/ttot)
 
     if k >= maxit:
         if verbosity:

diff --git a/pfb/opt/primal_dual.py b/pfb/opt/primal_dual.py
@@ -208,16 +208,17 @@ def primal_dual_optimised(
 
     ttot = time() - tii
     ttally = tpsi + tpsiH + tgrad + tupdate + teval1 + teval2 + tpos + tnorm
-    print('Time taken per step', file=log)
-    print(f'psi = {tpsi/ttot}', file=log)
-    print(f'psiH = {tpsiH/ttot}', file=log)
-    print(f'grad = {tgrad/ttot}', file=log)
-    print(f'update = {tupdate/ttot}', file=log)
-    print(f'eval1 = {teval1/ttot}', file=log)
-    print(f'eval2 = {teval2/ttot}', file=log)
-    print(f'pos = {tpos/ttot}', file=log)
-    print(f'norm = {tnorm/ttot}', file=log)
-    print(f'tally = {ttally/ttot}', file=log)
+    if verbosity > 1:
+        print('Time taken per step', file=log)
+        print(f'psi = {tpsi/ttot}', file=log)
+        print(f'psiH = {tpsiH/ttot}', file=log)
+        print(f'grad = {tgrad/ttot}', file=log)
+        print(f'update = {tupdate/ttot}', file=log)
+        print(f'eval1 = {teval1/ttot}', file=log)
+        print(f'eval2 = {teval2/ttot}', file=log)
+        print(f'pos = {tpos/ttot}', file=log)
+        print(f'norm = {tnorm/ttot}', file=log)
+        print(f'tally = {ttally/ttot}', file=log)
 
     if k == maxit-1:
         if verbosity:

diff --git a/pfb/parser/model2comps.yaml b/pfb/parser/model2comps.yaml
@@ -76,7 +76,14 @@ inputs:
     - (.)out.yml
 
 outputs:
-  {}
+  mds-out:
+    implicit: =IFSET(current.model-out, current.model-out, '{current.output-filename}_{current.product}_{current.suffix}_{current.model-name}.mds')
+    dtype: Directory
+    must_exist: false
+  # fits-out:
+  #   implicit: =IFSET(current.model-out, STRIPEXT(current.model-out)+.fits, '{current.output-filename}_{current.product}_{current.suffix}_{current.model-name}.mds')
+  #   dtype: Directory
+  #   must_exist: false
 
 policies:
   pass_missing_as_none: true
diff --git a/pfb/parser/sara.yaml b/pfb/parser/sara.yaml
@@ -118,12 +118,21 @@ inputs:
     default: 0.5
     info:
       Reduce the regularisation strength by this fraction at the outset.
+  verbosity:
+    dtype: int
+    default: 1
+    info:
+      Set to larger than 1 to report timings during residual computation
 
 outputs:
   dds-out:
     implicit: '{current.output-filename}_{current.product}_{current.suffix}.dds'
     dtype: Directory
     must_exist: false
+  mds-out:
+    implicit: '{current.output-filename}_{current.product}_{current.suffix}_model.mds'
+    dtype: Directory
+    must_exist: false
 
 policies:
   pass_missing_as_none: true
diff --git a/pfb/workers/sara.py b/pfb/workers/sara.py
@@ -458,7 +458,8 @@ def _sara(**kw):
                                     nthreads=opts.nthreads,
                                     epsilon=opts.epsilon,
                                     do_wgridding=opts.do_wgridding,
-                                    double_accum=opts.double_accum)
+                                    double_accum=opts.double_accum,
+                                    verbosity=opts.verbosity)
             write_futures.append(fut)
 
         residual /= wsum