pyqrackising 9.3.11__py3-none-win_amd64.whl → 9.5.0__py3-none-win_amd64.whl

pyqrackising/otoc.py

@@ -7,57 +7,47 @@ import sys
 epsilon = opencl_context.epsilon
 
 
-def get_otoc_hamming_distribution(J=-1.0, h=2.0, z=4, theta=0.174532925199432957, t=5, n_qubits=56, cycles=1, pauli_string = 'X' + 'I' * 55):
-    pauli_string = list(pauli_string)
-    if len(pauli_string) != n_qubits:
-        raise ValueError("OTOCS pauli_string must be same length as n_qubits! (Use 'I' for qubits that aren't changed.)")
-
+def get_otoc_hamming_distribution(J=-1.0, h=2.0, z=4, theta=0.0, t=5, n_qubits=65, pauli_strings = ['X' + 'I' * 64]):
     n_bias = n_qubits + 1
     if h <= epsilon:
         bias = np.empty(n_bias, dtype=np.float64)
         bias[0] = 1.0
-        return { 'X': bias, 'Y': bias, 'Z': bias }
-
-    fwd = probability_by_hamming_weight(J, h, z, theta, t, n_qubits + 1)
-    rev = probability_by_hamming_weight(-J, -h, z, theta + np.pi, t, n_qubits + 1)
-    diff_theta = rev - fwd
-
-    phi = theta + np.pi / 2
-    fwd = probability_by_hamming_weight(-h, -J, z, phi, t, n_qubits + 1)
-    rev = probability_by_hamming_weight(h, J, z, phi + np.pi, t, n_qubits + 1)
-    diff_phi = rev - fwd
-
-    # Lambda (Y-axis) is at a right angle to both J and h,
-    # so there is no difference in this dimension.
-
-    diff_theta *= cycles
-    diff_phi *= cycles
-    # diff_lam = diff_phi
+        return bias
 
     diff_z = np.zeros(n_bias, dtype=np.float64)
-    diff_x = np.zeros(n_bias, dtype=np.float64)
-    diff_y = np.zeros(n_bias, dtype=np.float64)
-    for b in pauli_string:
-        match b:
-            case 'X':
-                diff_z += diff_theta
-                diff_y += diff_phi
-            case 'Z':
-                diff_x += diff_phi
-                diff_y += diff_theta
-            case 'Y':
-                diff_z += diff_theta
-                diff_x += diff_phi
-
-    diff_z[0] += n_qubits
-    diff_x[0] += n_qubits
-    diff_y[0] += n_qubits
-
+    for pauli_string in pauli_strings:
+        pauli_string = list(pauli_string)
+        if len(pauli_string) != n_qubits:
+            raise ValueError("OTOCS pauli_string must be same length as n_qubits! (Use 'I' for qubits that aren't changed.)")
+
+        fwd = probability_by_hamming_weight(J, h, z, theta, t, n_qubits + 1)
+        rev = probability_by_hamming_weight(-J, -h, z, theta + np.pi, t, n_qubits + 1)
+        diff_theta = rev - fwd
+
+        phi = theta + np.pi / 2
+        fwd = probability_by_hamming_weight(-h, -J, z, phi, t, n_qubits + 1)
+        rev = probability_by_hamming_weight(h, J, z, phi + np.pi, t, n_qubits + 1)
+        diff_phi = rev - fwd
+
+        # Lambda (Y-axis) is at a right angle to both J and h,
+        # so there is no difference in this dimension.
+
+        diff_z[0] += n_qubits
+        for b in pauli_string:
+            match b:
+                case 'X':
+                    diff_z += diff_theta
+                case 'Z':
+                    diff_z += diff_phi
+                case 'Y':
+                    diff_z += diff_theta + diff_phi
+                case _:
+                    pass
+
+    # Normalize:
     diff_z /= diff_z.sum()
-    diff_x /= diff_x.sum()
-    diff_y /= diff_y.sum()
 
-    return { 'X': diff_x, 'Y': diff_y, 'Z': diff_z }
+    return diff_z
 
 
 @njit
