pyqrack-cuda 1.34.4__tar.gz → 1.34.6__tar.gz

{pyqrack_cuda-1.34.4 → pyqrack_cuda-1.34.6}/Makefile

@@ -18,7 +18,7 @@ help:
 build-deps:
 ifneq ($(OS),Windows_NT)
 ifeq ($(QRACK_PRESENT),)
-	git clone https://github.com/unitaryfund/qrack.git; cd qrack; git checkout d102dd0b166452c47027698eb25ef1430ff50bed; cd ..
+	git clone https://github.com/unitaryfund/qrack.git; cd qrack; git checkout 3d2bdc25d5a676ce48691e46eef57737b8acdd04; cd ..
 endif
 	mkdir -p qrack/build
 ifeq ($(UNAME_S),Linux)

{pyqrack_cuda-1.34.4/pyqrack_cuda.egg-info → pyqrack_cuda-1.34.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyqrack-cuda
-Version: 1.34.4
+Version: 1.34.6
 Summary: pyqrack - Pure Python vm6502q/qrack Wrapper
 Home-page: https://github.com/vm6502q/pyqrack
 Author: Daniel Strano

{pyqrack_cuda-1.34.4 → pyqrack_cuda-1.34.6}/pyqrack/qrack_circuit.py

@@ -12,9 +12,10 @@ _IS_QISKIT_AVAILABLE = True
 try:
     from qiskit.circuit.quantumcircuit import QuantumCircuit
     from qiskit.compiler.transpiler import transpile
-    from qiskit.circuit.library import U3Gate, UCGate
+    from qiskit.circuit.library import UCGate
     import numpy as np
     import math
+    import sys
 except ImportError:
     _IS_QISKIT_AVAILABLE = False
 
@@ -32,22 +33,6 @@ except ImportError:
     _IS_TENSORCIRCUIT_AVAILABLE = False
 
 
-def euler_angles_1q(m):
-    phase = (m[0][0] * m[1][1] - m[0][1] * m[1][0]) ** (-1.0/2.0)
-    U = [[phase * m[0][0], phase * m[0][1]], [phase * m[1][0], phase * m[1][1]]]
-
-    theta = 2 * math.atan2(abs(U[1][0]), abs(U[0][0]))
-
-    # Find phi and lambda
-    phiplambda = 2 * np.angle(U[1][1])
-    phimlambda = 2 * np.angle(U[1][0])
-
-    phi = (phiplambda + phimlambda) / 2.0
-    lamb = (phiplambda - phimlambda) / 2.0
-
-    return theta, phi, lamb
-
-
 class QrackCircuit:
     """Class that exposes the QCircuit class of Qrack
 
@@ -85,6 +70,53 @@ class QrackCircuit:
         t = [(c.real, c.imag) for c in a]
         return self._double_byref([float(item) for sublist in t for item in sublist])
 
+    def _mtrx_to_u4(m):
+        nrm = abs(m[0])
+        if (nrm * nrm) < sys.float_info.epsilon:
+            phase = 1.0 + 0.0j
+            th = math.pi;
+        else:
+            phase = m[0] / nrm
+            if nrm > 1.0:
+                nrm = 1.0
+            th = 2 * math.acos(nrm)
+
+        nrm1 = abs(m[1])
+        nrm2 = abs(m[2])
+        nrm1 *= nrm1
+        nrm2 *= nrm2
+        if (nrm1 < sys.float_info.epsilon) or (nrm2 < sys.float_info.epsilon):
+            ph = np.angle(m[3] / phase)
+            lm = 0.0
+        else:
+            ph = np.angle(m[2] / phase)
+            lm = np.angle(-m[1] / phase)
+
+        return th, ph, lm, np.angle(phase)
+
+    def _u3_to_mtrx(params):
+        th = float(params[0])
+        ph = float(params[1])
+        lm = float(params[2])
+
+        c = math.cos(th / 2)
+        s = math.sin(th / 2)
+        el = np.exp(1j * lm)
+        ep = np.exp(1j * ph)
+
+        return [c + 0j, -el * s, ep * s, ep * el * c]
+
+    def _u4_to_mtrx(params):
+        m = QrackCircuit._u3_to_mtrx(params)
+        g = np.exp(1j * float(params[3]))
+        for i in range(4):
+            m[i] *= g
+
+        return m
+
+    def _make_mtrx_unitary(m):
+        return QrackCircuit._u4_to_mtrx(QrackCircuit._mtrx_to_u4(m))
+
     def clone(self):
         """Make a new circuit that is an exact clone of this circuit
 
@@ -302,100 +334,56 @@ class QrackCircuit:
 
         i = 0
         num_qubits = int(tokens[i])
-        i = i + 1
+        i += 1
         circ = QuantumCircuit(num_qubits)
 
         num_gates = int(tokens[i])
-        i = i + 1
+        i += 1
 
+        identity = np.eye(2, dtype=complex)
         for g in range(num_gates):
             target = int(tokens[i])
-            i = i + 1
+            i += 1
 
             control_count = int(tokens[i])
-            i = i + 1
+            i += 1
             controls = []
             for j in range(control_count):
                 controls.append(int(tokens[i]))
-                i = i + 1
+                i += 1
 
             payload_count = int(tokens[i])
-            i = i + 1
+            i += 1
             payloads = {}
             for j in range(payload_count):
                 key = int(tokens[i])
-                i = i + 1
-                op = np.zeros((2,2), dtype=complex)
-                row = []
-                for _ in range(2):
-                    amp = tokens[i].replace("(","").replace(")","").split(',')
-                    row.append(float(amp[0]) + float(amp[1])*1j)
-                    i = i + 1
-                l = math.sqrt(np.real(row[0] * np.conj(row[0]) + row[1] * np.conj(row[1])))
-                op[0][0] = row[0] / l
-                op[0][1] = row[1] / l
-
-                if np.abs(op[0][0] - row[0]) > 1e-5:
-                    print("Warning: gate ", str(g), ", payload ", str(j), " might not be unitary!")
-                if np.abs(op[0][1] - row[1]) > 1e-5:
-                    print("Warning: gate ", str(g), ", payload ", str(j), " might not be unitary!")
-
-                row = []
-                for _ in range(2):
+                i += 1
+
+                mtrx = []
+                for _ in range(4):
                     amp = tokens[i].replace("(","").replace(")","").split(',')
-                    row.append(float(amp[0]) + float(amp[1])*1j)
-                    i = i + 1
-                l = math.sqrt(np.real(row[0] * np.conj(row[0]) + row[1] * np.conj(row[1])))
-                op[1][0] = row[0] / l
-                op[1][1] = row[1] / l
-
-                ph = np.real(np.log(np.linalg.det(op)) / 1j)
-
-                op[1][0] = -np.exp(1j * ph) * np.conj(op[0][1])
-                op[1][1] = np.exp(1j * ph) * np.conj(op[0][0])
-
-                if np.abs(op[1][0] - row[0]) > 1e-5:
-                    print("Warning: gate ", str(g), ", payload ", str(j), " might not be unitary!")
-                if np.abs(op[1][1] - row[1]) > 1e-5:
-                    print("Warning: gate ", str(g), ", payload ", str(j), " might not be unitary!")
-
-                # Qiskit has a lower tolerance for deviation from numerically unitary.
-                payloads[key] = np.array(op)
-
-            gate_list = []
-            control_pow = 1 << control_count
-            pLen = len(payloads)
-            if (pLen == 1) or ((control_pow - pLen) > (1 << 15)):
-                for c, p in payloads.items():
-                    theta, phi, lam = euler_angles_1q(p)
-                    if control_count > 0:
-                        circ.append(
-                            U3Gate(theta, phi, lam).control(num_ctrl_qubits=control_count, ctrl_state=c),
-                            controls + [target]
-                        )
-                    else:
-                        circ.append(U3Gate(theta, phi, lam), [target])
-            else:
-                for j in range(control_pow):
-                    if j in payloads:
-                        gate_list.append(payloads[j])
-                    else:
-                        gate_list.append(np.array([[1, 0],[0, 1]]))
-                circ.append(UCGate(gate_list), controls + [target])
+                    mtrx.append(float(amp[0]) + float(amp[1])*1j)
+                    i += 1
 
-        return circ
+                mtrx = QrackCircuit._make_mtrx_unitary(mtrx)
 
-    def _u3_to_mtrx(params):
-        th = float(params[0])
-        ph = float(params[1])
-        lm = float(params[2])
+                op = np.eye(2, dtype=complex)
+                op[0][0] = mtrx[0]
+                op[0][1] = mtrx[1]
+                op[1][0] = mtrx[2]
+                op[1][1] = mtrx[3]
 
-        c = math.cos(th / 2)
-        s = math.sin(th / 2)
-        el = np.exp(1j * lm)
-        ep = np.exp(1j * ph)
+                payloads[key] = op
+
+            gate_list=[]
+            for j in range(1 << control_count):
+                if j in payloads:
+                    gate_list.append(payloads[j])
+                else:
+                    gate_list.append(identity)
+            circ.append(UCGate(gate_list), [target] + controls)
 
-        return [ c + 0j, -el * s, ep * s, el * ep * c]
+        return circ
 
     def in_from_qiskit_circuit(circ):
         """Read a Qiskit circuit into a QrackCircuit
@@ -415,11 +403,11 @@ class QrackCircuit:
             )
 
         out = QrackCircuit()
-
         basis_gates = ["x", "y", "z", "u", "cx", "cy", "cz", "cu"]
         circ = transpile(circ, basis_gates=basis_gates, optimization_level=0)
         for gate in circ.data:
             o = gate.operation
+
             op = []
             if o.name in ["x", "cx"]:
                 op = [0, 1, 1, 0]
@@ -429,14 +417,11 @@ class QrackCircuit:
                 op = [1, 0, 0, -1]
             else:
                 op = QrackCircuit._u3_to_mtrx(o.params)
+
             if o.name in ["x", "y", "z", "u"]:
                 out.mtrx(op, circ.find_bit(gate.qubits[0])[0])
             else:
-                ctrls = []
-                for c in gate.qubits[0:1]:
-                    ctrls.append(circ.find_bit(c)[0])
-
-                out.ucmtrx(ctrls, [0, 1, 1, 0], circ.find_bit(gate.qubits[1])[0], 1)
+                out.ucmtrx([circ.find_bit(gate.qubits[0])[0]], op, circ.find_bit(gate.qubits[1])[0], 1)
 
         return out
 

{pyqrack_cuda-1.34.4 → pyqrack_cuda-1.34.6/pyqrack_cuda.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyqrack-cuda
-Version: 1.34.4
+Version: 1.34.6
 Summary: pyqrack - Pure Python vm6502q/qrack Wrapper
 Home-page: https://github.com/vm6502q/pyqrack
 Author: Daniel Strano

{pyqrack_cuda-1.34.4 → pyqrack_cuda-1.34.6}/pyqrack_cuda.egg-info/SOURCES.txt

@@ -13,7 +13,6 @@ pyqrack/qrack_simulator.py
 pyqrack/quimb_circuit_type.py
 pyqrack/qrack_system/__init__.py
 pyqrack/qrack_system/qrack_system.py
-pyqrack/qrack_system/qrack_lib/libqrack_pinvoke.so
 pyqrack/util/__init__.py
 pyqrack/util/convert_qiskit_circuit_to_qasm_experiment.py
 pyqrack_cuda.egg-info/PKG-INFO

{pyqrack_cuda-1.34.4 → pyqrack_cuda-1.34.6}/setup.py

@@ -7,7 +7,7 @@ from setuptools import setup
 from setuptools.command.build_py import build_py
 
 
-VERSION = "1.34.4"
+VERSION = "1.34.6"
 
 # Read long description from README.
 README_PATH = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'README.md')