small fogi serialization bugfix, plus lots of code for fogi lattices that is not meant to stay

Author: juangmendoza19

pygsti/algorithms/modelselection.py

@@ -63,7 +63,7 @@ def do_greedy_from_full_fast(target_model, data, er_thresh=2.0, verbosity=2, max
         optimizer performance).
     
     recompute_H_thresh_percentage : float
-        TODO, parameter not implemented yet
+        TODO,
 
     graph_checkpoint : TODO this will likely get heavily modified
 
@@ -150,8 +150,7 @@ def create_logl_obj_fn(parent_model, dataset, min_prob_clip = 1e-6, comm = None,
             new_checkpoint.x0 = x0
             new_checkpoint.save()
             print('Checkpoint saved in', new_checkpoint.path)
-    if rank == 2:
-        print(x0)
+
     if H is None:
         if rank == 0 and verbosity > 0: 
             print("computing Hessian")
@@ -162,18 +161,32 @@ def create_logl_obj_fn(parent_model, dataset, min_prob_clip = 1e-6, comm = None,
             new_checkpoint.H = H
             new_checkpoint.save()
             print('Checkpoint saved in', new_checkpoint.path)
-    red_model = target_model.copy()
-    logl_fn = create_logl_obj_fn(target_model_fit, data.dataset)
-    original_dlogl = -logl_fn.fn()
-    print(f'{original_dlogl=}')
-    expansion_point_logl = pygsti.tools.logl(target_model_fit, data.dataset, poisson_picture=False)
-    approx_logl_fn = create_approx_logl_fn(H, x0, expansion_point_logl)
-    prev_logl = original_dlogl
-    graph_levels.append([[x0,original_dlogl, 0]])
-    exceeded_threshold = False
-    red_row_H = H
-    red_rowandcol_H = H
+    
+    if False: #checkpoint is not None:
+        if checkpoint.graph_levels is not None:
+            if rank == 0 and verbosity > 0:
+                print(f'Checkpoint contains {len(checkpoint.graph_levels)} levels')
+            graph_levels = checkpoint.graph_levels
+            red_model = checkpoint.red_model
+
+    
+    #else
+    if len(graph_levels) == 0:
+
+        red_model = target_model.copy()
+        logl_fn = create_logl_obj_fn(target_model_fit, data.dataset)
+        original_dlogl = -logl_fn.fn()
+        print(f'{original_dlogl=}')
+        expansion_point_logl = pygsti.tools.logl(target_model_fit, data.dataset, poisson_picture=False)
+        approx_logl_fn = create_approx_logl_fn(H, x0, expansion_point_logl)
+        prev_logl = original_dlogl
+        graph_levels.append([[x0,original_dlogl, 0]])
+        exceeded_threshold = False
+        red_row_H = H
+        red_rowandcol_H = H
     counter = 0
+
+
     while not exceeded_threshold:
         if rank == 0 and verbosity >1:
             print(f'>> Working on level {len(graph_levels)} <<',flush = True)

pygsti/models/fogistore.py

@@ -484,7 +484,7 @@ def fogi_errorgen_direction_labels(self, typ='normal'):
         """ typ can be 'raw' or 'abbrev' too """
         if typ == 'normal': return tuple([meta['name'] for meta in self.fogi_metadata])
         elif typ == 'raw': return tuple([meta['raw'] for meta in self.fogi_metadata])
-        elif typ == 'abrev': return tuple([meta['abbrev'] for meta in self.fogi_metadata])
+        elif typ == 'abbrev': return tuple([meta['abbrev'] for meta in self.fogi_metadata])
         else: raise ValueError("Invalid `typ` argument: %s" % str(typ))
 
     def fogv_errorgen_direction_labels(self, typ='normal'):

pygsti/models/model.py

@@ -2504,7 +2504,6 @@ def _add_reparameterization(self, primitive_op_labels, fogi_dirs, errgenset_spac
         nOpParams = self.num_params  # the number of parameters *before* any reparameterization.  TODO: better way?
         errgenset_space_labels_indx = _collections.OrderedDict(
             [(lbl, i) for i, lbl in enumerate(errgenset_space_labels)])
-        print(errgenset_space_labels[9])
         invDeriv = _np.zeros((nOpParams, fogi_dirs.shape[0]), 'd')
 
         used_param_indices = set()

pygsti/tools/fogitools.py

@@ -347,6 +347,7 @@ def construct_fogi_quantities(primitive_op_labels, gauge_action_matrices,
 
 
     """
+    print_lattices = True
     assert(dependent_fogi_action in ('drop', 'mark'))
     orthogonalize_relationals = True
     set_size_dims = {}
@@ -483,16 +484,13 @@ def resolve_norm_order(vecs_to_normalize, label_lists, given_norm_order):
         ccomms[(op_label,)] = complement
         #gauge_action_for_op[op_label] = ga
 
-        #print("Commutant:"); _mt.print_mx(commutant)
-        #print("Names: ", errgen_names)
-        #print("Complement:"); _mt.print_mx(complement)
 
     smaller_sets = [(op_label,) for op_label in primitive_op_labels]
     max_size = len(primitive_op_labels)
-    
+
     for set_size in range(1, max_size):
         larger_sets = []
-        print(f'{set_size=}')
+        print(set_size)
         num_indep_vecs_from_smaller_sets = fogi_dirs.shape[1]
         for op_label in primitive_op_labels:
             for existing_set in smaller_sets:
@@ -752,6 +750,7 @@ def scipy_pinv(A, rcond):
 
                     ccomms[new_set] = union_space
                     set_size_dims[new_set] = len(new_indep_cols)
+                    
                     #print("Complement:\n"); _mt.print_mx(union_space)
 
                 larger_sets.append(new_set)
@@ -769,23 +768,28 @@ def scipy_pinv(A, rcond):
         fogi_dirs = fogi_dirs.real
     if _spsl.norm(dep_fogi_dirs.imag) < 1e-6:
         dep_fogi_dirs = dep_fogi_dirs.real
-    '''
-    keys = list(set_size_dims.keys())
-    gate_abbrevs = {'Gxpi2:0':'X', 'Gypi2:0': 'Y','Gzpi2:0':'Z', 'rho0':'rho', 'Mdefault': 'M'}
-    key_strings = {}
-    for key in keys:
-        key_strings[key] = [gate_abbrevs[label.__str__()] for label in key]
-    print(list(key_strings.values()))
-    keys.sort(key = lambda x: -len(x))
-    curr_length = 1
-    for key in keys:
-        if len(key) != curr_length:
-            print('\n')
-            curr_length = len(key)
-        print(key_strings[key], set_size_dims[key], end='     ')
-        '''
+    if print_lattices:
+        keys = list(set_size_dims.keys())
+        gate_abbrevs = {'Gxpi:0': 'Xpi','Gt:0':'T:0','Gt:1':'T:1','Gh:0':'H:0','Gh:1':'H:1','Gympi2:1':'Ym:1','Gcz:0:1':'CZ','Gxpi2:0':'X:0', 'Gypi2:0': 'Y:0','Gzpi2:0':'Z:0', 'rho0':'rho:0', 'Mdefault': 'M:0', 'Gn:0': 'GN','Gxpi2:1':'X:1', 'Gypi2:1': 'Y:1','Gzpi2:1':'Z:1', 'Gx:0': 'X:0', 'Gx:1': 'X:0', 'Gz:0': 'Z:0', 'Gz:1': 'Z:1', 'Gy:0': 'Y:0'}
+        key_strings = {}
+        for key in keys:
+            key_strings[key] = [gate_abbrevs[label.__str__()] for label in key]
+        keys.sort(key = lambda x: -len(x))
+        curr_length = 1
+        for key in keys:
+            if len(key) != curr_length:
+                print('\n')
+                curr_length = len(key)
+            if set_size_dims[key] > 0:
+                print(key_strings[key], set_size_dims[key], end='     ')
+        
 
-
+    for i in range(1, set_size):
+        summation = 0
+        for op_set in set_size_dims.keys():
+            if len(op_set) == i:
+                summation += set_size_dims[op_set]
+        print(i, summation)
     return (fogi_dirs, fogi_meta, dep_fogi_dirs, dep_fogi_meta)