@@ -73,32 +63,9 @@ def fix_cdf(hamming_prob):
     return cum_prob
 
 
-def take_sample(n_qubits, sample, m, inv_dist):
-    indices = [i for i in range(n_qubits)]
-    tot_inv_dist = 0.0
-    for i in range(n_qubits):
-        tot_inv_dist += inv_dist[i]
-    selected = []
-    for i in range(m):
-        r = tot_inv_dist * np.random.random()
-        p = 0.0
-        idx = 0
-        while p < r:
-            p += inv_dist[indices[idx]]
-            idx += 1
-        i = indices[idx]
-        del indices[idx]
-        selected.append(i)
-        tot_inv_dist -= inv_dist[i]
-    for i in selected:
-        sample |= 1 << i
-
-    return sample
-
-
 @njit
 def factor_width(width):
-    col_len = np.floor(np.sqrt(width))
+    col_len = int(np.floor(np.sqrt(width)))
     while ((width // col_len) * col_len) != width:
         col_len -= 1
     row_len = width // col_len
@@ -120,68 +87,106 @@ def find_all_str_occurrences(main_string, sub_string):
     return indices
 
 
-def get_inv_dist(butterfly_idx, n_qubits, row_len):
+def take_sample(n_qubits, sample, m, inv_dist):
+    indices = [i for i in range(n_qubits)]
+    tot_inv_dist = 0.0
+    for i in range(n_qubits):
+        tot_inv_dist += inv_dist[i]
+    selected = []
+    for i in range(m):
+        r = tot_inv_dist * np.random.random()
+        p = inv_dist[indices[0]]
+        idx = 0
+        while p < r:
+            idx += 1
+            if idx >= len(indices):
+                idx = len(indices) - 1
+                break
+            p += inv_dist[indices[idx]]
+        i = indices[idx]
+        del indices[idx]
+        selected.append(i)
+        tot_inv_dist -= inv_dist[i]
+    for i in selected:
+        sample |= 1 << i
+
+    return sample
+
+
+def get_willow_inv_dist(butterfly_idx_x, butterfly_idx_z, n_qubits, row_len, col_len):
     inv_dist = np.zeros(n_qubits, dtype=np.float64)
-    for idx in butterfly_idx:
+    for idx in butterfly_idx_x:
+        b_row, b_col = divmod(idx, row_len)
+        for q in range(n_qubits):
+            q_row, q_col = divmod(q, row_len)
+            inv_dist[q] -= abs(q_row - b_row) + abs(q_col - b_col)
+    for idx in butterfly_idx_z:
+        b_row, b_col = divmod(idx, row_len)
         for q in range(n_qubits):
-            b_row = idx // row_len
-            b_col = idx % row_len
-            q_row = q // row_len
-            q_col = q % row_len
-            dist = (q_row - b_row) ** 2 + (q_col - b_col) ** 2
-            inv_dist[q] += 1.0 / (1.0 + dist)
+            q_row, q_col = divmod(q, row_len)
+            inv_dist[q] += abs(q_row - b_row) + abs(q_col - b_col)
+    inv_dist += 1.0 - inv_dist.min()
 
     return inv_dist
 
 
-def generate_otoc_samples(J=-1.0, h=2.0, z=4, theta=0.174532925199432957, t=5, n_qubits=56, cycles=1, pauli_string = 'X' + 'I' * 55, shots=100, measurement_basis='Z' * 56):
-    pauli_string = list(pauli_string)
-    if len(pauli_string) != n_qubits:
-        raise ValueError("OTOC pauli_string must be same length as n_qubits! (Use 'I' for qubits that aren't changed.)")
-
-    measurement_basis = list(measurement_basis)
-    if len(measurement_basis) != n_qubits:
-        raise ValueError("OTOC measurement_basis must be same length as n_qubits! (Use 'I' for excluded qubits.)")
+def get_inv_dist(butterfly_idx_x, butterfly_idx_z, n_qubits, row_len, col_len):
+    inv_dist = np.zeros(n_qubits, dtype=np.float64)
+    half_row = row_len >> 1
+    half_col = col_len >> 1
+    for idx in butterfly_idx_x:
+        b_row, b_col = divmod(idx, row_len)
+        for q in range(n_qubits):
+            q_row, q_col = divmod(q, row_len)
+            row_d = abs(q_row - b_row)
+            if row_d > half_row:
+                row_d = row_len - row_d
+            col_d = abs(q_col - b_col)
+            if col_d > half_col:
+                col_d = col_len - col_d
+            inv_dist[q] -= row_d + col_d
+    for idx in butterfly_idx_z:
+        b_row, b_col = divmod(idx, row_len)
+        for q in range(n_qubits):
+            q_row, q_col = divmod(q, row_len)
+            row_d = abs(q_row - b_row)
+            if row_d > half_row:
+                row_d = row_len - row_d
+            col_d = abs(q_col - b_col)
+            if col_d > half_col:
+                col_d = col_len - col_d
+            inv_dist[q] += row_d + col_d
+    inv_dist += 1.0 - inv_dist.min()
 
-    thresholds = { key: fix_cdf(value) for key, value in get_otoc_hamming_distribution(J, h, z, theta, t, n_qubits, cycles, pauli_string).items() }
+    return inv_dist
 
-    row_len, col_len = factor_width(n_qubits)
-    p_string = "".join(pauli_string)
-    butterfly_idx_x = find_all_str_occurrences(p_string, 'X')
-    butterfly_idx_y = find_all_str_occurrences(p_string, 'Y')
-    butterfly_idx_z = find_all_str_occurrences(p_string, 'Z')
 
-    inv_dist_x = get_inv_dist(butterfly_idx_x, n_qubits, row_len)
-    inv_dist_y = get_inv_dist(butterfly_idx_y, n_qubits, row_len)
-    inv_dist_z = get_inv_dist(butterfly_idx_z, n_qubits, row_len)
+def generate_otoc_samples(J=-1.0, h=2.0, z=4, theta=0.0, t=5, n_qubits=65, pauli_strings = ['X' + 'I' * 64], shots=100, is_orbifold=True):
+    thresholds = fix_cdf(get_otoc_hamming_distribution(J, h, z, theta, t, n_qubits, pauli_strings))
 
-    inv_dist = { 'X': inv_dist_x, 'Y': inv_dist_y, 'Z': inv_dist_z }
+    row_len, col_len = factor_width(n_qubits)
+    inv_dist = np.zeros(n_qubits, dtype=np.float64)
+    for pauli_string in pauli_strings:
+        butterfly_idx_x = find_all_str_occurrences(pauli_string, 'X')
+        butterfly_idx_z = find_all_str_occurrences(pauli_string, 'Z')
+        if is_orbifold:
+            inv_dist += get_inv_dist(butterfly_idx_x, butterfly_idx_z, n_qubits, row_len, col_len)
+        else:
+            inv_dist += get_willow_inv_dist(butterfly_idx_x, butterfly_idx_z, n_qubits, row_len, col_len)
+        inv_dist /= 2.0
 
     samples = []
     for _ in range(shots):
-        sample_3_axis = { 'X': 0, 'Y': 0, 'Z': 0 }
-        for key, value in thresholds.items():
-            # First dimension: Hamming weight
-            m = sample_mag(value)
-            if m == 0:
-                continue
-            if m >= n_qubits:
-                sample_3_axis[key] = (1 << n_qubits) - 1
-                continue
-
-            # Second dimension: permutation within Hamming weight
-            sample_3_axis[key] = take_sample(n_qubits, sample_3_axis[key], m, inv_dist[key])
-
-        sample = 0
-        j = 0
-        for i in range(n_qubits):
-            base = measurement_basis[i]
-            if base not in ['X', 'Y', 'Z']:
-                continue
-            if (sample_3_axis[base] >> i) & 1:
-                sample |= 1 << j
-            j += 1
-
-        samples.append(sample)
+        # First dimension: Hamming weight
+        m = sample_mag(thresholds)
+        if m == 0:
+            samples.append(0)
+            continue
+        if m >= n_qubits:
+            samples.append((1 << n_qubits) - 1)
+            continue
+
+        # Second dimension: permutation within Hamming weight
+        samples.append(take_sample(n_qubits, 0, m, inv_dist))
 
     return samples

{pyqrackising-9.3.11.dist-info → pyqrackising-9.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqrackising
-Version: 9.3.11
+Version: 9.5.0
 Summary: Fast MAXCUT, TSP, and sampling heuristics from near-ideal transverse field Ising model (TFIM)
 Home-page: https://github.com/vm6502q/PyQrackIsing
 Author: Dan Strano

{pyqrackising-9.3.11.dist-info → pyqrackising-9.5.0.dist-info}/RECORD

@@ -6,7 +6,7 @@ pyqrackising/maxcut_tfim.py,sha256=U1nNjyfMS48TtTQk7TRf5_VF3pVPfAcZEa2awc2nR8k,1
 pyqrackising/maxcut_tfim_sparse.py,sha256=eenJNSEwRvgwACfKoH0tj6rpn7uqH6nNTBuxUPh_lDg,11941
 pyqrackising/maxcut_tfim_streaming.py,sha256=FkBsRoXSRhv4gUeN9O7Ivx54oxq_SqiCDKnYsyxU4bs,6664
 pyqrackising/maxcut_tfim_util.py,sha256=nMLrbvDMsCtVgbS4vbRNSZYpdne5YzdifjlQbbWmKjU,16935
-pyqrackising/otoc.py,sha256=CciS348HDws8spCgkWxeKaaHNIqGMsml52T337e-db8,6119
+pyqrackising/otoc.py,sha256=B70mFX7GDBR0VPAjIUFCJfqJig6QjvrPfkSyJ5w6vo0,6350
 pyqrackising/spin_glass_solver.py,sha256=tgmdJ6b1TetnFM--QEzOZFsNkquQYRVYiHVSzIGYvMI,14207
 pyqrackising/spin_glass_solver_sparse.py,sha256=cmXfAR43n1beRk4LaQbwfrQWkkhMPzPXpdK2T1HhQrk,15159
 pyqrackising/spin_glass_solver_streaming.py,sha256=joQLMKotgjQMwbG0msv_AookiWva_AiVBIR0Xr1Unho,10310
@@ -14,8 +14,8 @@ pyqrackising/tfim_magnetization.py,sha256=On1MhCNGGHRxJFRmCOpMcdqQJiy25gWkjz0Ka8
 pyqrackising/tfim_square_magnetization.py,sha256=9uJCT8ytyufcGFrZiignjCkWJr9UcP44sAAy0BIBw34,531
 pyqrackising/tsp.py,sha256=k8VK6fKw_niR-dVz8MyOT7LedABIwTzcSkhTOircYBg,64290
 pyqrackising/tsp_maxcut.py,sha256=lEDruz5lhjVu0ufvH5VaMJW3_nohO-rEijJJabEtuSU,10084
-pyqrackising-9.3.11.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-pyqrackising-9.3.11.dist-info/METADATA,sha256=pgPnreeoMDwgn_6xb7RmBCYfKhNuzWYiup1hC1WOlXs,1171
-pyqrackising-9.3.11.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-pyqrackising-9.3.11.dist-info/top_level.txt,sha256=bxlfGuLwzeVEI8Jm5D9HvC_WedgvvkSrpFwbGDjg-Ag,13
-pyqrackising-9.3.11.dist-info/RECORD,,
+pyqrackising-9.5.0.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+pyqrackising-9.5.0.dist-info/METADATA,sha256=bx799MMc3V0fTNSj_Yi-xs3mwJOGkZ0yat1SxxheDlE,1170
+pyqrackising-9.5.0.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+pyqrackising-9.5.0.dist-info/top_level.txt,sha256=bxlfGuLwzeVEI8Jm5D9HvC_WedgvvkSrpFwbGDjg-Ag,13
+pyqrackising-9.5.0.dist-info/RECORD,,