Use for projectors of T2/4/6 the already updated T1/3/5 in triangular CTMRG

Author: JanLuca

varipeps/contractions/definitions.py

@@ -3464,7 +3464,7 @@ def _prepare_defs(cls):
     }
 
     triangular_ctmrg_T_proj_150_left: Definition = {
-        "tensors": [["tensor", "tensor_conj", "T3a_trunc", "C4", "C5", "C6", "T6b"]],
+        "tensors": [["tensor", "tensor_conj", "T3a", "C4", "C5", "C6", "T6b"]],
         # "tensors": [["tensor", "tensor_conj", "C3", "C4", "C5", "C6", "T6b"]],
         "network": [
             [
@@ -3480,7 +3480,7 @@ def _prepare_defs(cls):
     }
 
     triangular_ctmrg_T_proj_150_right: Definition = {
-        "tensors": [["tensor", "tensor_conj", "T6a", "C1", "C2", "C3", "T3b_trunc"]],
+        "tensors": [["tensor", "tensor_conj", "T6a", "C1", "C2", "C3", "T3b"]],
         # "tensors": [["tensor", "tensor_conj", "T6a", "C1", "C2", "C3", "C4"]],
         "network": [
             [
@@ -3560,7 +3560,7 @@ def _prepare_defs(cls):
     }
 
     triangular_ctmrg_T_proj_270_left: Definition = {
-        "tensors": [["tensor", "tensor_conj", "T1a_trunc", "C2", "C3", "C4", "T4b"]],
+        "tensors": [["tensor", "tensor_conj", "T1a", "C2", "C3", "C4", "T4b"]],
         # "tensors": [["tensor", "tensor_conj", "C1", "C2", "C3", "C4", "T4b"]],
         "network": [
             [
@@ -3576,7 +3576,7 @@ def _prepare_defs(cls):
     }
 
     triangular_ctmrg_T_proj_270_right: Definition = {
-        "tensors": [["tensor", "tensor_conj", "T4a", "C5", "C6", "C1", "T1b_trunc"]],
+        "tensors": [["tensor", "tensor_conj", "T4a", "C5", "C6", "C1", "T1b"]],
         # "tensors": [["tensor", "tensor_conj", "T4a", "C5", "C6", "C1", "C2"]],
         "network": [
             [
@@ -3592,7 +3592,7 @@ def _prepare_defs(cls):
     }
 
     triangular_ctmrg_T_proj_30_left: Definition = {
-        "tensors": [["tensor", "tensor_conj", "T5a_trunc", "C6", "C1", "C2", "T2b"]],
+        "tensors": [["tensor", "tensor_conj", "T5a", "C6", "C1", "C2", "T2b"]],
         # "tensors": [["tensor", "tensor_conj", "C5", "C6", "C1", "C2", "T2b"]],
         "network": [
             [
@@ -3608,7 +3608,7 @@ def _prepare_defs(cls):
     }
 
     triangular_ctmrg_T_proj_30_right: Definition = {
-        "tensors": [["tensor", "tensor_conj", "T2a", "C3", "C4", "C5", "T5b_trunc"]],
+        "tensors": [["tensor", "tensor_conj", "T2a", "C3", "C4", "C5", "T5b"]],
         # "tensors": [["tensor", "tensor_conj", "T2a", "C3", "C4", "C5", "C6"]],
         "network": [
             [

varipeps/ctmrg/triangular_absorption.py

@@ -411,16 +411,6 @@ def do_absorption_step_triangular(
 
             smallest_S_list.append(smallest_S_T)
 
-            proj_30, proj_150, proj_270, smallest_S_T = calc_T_30_150_270_projectors(
-                *_get_triangular_ctmrg_2x2_structure(peps_tensors, view), config, state
-            )
-
-            T_30_projectors[(x, y)] = proj_30
-            T_150_projectors[(x, y)] = proj_150
-            T_270_projectors[(x, y)] = proj_270
-
-            smallest_S_list.append(smallest_S_T)
-
     for x, iter_rows in working_unitcell.iter_all_rows(only_unique=True):
         for y, view in iter_rows:
             new_t = view[0, 0][0][0].copy()
@@ -442,69 +432,87 @@ def do_absorption_step_triangular(
                 config,
             )
 
-            new_t.T2a = _post_process_CTM_tensors(
+            new_t.T3a = _post_process_CTM_tensors(
                 jnp.tensordot(
-                    T_30_projectors.get_projector(x, y, -1, -1)[0],
-                    new_t.T2a,
+                    T_330_projectors.get_projector(x, y, -1, 0)[0],
+                    new_t.T3a,
                     ((1,), (0,)),
                 ),
                 config,
             )
-            new_t.T2b = _post_process_CTM_tensors(
+            new_t.T3b = _post_process_CTM_tensors(
                 jnp.tensordot(
-                    new_t.T2b,
-                    T_30_projectors.get_projector(x, y, 0, 0)[1],
+                    new_t.T3b,
+                    T_330_projectors.get_projector(x, y, 0, 0)[1],
                     ((3,), (0,)),
                 ),
                 config,
             )
 
-            new_t.T3a = _post_process_CTM_tensors(
+            new_t.T5a = _post_process_CTM_tensors(
                 jnp.tensordot(
-                    T_330_projectors.get_projector(x, y, -1, 0)[0],
-                    new_t.T3a,
+                    T_210_projectors.get_projector(x, y, 0, 0)[0],
+                    new_t.T5a,
                     ((1,), (0,)),
                 ),
                 config,
             )
-            new_t.T3b = _post_process_CTM_tensors(
+            new_t.T5b = _post_process_CTM_tensors(
                 jnp.tensordot(
-                    new_t.T3b,
-                    T_330_projectors.get_projector(x, y, 0, 0)[1],
+                    new_t.T5b,
+                    T_210_projectors.get_projector(x, y, -1, -1)[1],
                     ((3,), (0,)),
                 ),
                 config,
             )
 
-            new_t.T4a = _post_process_CTM_tensors(
+            view[0, 0] = new_t
+
+    for x, iter_rows in working_unitcell.iter_all_rows(only_unique=True):
+        for y, view in iter_rows:
+            proj_30, proj_150, proj_270, smallest_S_T = calc_T_30_150_270_projectors(
+                *_get_triangular_ctmrg_2x2_structure(peps_tensors, view), config, state
+            )
+
+            T_30_projectors[(x, y)] = proj_30
+            T_150_projectors[(x, y)] = proj_150
+            T_270_projectors[(x, y)] = proj_270
+
+            smallest_S_list.append(smallest_S_T)
+
+    for x, iter_rows in working_unitcell.iter_all_rows(only_unique=True):
+        for y, view in iter_rows:
+            new_t = view[0, 0][0][0].copy()
+
+            new_t.T2a = _post_process_CTM_tensors(
                 jnp.tensordot(
-                    T_270_projectors.get_projector(x, y, 0, 0)[0],
-                    new_t.T4a,
+                    T_30_projectors.get_projector(x, y, -1, -1)[0],
+                    new_t.T2a,
                     ((1,), (0,)),
                 ),
                 config,
             )
-            new_t.T4b = _post_process_CTM_tensors(
+            new_t.T2b = _post_process_CTM_tensors(
                 jnp.tensordot(
-                    new_t.T4b,
-                    T_270_projectors.get_projector(x, y, 0, -1)[1],
+                    new_t.T2b,
+                    T_30_projectors.get_projector(x, y, 0, 0)[1],
                     ((3,), (0,)),
                 ),
                 config,
             )
 
-            new_t.T5a = _post_process_CTM_tensors(
+            new_t.T4a = _post_process_CTM_tensors(
                 jnp.tensordot(
-                    T_210_projectors.get_projector(x, y, 0, 0)[0],
-                    new_t.T5a,
+                    T_270_projectors.get_projector(x, y, 0, 0)[0],
+                    new_t.T4a,
                     ((1,), (0,)),
                 ),
                 config,
             )
-            new_t.T5b = _post_process_CTM_tensors(
+            new_t.T4b = _post_process_CTM_tensors(
                 jnp.tensordot(
-                    new_t.T5b,
-                    T_210_projectors.get_projector(x, y, -1, -1)[1],
+                    new_t.T4b,
+                    T_270_projectors.get_projector(x, y, 0, -1)[1],
                     ((3,), (0,)),
                 ),
                 config,