pyqrackising 9.3.10__py3-none-win_amd64.whl → 9.4.0__py3-none-win_amd64.whl

pyqrackising/otoc.py

@@ -32,32 +32,23 @@ def get_otoc_hamming_distribution(J=-1.0, h=2.0, z=4, theta=0.174532925199432957
 
     diff_theta *= cycles
     diff_phi *= cycles
-    # diff_lam = diff_phi
 
     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
+                diff_z += diff_phi
             case 'Y':
-                diff_z += diff_theta
-                diff_x += diff_phi
+                diff_z += diff_theta + diff_phi
+            case _:
+                pass
 
     diff_z[0] += n_qubits
-    diff_x[0] += n_qubits
-    diff_y[0] += n_qubits
-
     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,29 +64,46 @@ def fix_cdf(hamming_prob):
     return cum_prob
 
 
-def take_all(b, basis, sample):
-    for i in range(len(basis)):
-        if basis[i] == b:
-            sample |= (1 << i)
+@njit
+def factor_width(width):
+    col_len = int(np.floor(np.sqrt(width)))
+    while ((width // col_len) * col_len) != width:
+        col_len -= 1
+    row_len = width // col_len
 
-    return sample
+    return row_len, col_len
 
 
-def take_sample(b, basis, sample, m, inv_dist):
+# Provided by Google search AI
+def find_all_str_occurrences(main_string, sub_string):
     indices = []
+    start_index = 0
+    while True:
+        index = main_string.find(sub_string, start_index)
+        if index == -1:
+            break
+        indices.append(index)
+        start_index = index + 1  # Start searching after the found occurrence
+
+    return indices
+
+
+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(len(basis)):
-        if basis[i] == b:
-            indices.append(i)
-            tot_inv_dist += inv_dist[i]
+    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
+        p = inv_dist[indices[0]]
         idx = 0
         while p < r:
-            p += inv_dist[indices[idx]]
             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)
@@ -106,133 +114,83 @@ def take_sample(b, basis, sample, m, inv_dist):
     return sample
 
 
-@njit
-def factor_width(width):
-    col_len = np.floor(np.sqrt(width))
-    while ((width // col_len) * col_len) != width:
-        col_len -= 1
-    row_len = width // col_len
-
-    return row_len, col_len
-
-
-# Provided by Google search AI
-def find_all_str_occurrences(main_string, sub_string):
-    indices = []
-    start_index = 0
-    while True:
-        index = main_string.find(sub_string, start_index)
-        if index == -1:
-            break
-        indices.append(index)
-        start_index = index + 1  # Start searching after the found occurrence
+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_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):
+            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 indices
+    return inv_dist
 
 
-def get_inv_dist(butterfly_idx, n_qubits, row_len):
+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)
-    for idx in butterfly_idx:
+    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):
-            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
-            if dist > 0:
-                inv_dist[q] += 1.0 / dist
+            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()
 
     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):
+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, is_orbifold=True):
     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.)")
-
-    basis_x, basis_y, basis_z = [], [], []
-    for b in pauli_string:
-        if b == 'Z':
-            basis_z.append('X')
-            basis_y.append('I')
-            basis_x.append('Z')
-        elif b == 'X':
-            basis_z.append('Z')
-            basis_y.append('I')
-            basis_x.append('X')
-        elif b == 'Y':
-            basis_z.append('I')
-            basis_y.append('Z')
-            basis_x.append('I')
-        else:
-            basis_z.append('I')
-            basis_y.append('I')
-            basis_x.append('I')
-
-    bases = { 'X': basis_x, 'Y': basis_y, 'Z': basis_z }
-    thresholds = { key: fix_cdf(value) for key, value in get_otoc_hamming_distribution(J, h, z, theta, t, n_qubits, cycles, pauli_string).items() }
+    thresholds = fix_cdf(get_otoc_hamming_distribution(J, h, z, theta, t, n_qubits, cycles, pauli_string))
 
     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)
-
-    inv_dist = { 'X': inv_dist_x, 'Y': inv_dist_y, 'Z': inv_dist_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)
 
     samples = []
     for _ in range(shots):
-        sample_3_axis = { 'X': 0, 'Y': 0, 'Z': 0 }
-        for key, value in thresholds.items():
-            basis = bases[key]
-
-            # 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
-            z_count = basis.count('Z')
-            if z_count > m:
-                sample_3_axis[key] = take_sample('Z', basis, sample_3_axis[key], m, inv_dist[key])
-                continue
-            m -= z_count
-            sample_3_axis[key] = take_all('Z', basis, sample_3_axis[key])
-            if m == 0:
-                continue
-
-            i_count = basis.count('I')
-            if i_count > m:
-                sample_3_axis[key] = take_sample('I', basis, sample_3_axis[key], m, inv_dist[key])
-                continue
-            m -= i_count
-            sample_3_axis[key] = take_all('I', basis, sample_3_axis[key])
-            if m == 0:
-                continue
-
-            sample_3_axis[key] = take_sample('X', basis, 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.10.dist-info → pyqrackising-9.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqrackising
-Version: 9.3.10
+Version: 9.4.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.10.dist-info → pyqrackising-9.4.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=-SGs5Y2slNsqEURGPQv-uI5bIz2JOejY4iEckMRf0Sw,7674
+pyqrackising/otoc.py,sha256=YGDjsM5J6p_tmKTaeeZMfxcV9rJ1k7oWfT22w7DgAXk,6428
 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.10.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-pyqrackising-9.3.10.dist-info/METADATA,sha256=MjpwA4DmpEtEYrlPAYXCe1ixGcAz629s44q095-tRIo,1171
-pyqrackising-9.3.10.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
-pyqrackising-9.3.10.dist-info/top_level.txt,sha256=bxlfGuLwzeVEI8Jm5D9HvC_WedgvvkSrpFwbGDjg-Ag,13
-pyqrackising-9.3.10.dist-info/RECORD,,
+pyqrackising-9.4.0.dist-info/licenses/LICENSE.md,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+pyqrackising-9.4.0.dist-info/METADATA,sha256=4JhSdjeWRNgMpmJF78y5JupPS-V_6CWl8bzL3sEr5xE,1170
+pyqrackising-9.4.0.dist-info/WHEEL,sha256=ZjXRCNaQ9YSypEK2TE0LRB0sy2OVXSszb4Sx1XjM99k,97
+pyqrackising-9.4.0.dist-info/top_level.txt,sha256=bxlfGuLwzeVEI8Jm5D9HvC_WedgvvkSrpFwbGDjg-Ag,13
+pyqrackising-9.4.0.dist-info/RECORD,,