pyqrack-cpu 1.34.5__tar.gz → 1.38.1__tar.gz

{pyqrack_cpu-1.34.5/pyqrack_cpu.egg-info → pyqrack_cpu-1.38.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyqrack-cpu
-Version: 1.34.5
+Version: 1.38.1
 Summary: pyqrack - Pure Python vm6502q/qrack Wrapper
 Home-page: https://github.com/vm6502q/pyqrack
 Author: Daniel Strano
@@ -39,6 +39,17 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
 Requires-Dist: pytest>=7.3.1; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: summary
 
 # pyqrack
 [![Downloads](https://pepy.tech/badge/pyqrack-cpu)](https://pepy.tech/project/pyqrack-cpu) [![Downloads](https://pepy.tech/badge/pyqrack-cpu/month)](https://pepy.tech/project/pyqrack-cpu) [![Downloads](https://static.pepy.tech/badge/pyqrack-cpu/week)](https://pepy.tech/project/pyqrack-cpu)
@@ -47,13 +58,15 @@ Pure Python bindings for the pure C++11 Qrack quantum computer simulator library
 
 (**PyQrack** is just pure Qrack.)
 
-<<<<<<< HEAD
-This is the **purely CPU-based** variant of PyQrack (with module name `pyqrack-cpu`). This alternate build of PyQrack is provided so that systems that won't use OpenCL anyway (such as because they lack any GPUs or other accelerators like the Intel HD) do not need to install the OpenCL library in order to use PyQrack. In this form, both the PyQrack module and the underlying C++ Qrack library are entirely external **dependency-free.**
+This is the **purely CPU-based** variant of PyQrack (with module name `pyqrack-cpu`). This alternate build of PyQrack is provided so that systems that won't use OpenCL or CUDA anyway (such as because they lack any GPUs or other accelerators like the Intel HD) do not need to install the OpenCL library in order to use PyQrack. In this form, both the PyQrack module and the underlying C++ Qrack library are entirely external **dependency-free.**
+
+**If you're looking for Mac ARM support, use the package `pyqrack`, not `pyqrack-cpu`.** Mac officially "deprecated" OpenCL years ago. Hence, accelerator support is not included in ARM-based Mac wheels, and OpenCL installation is **not** required on these systems, but, if you have a CUDA accelerator on ARM-based Mac, you could try the package `pyqrack-cuda` instead.
 
 (**If you installing from source,** it doesn't matter whether you use `pyqrack` or `pyqrack-cpu`, because the build version of C++ Qrack you intend to use must already be installed locally.)
-=======
-**Note, if building from source**: You must build and install [unitaryfund/qrack](https://github.com/unitaryfund/qrack) to build the `main` branch from source. CI/CD builds wheels that contain pre-compiled Qrack binaries, and that is the form published on PyPi. **You must also install OpenCL.**
->>>>>>> main
+
+**If you're looking for Mac ARM support, use the package `pyqrack`, not `pyqrack-cpu`.** Mac officially "deprecated" OpenCL years ago. Hence, accelerator support is not included in ARM-based Mac wheels, and OpenCL installation is **not** required on these systems, but, if you have a CUDA accelerator on ARM-based Mac, you could try the package `pyqrack-cuda` instead.
+
+**Performance can benefit greatly from following the [Qrack repository "Quick Start" and "Power user considerations."](https://github.com/unitaryfund/qrack/blob/main/README.md#quick-start)**
 
 Import and instantiate [`QrackSimulator`](https://github.com/unitaryfund/pyqrack/blob/main/pyqrack/qrack_simulator.py) instances. This simulator can perform arbitrary single qubit and controlled-single-qubit gates, as well as other specific gates like `SWAP`.
 

{pyqrack_cpu-1.34.5 → pyqrack_cpu-1.38.1}/README.md

@@ -5,13 +5,15 @@ Pure Python bindings for the pure C++11 Qrack quantum computer simulator library
 
 (**PyQrack** is just pure Qrack.)
 
-<<<<<<< HEAD
-This is the **purely CPU-based** variant of PyQrack (with module name `pyqrack-cpu`). This alternate build of PyQrack is provided so that systems that won't use OpenCL anyway (such as because they lack any GPUs or other accelerators like the Intel HD) do not need to install the OpenCL library in order to use PyQrack. In this form, both the PyQrack module and the underlying C++ Qrack library are entirely external **dependency-free.**
+This is the **purely CPU-based** variant of PyQrack (with module name `pyqrack-cpu`). This alternate build of PyQrack is provided so that systems that won't use OpenCL or CUDA anyway (such as because they lack any GPUs or other accelerators like the Intel HD) do not need to install the OpenCL library in order to use PyQrack. In this form, both the PyQrack module and the underlying C++ Qrack library are entirely external **dependency-free.**
+
+**If you're looking for Mac ARM support, use the package `pyqrack`, not `pyqrack-cpu`.** Mac officially "deprecated" OpenCL years ago. Hence, accelerator support is not included in ARM-based Mac wheels, and OpenCL installation is **not** required on these systems, but, if you have a CUDA accelerator on ARM-based Mac, you could try the package `pyqrack-cuda` instead.
 
 (**If you installing from source,** it doesn't matter whether you use `pyqrack` or `pyqrack-cpu`, because the build version of C++ Qrack you intend to use must already be installed locally.)
-=======
-**Note, if building from source**: You must build and install [unitaryfund/qrack](https://github.com/unitaryfund/qrack) to build the `main` branch from source. CI/CD builds wheels that contain pre-compiled Qrack binaries, and that is the form published on PyPi. **You must also install OpenCL.**
->>>>>>> main
+
+**If you're looking for Mac ARM support, use the package `pyqrack`, not `pyqrack-cpu`.** Mac officially "deprecated" OpenCL years ago. Hence, accelerator support is not included in ARM-based Mac wheels, and OpenCL installation is **not** required on these systems, but, if you have a CUDA accelerator on ARM-based Mac, you could try the package `pyqrack-cuda` instead.
+
+**Performance can benefit greatly from following the [Qrack repository "Quick Start" and "Power user considerations."](https://github.com/unitaryfund/qrack/blob/main/README.md#quick-start)**
 
 Import and instantiate [`QrackSimulator`](https://github.com/unitaryfund/pyqrack/blob/main/pyqrack/qrack_simulator.py) instances. This simulator can perform arbitrary single qubit and controlled-single-qubit gates, as well as other specific gates like `SWAP`.
 

{pyqrack_cpu-1.34.5 → pyqrack_cpu-1.38.1}/pyqrack/__init__.py

@@ -10,4 +10,3 @@ from .qrack_circuit import QrackCircuit
 from .pauli import Pauli
 from .neuron_activation_fn import NeuronActivationFn
 from .quimb_circuit_type import QuimbCircuitType
-from .util import convert_qiskit_circuit_to_qasm_experiment

{pyqrack_cpu-1.34.5 → pyqrack_cpu-1.38.1}/pyqrack/qrack_circuit.py

@@ -74,12 +74,12 @@ class QrackCircuit:
         nrm = abs(m[0])
         if (nrm * nrm) < sys.float_info.epsilon:
             phase = 1.0 + 0.0j
-            th = math.pi / 2;
+            th = math.pi;
         else:
             phase = m[0] / nrm
             if nrm > 1.0:
                 nrm = 1.0
-            th = math.acos(nrm)
+            th = 2 * math.acos(nrm)
 
         nrm1 = abs(m[1])
         nrm2 = abs(m[2])
@@ -107,13 +107,16 @@ class QrackCircuit:
         return [c + 0j, -el * s, ep * s, ep * el * c]
 
     def _u4_to_mtrx(params):
-        m = _u3_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
 
@@ -337,6 +340,7 @@ class QrackCircuit:
         num_gates = int(tokens[i])
         i += 1
 
+        identity = np.eye(2, dtype=complex)
         for g in range(num_gates):
             target = int(tokens[i])
             i += 1
@@ -361,6 +365,8 @@ class QrackCircuit:
                     mtrx.append(float(amp[0]) + float(amp[1])*1j)
                     i += 1
 
+                mtrx = QrackCircuit._make_mtrx_unitary(mtrx)
+
                 op = np.eye(2, dtype=complex)
                 op[0][0] = mtrx[0]
                 op[0][1] = mtrx[1]
@@ -369,14 +375,13 @@ class QrackCircuit:
 
                 payloads[key] = op
 
-            identity = np.eye(2, dtype=complex)
             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), controls + [target])
+            circ.append(UCGate(gate_list), [target] + controls)
 
         return circ
 

{pyqrack_cpu-1.34.5 → pyqrack_cpu-1.38.1}/pyqrack/qrack_simulator.py

@@ -6,18 +6,16 @@
 import copy
 import ctypes
 import math
+import os
 import re
 from .qrack_system import Qrack
 from .pauli import Pauli
 
 _IS_QISKIT_AVAILABLE = True
 try:
-    from qiskit.circuit import QuantumRegister, Qubit
     from qiskit.circuit.quantumcircuit import QuantumCircuit
     from qiskit.compiler import transpile
-    from qiskit.qobj.qasm_qobj import QasmQobjExperiment
     from qiskit.quantum_info.operators.symplectic.clifford import Clifford
-    from .util import convert_qiskit_circuit_to_qasm_experiment
 except ImportError:
     _IS_QISKIT_AVAILABLE = False
 
@@ -60,7 +58,7 @@ class QrackSimulator:
         isPaged=True,
         isCpuGpuHybrid=True,
         isOpenCL=True,
-        isHostPointer=False,
+        isHostPointer=True if os.environ.get('PYQRACK_HOST_POINTER_DEFAULT_ON') else False,
         noise=0,
         pyzxCircuit=None,
         qiskitCircuit=None,
@@ -184,6 +182,9 @@ class QrackSimulator:
         Qrack.qrack_lib.set_concurrency(self.sid, p)
         self._throw_if_error()
 
+    def clone(self):
+        return QrackSimulator(cloneSid=self.sid)
+
     # standard gates
 
     ## single-qubits gates
@@ -3265,7 +3266,7 @@ class QrackSimulator:
             non_clifford_gates.append(op)
             g = g + 1
 
-        basis_gates = ["rz", "h", "x", "y", "z", "sx", "sxdg", "sy", "sydg", "s", "sdg", "t", "tdg", "cx", "cy", "cz", "swap"]
+        basis_gates = ["rz", "h", "x", "y", "z", "sx", "sxdg", "s", "sdg", "t", "tdg", "cx", "cy", "cz", "swap"]
         try:
             circ = transpile(clifford_circ, basis_gates=basis_gates, optimization_level=2)
         except:
@@ -3337,7 +3338,7 @@ class QrackSimulator:
         sqrt_ni = np.sqrt(-1j)
         sqrt1_2 = 1 / math.sqrt(2)
         ident = np.eye(2, dtype=np.complex128)
-        # passable_gates = ["unitary", "rz", "h", "x", "y", "z", "sx", "sxdg", "sy", "sydg", "s", "sdg", "t", "tdg"]
+        # passable_gates = ["unitary", "rz", "h", "x", "y", "z", "sx", "sxdg", "s", "sdg", "t", "tdg"]
 
         passed_swaps = []
         for i in range(0, circ.width()):
@@ -3565,7 +3566,7 @@ class QrackSimulator:
                 circ.data.insert(j, copy.deepcopy(c.data[0]))
                 j -= 1
 
-        basis_gates=["u", "rz", "h", "x", "y", "z", "sx", "sxdg", "sy", "sydg", "s", "sdg", "t", "tdg", "cx", "cy", "cz", "swap"]
+        basis_gates=["u", "rz", "h", "x", "y", "z", "sx", "sxdg", "s", "sdg", "t", "tdg", "cx", "cy", "cz", "swap"]
         circ = transpile(circ, basis_gates=basis_gates, optimization_level=2)
 
         #Eliminate unused ancillae
@@ -3662,150 +3663,150 @@ class QrackSimulator:
                     return
 
         if (name == 'u1') or (name == 'p'):
-            self._sim.u(operation.qubits[0], 0, 0, float(operation.params[0]))
+            self._sim.u(operation.qubits[0]._index, 0, 0, float(operation.params[0]))
         elif name == 'u2':
             self._sim.u(
-                operation.qubits[0],
+                operation.qubits[0]._index,
                 math.pi / 2,
                 float(operation.params[0]),
                 float(operation.params[1]),
             )
         elif (name == 'u3') or (name == 'u'):
             self._sim.u(
-                operation.qubits[0],
+                operation.qubits[0]._index,
                 float(operation.params[0]),
                 float(operation.params[1]),
                 float(operation.params[2]),
             )
         elif (name == 'unitary') and (len(operation.qubits) == 1):
-            self._sim.mtrx(operation.params[0].flatten(), operation.qubits[0])
+            self._sim.mtrx(operation.params[0].flatten(), operation.qubits[0]._index)
         elif name == 'r':
             self._sim.u(
-                operation.qubits[0],
+                operation.qubits[0]._index,
                 float(operation.params[0]),
                 float(operation.params[1]) - math.pi / 2,
                 (-1 * float(operation.params[1])) + math.pi / 2,
             )
         elif name == 'rx':
-            self._sim.r(Pauli.PauliX, float(operation.params[0]), operation.qubits[0])
+            self._sim.r(Pauli.PauliX, float(operation.params[0]), operation.qubits[0]._index)
         elif name == 'ry':
-            self._sim.r(Pauli.PauliY, float(operation.params[0]), operation.qubits[0])
+            self._sim.r(Pauli.PauliY, float(operation.params[0]), operation.qubits[0]._index)
         elif name == 'rz':
-            self._sim.r(Pauli.PauliZ, float(operation.params[0]), operation.qubits[0])
+            self._sim.r(Pauli.PauliZ, float(operation.params[0]), operation.qubits[0]._index)
         elif name == 'h':
-            self._sim.h(operation.qubits[0])
+            self._sim.h(operation.qubits[0]._index)
         elif name == 'x':
-            self._sim.x(operation.qubits[0])
+            self._sim.x(operation.qubits[0]._index)
         elif name == 'y':
-            self._sim.y(operation.qubits[0])
+            self._sim.y(operation.qubits[0]._index)
         elif name == 'z':
-            self._sim.z(operation.qubits[0])
+            self._sim.z(operation.qubits[0]._index)
         elif name == 's':
-            self._sim.s(operation.qubits[0])
+            self._sim.s(operation.qubits[0]._index)
         elif name == 'sdg':
-            self._sim.adjs(operation.qubits[0])
+            self._sim.adjs(operation.qubits[0]._index)
         elif name == 'sx':
             self._sim.mtrx(
                 [(1 + 1j) / 2, (1 - 1j) / 2, (1 - 1j) / 2, (1 + 1j) / 2],
-                operation.qubits[0],
+                operation.qubits[0]._index,
             )
         elif name == 'sxdg':
             self._sim.mtrx(
                 [(1 - 1j) / 2, (1 + 1j) / 2, (1 + 1j) / 2, (1 - 1j) / 2],
-                operation.qubits[0],
+                operation.qubits[0]._index,
             )
         elif name == 't':
-            self._sim.t(operation.qubits[0])
+            self._sim.t(operation.qubits[0]._index)
         elif name == 'tdg':
-            self._sim.adjt(operation.qubits[0])
+            self._sim.adjt(operation.qubits[0]._index)
         elif name == 'cu1':
             self._sim.mcu(
-                operation.qubits[0:1], operation.qubits[1], 0, 0, float(operation.params[0])
+                [q._index for q in operation.qubits[0:1]], operation.qubits[1]._index, 0, 0, float(operation.params[0])
             )
         elif name == 'cu2':
             self._sim.mcu(
-                operation.qubits[0:1],
-                operation.qubits[1],
+                [q._index for q in operation.qubits[0:1]],
+                operation.qubits[1]._index,
                 math.pi / 2,
                 float(operation.params[0]),
                 float(operation.params[1]),
             )
         elif (name == 'cu3') or (name == 'cu'):
             self._sim.mcu(
-                operation.qubits[0:1],
-                operation.qubits[1],
+                [q._index for q in operation.qubits[0:1]],
+                operation.qubits[1]._index,
                 float(operation.params[0]),
                 float(operation.params[1]),
                 float(operation.params[2]),
             )
         elif name == 'cx':
-            self._sim.mcx(operation.qubits[0:1], operation.qubits[1])
+            self._sim.mcx([q._index for q in operation.qubits[0:1]], operation.qubits[1]._index)
         elif name == 'cy':
-            self._sim.mcy(operation.qubits[0:1], operation.qubits[1])
+            self._sim.mcy([q._index for q in operation.qubits[0:1]], operation.qubits[1]._index)
         elif name == 'cz':
-            self._sim.mcz(operation.qubits[0:1], operation.qubits[1])
+            self._sim.mcz([q._index for q in operation.qubits[0:1]], operation.qubits[1]._index)
         elif name == 'ch':
-            self._sim.mch(operation.qubits[0:1], operation.qubits[1])
+            self._sim.mch([q._index for q in operation.qubits[0:1]], operation.qubits[1]._index)
         elif name == 'cp':
             self._sim.mcmtrx(
-                operation.qubits[0:1],
+                [q._index for q in operation.qubits[0:1]],
                 [
                     1,
                     0,
                     0,
                     math.cos(float(operation.params[0])) + 1j * math.sin(float(operation.params[0])),
                 ],
-                operation.qubits[1],
+                operation.qubits[1]._index,
             )
         elif name == 'csx':
             self._sim.mcmtrx(
-                operation.qubits[0:1],
+                [q._index for q in operation.qubits[0:1]],
                 [(1 + 1j) / 2, (1 - 1j) / 2, (1 - 1j) / 2, (1 + 1j) / 2],
-                operation.qubits[1],
+                operation.qubits[1]._index,
             )
         elif name == 'csxdg':
             self._sim.mcmtrx(
-                operation.qubits[0:1],
+                [q._index for q in operation.qubits[0:1]],
                 [(1 - 1j) / 2, (1 + 1j) / 2, (1 + 1j) / 2, (1 - 1j) / 2],
-                operation.qubits[1],
+                operation.qubits[1]._index,
             )
         elif name == 'dcx':
-            self._sim.mcx(operation.qubits[0:1], operation.qubits[1])
-            self._sim.mcx(operation.qubits[1:2], operation.qubits[0])
+            self._sim.mcx([q._index for q in operation.qubits[0:1]], operation.qubits[1]._index)
+            self._sim.mcx(operation.qubits[1:2]._index, operation.qubits[0]._index)
         elif name == 'ccx':
-            self._sim.mcx(operation.qubits[0:2], operation.qubits[2])
+            self._sim.mcx([q._index for q in operation.qubits[0:2]], operation.qubits[2]._index)
         elif name == 'ccy':
-            self._sim.mcy(operation.qubits[0:2], operation.qubits[2])
+            self._sim.mcy([q._index for q in operation.qubits[0:2]], operation.qubits[2]._index)
         elif name == 'ccz':
-            self._sim.mcz(operation.qubits[0:2], operation.qubits[2])
+            self._sim.mcz([q._index for q in operation.qubits[0:2]], operation.qubits[2]._index)
         elif name == 'mcx':
-            self._sim.mcx(operation.qubits[0:-1], operation.qubits[-1])
+            self._sim.mcx([q._index for q in operation.qubits[0:-1]], operation.qubits[-1]._index)
         elif name == 'mcy':
-            self._sim.mcy(operation.qubits[0:-1], operation.qubits[-1])
+            self._sim.mcy([q._index for q in operation.qubits[0:-1]], operation.qubits[-1]._index)
         elif name == 'mcz':
-            self._sim.mcz(operation.qubits[0:-1], operation.qubits[-1])
+            self._sim.mcz([q._index for q in operation.qubits[0:-1]], operation.qubits[-1]._index)
         elif name == 'swap':
-            self._sim.swap(operation.qubits[0], operation.qubits[1])
+            self._sim.swap(operation.qubits[0]._index, operation.qubits[1]._index)
         elif name == 'iswap':
-            self._sim.iswap(operation.qubits[0], operation.qubits[1])
+            self._sim.iswap(operation.qubits[0]._index, operation.qubits[1]._index)
         elif name == 'iswap_dg':
-            self._sim.adjiswap(operation.qubits[0], operation.qubits[1])
+            self._sim.adjiswap(operation.qubits[0]._index, operation.qubits[1]._index)
         elif name == 'cswap':
             self._sim.cswap(
-                operation.qubits[0:1], operation.qubits[1], operation.qubits[2]
+                [q._index for q in operation.qubits[0:1]], operation.qubits[1]._index, operation.qubits[2]._index
             )
         elif name == 'mcswap':
             self._sim.cswap(
-                operation.qubits[:-2], operation.qubits[-2], operation.qubits[-1]
+                [q._index for q in operation.qubits[:-2]], operation.qubits[-2]._index, operation.qubits[-1]._index
             )
         elif name == 'reset':
             qubits = operation.qubits
             for qubit in qubits:
-                if self._sim.m(qubit):
-                    self._sim.x(qubit)
+                if self._sim.m(qubit._index):
+                    self._sim.x(qubit._index)
         elif name == 'measure':
             qubits = operation.qubits
-            clbits = operation.memory
+            clbits = operation.clbits
             cregbits = (
                 operation.register
                 if hasattr(operation, 'register')
@@ -3892,7 +3893,6 @@ class QrackSimulator:
         measure_clbit = [clbit for clbit in sample_clbits]
 
         # Sample and convert to bit-strings
-        data = []
         if num_samples == 1:
             sample = self._sim.m_all()
             result = 0
@@ -3902,12 +3902,13 @@ class QrackSimulator:
                 result |= qubit_outcome << index
             measure_results = [result]
         else:
-            measure_results = self._sim.measure_shots(measure_qubit, num_samples)
+            measure_results = self._sim.measure_shots([q._index for q in measure_qubit], num_samples)
 
+        data = []
         for sample in measure_results:
             for index in range(len(measure_qubit)):
                 qubit_outcome = (sample >> index) & 1
-                clbit = measure_clbit[index]
+                clbit = measure_clbit[index]._index
                 clmask = 1 << clbit
                 self._classical_memory = (self._classical_memory & (~clmask)) | (
                     qubit_outcome << clbit
@@ -3923,12 +3924,9 @@ class QrackSimulator:
                 "Before trying to run_qiskit_circuit() with QrackSimulator, you must install Qiskit!"
             )
 
-        if isinstance(experiment, QuantumCircuit):
-            experiment = convert_qiskit_circuit_to_qasm_experiment(experiment)
-
         instructions = []
-        if isinstance(experiment, QasmQobjExperiment):
-            instructions = experiment.instructions
+        if isinstance(experiment, QuantumCircuit):
+            instructions = experiment.data
         else:
             raise RuntimeError('Unrecognized "run_input" argument specified for run().')
 
@@ -3938,7 +3936,6 @@ class QrackSimulator:
         self._sample_cregbits = []
         self._sample_measure = True
         _data = []
-        shotsPerLoop = self._shots
         shotLoopMax = 1
 
         is_initializing = True

{pyqrack_cpu-1.34.5 → pyqrack_cpu-1.38.1}/pyqrack/qrack_system/qrack_system.py

@@ -36,7 +36,7 @@ class QrackSystem:
             self.qrack_lib = CDLL(shared_lib_path)
         except Exception as e:
             if _platform == "win32":
-                shared_lib_path = "C:/Program Files/libqrack*/lib/qrack_pinvoke.lib"
+                shared_lib_path = "C:/Program Files (x86)/Qrack/bin/qrack_pinvoke.dll"
             elif _platform == "darwin":
                 shared_lib_path = "/usr/local/lib/qrack/libqrack_pinvoke.dylib"
             else:
@@ -46,7 +46,7 @@ class QrackSystem:
                 self.qrack_lib = CDLL(shared_lib_path)
             except Exception as e:
                 if _platform == "win32":
-                    shared_lib_path = "C:/Program Files (x86)/libqrack*/lib/qrack_pinvoke.lib"
+                    shared_lib_path = "C:/Program Files (x86)/Qrack/bin/qrack_pinvoke.dll"
                 elif _platform == "darwin":
                     shared_lib_path = "/usr/lib/qrack/libqrack_pinvoke.dylib"
                 else:

{pyqrack_cpu-1.34.5 → pyqrack_cpu-1.38.1/pyqrack_cpu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyqrack-cpu
-Version: 1.34.5
+Version: 1.38.1
 Summary: pyqrack - Pure Python vm6502q/qrack Wrapper
 Home-page: https://github.com/vm6502q/pyqrack
 Author: Daniel Strano
@@ -39,6 +39,17 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
 Requires-Dist: pytest>=7.3.1; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: summary
 
 # pyqrack
 [![Downloads](https://pepy.tech/badge/pyqrack-cpu)](https://pepy.tech/project/pyqrack-cpu) [![Downloads](https://pepy.tech/badge/pyqrack-cpu/month)](https://pepy.tech/project/pyqrack-cpu) [![Downloads](https://static.pepy.tech/badge/pyqrack-cpu/week)](https://pepy.tech/project/pyqrack-cpu)
@@ -47,13 +58,15 @@ Pure Python bindings for the pure C++11 Qrack quantum computer simulator library
 
 (**PyQrack** is just pure Qrack.)
 
-<<<<<<< HEAD
-This is the **purely CPU-based** variant of PyQrack (with module name `pyqrack-cpu`). This alternate build of PyQrack is provided so that systems that won't use OpenCL anyway (such as because they lack any GPUs or other accelerators like the Intel HD) do not need to install the OpenCL library in order to use PyQrack. In this form, both the PyQrack module and the underlying C++ Qrack library are entirely external **dependency-free.**
+This is the **purely CPU-based** variant of PyQrack (with module name `pyqrack-cpu`). This alternate build of PyQrack is provided so that systems that won't use OpenCL or CUDA anyway (such as because they lack any GPUs or other accelerators like the Intel HD) do not need to install the OpenCL library in order to use PyQrack. In this form, both the PyQrack module and the underlying C++ Qrack library are entirely external **dependency-free.**
+
+**If you're looking for Mac ARM support, use the package `pyqrack`, not `pyqrack-cpu`.** Mac officially "deprecated" OpenCL years ago. Hence, accelerator support is not included in ARM-based Mac wheels, and OpenCL installation is **not** required on these systems, but, if you have a CUDA accelerator on ARM-based Mac, you could try the package `pyqrack-cuda` instead.
 
 (**If you installing from source,** it doesn't matter whether you use `pyqrack` or `pyqrack-cpu`, because the build version of C++ Qrack you intend to use must already be installed locally.)
-=======
-**Note, if building from source**: You must build and install [unitaryfund/qrack](https://github.com/unitaryfund/qrack) to build the `main` branch from source. CI/CD builds wheels that contain pre-compiled Qrack binaries, and that is the form published on PyPi. **You must also install OpenCL.**
->>>>>>> main
+
+**If you're looking for Mac ARM support, use the package `pyqrack`, not `pyqrack-cpu`.** Mac officially "deprecated" OpenCL years ago. Hence, accelerator support is not included in ARM-based Mac wheels, and OpenCL installation is **not** required on these systems, but, if you have a CUDA accelerator on ARM-based Mac, you could try the package `pyqrack-cuda` instead.
+
+**Performance can benefit greatly from following the [Qrack repository "Quick Start" and "Power user considerations."](https://github.com/unitaryfund/qrack/blob/main/README.md#quick-start)**
 
 Import and instantiate [`QrackSimulator`](https://github.com/unitaryfund/pyqrack/blob/main/pyqrack/qrack_simulator.py) instances. This simulator can perform arbitrary single qubit and controlled-single-qubit gates, as well as other specific gates like `SWAP`.
 

{pyqrack_cpu-1.34.5 → pyqrack_cpu-1.38.1}/pyqrack_cpu.egg-info/SOURCES.txt

@@ -12,8 +12,6 @@ pyqrack/qrack_simulator.py
 pyqrack/quimb_circuit_type.py
 pyqrack/qrack_system/__init__.py
 pyqrack/qrack_system/qrack_system.py
-pyqrack/util/__init__.py
-pyqrack/util/convert_qiskit_circuit_to_qasm_experiment.py
 pyqrack_cpu.egg-info/PKG-INFO
 pyqrack_cpu.egg-info/SOURCES.txt
 pyqrack_cpu.egg-info/dependency_links.txt

{pyqrack_cpu-1.34.5 → pyqrack_cpu-1.38.1}/setup.py

@@ -4,7 +4,7 @@ import os
 from setuptools import setup
 
 
-VERSION = "1.34.5"
+VERSION = "1.38.1"
 
 # Read long description from README.
 README_PATH = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'README.md')
@@ -14,7 +14,7 @@ with open(README_PATH) as readme_file:
 setup(
     name='pyqrack-cpu',
     version=VERSION,
-    packages=['pyqrack', 'pyqrack.qrack_system', 'pyqrack.util'],
+    packages=['pyqrack', 'pyqrack.qrack_system'],
     description="pyqrack - Pure Python vm6502q/qrack Wrapper",
     long_description=README,
     long_description_content_type='text/markdown',

pyqrack_cpu-1.34.5/pyqrack/util/__init__.py

@@ -1,8 +0,0 @@
-# (C) Daniel Strano and the Qrack contributors 2017-2021. All rights reserved.
-#
-# Use of this source code is governed by an MIT-style license that can be
-# found in the LICENSE file or at https://opensource.org/licenses/MIT.
-
-from .convert_qiskit_circuit_to_qasm_experiment import (
-    convert_qiskit_circuit_to_qasm_experiment,
-)

pyqrack_cpu-1.34.5/pyqrack/util/convert_qiskit_circuit_to_qasm_experiment.py

@@ -1,61 +0,0 @@
-_IS_QISKIT_AVAILABLE = True
-try:
-    from qiskit.circuit.quantumcircuit import QuantumCircuit
-    from qiskit.qobj.qasm_qobj import QasmQobjExperiment, QasmQobjInstruction
-except ImportError:
-    _IS_QISKIT_AVAILABLE = False
-
-
-class QrackQasmQobjInstructionConditional:
-    def __init__(self, mask, val):
-        self.mask = mask
-        self.val = val
-
-
-def convert_qiskit_circuit_to_qasm_experiment(experiment, config=None, header=None):
-    if not _IS_QISKIT_AVAILABLE:
-        raise RuntimeError(
-            "Before trying to convert_circuit_to_qasm_experiment() with QrackSimulator, you must install Qiskit!"
-        )
-
-    instructions = []
-    for datum in experiment._data:
-        qubits = []
-        for qubit in datum[1]:
-            qubits.append(experiment.qubits.index(qubit))
-
-        clbits = []
-        for clbit in datum[2]:
-            clbits.append(experiment.clbits.index(clbit))
-
-        conditional = None
-        condition = datum[0].condition
-        if condition is not None:
-            if isinstance(condition[0], Clbit):
-                conditional = experiment.clbits.index(condition[0])
-            else:
-                creg_index = experiment.cregs.index(condition[0])
-                size = experiment.cregs[creg_index].size
-                offset = 0
-                for i in range(creg_index):
-                    offset += len(experiment.cregs[i])
-                mask = ((1 << offset) - 1) ^ ((1 << (offset + size)) - 1)
-                val = condition[1]
-                conditional = (
-                    offset
-                    if (size == 1)
-                    else QrackQasmQobjInstructionConditional(mask, val)
-                )
-
-        instructions.append(
-            QasmQobjInstruction(
-                datum[0].name,
-                qubits=qubits,
-                memory=clbits,
-                condition=condition,
-                conditional=conditional,
-                params=datum[0].params,
-            )
-        )
-
-    return QasmQobjExperiment(config=config, header=header, instructions=instructions)