Refactor

.github/workflows/build.yml

@@ -33,8 +33,6 @@ jobs:
         run: |
           python3 -m pip install --upgrade pip setuptools
           python3 -m pip install .[dev,publishing]
-      - name: Run unit tests
-        run: pytest -v
       - name: Verify that we can build the package
         run: python3 setup.py sdist bdist_wheel
 

example/dwave/qubols/qubols.ipynb → example/qubols/qubols.ipynb

@@ -121,8 +121,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from qalcore.dwave.qubols.qubols import QUBOLS\n",
-    "from qalcore.dwave.qubols.encodings import RealQbitEncoding, RealUnitQbitEncoding, EfficientEncoding\n",
+    "from qalcore.qubols import QUBOLS\n",
+    "from qalcore.qubols import RealQbitEncoding, RealUnitQbitEncoding, EfficientEncoding\n",
     "options = {'num_reads':100, 'num_qbits':21, 'encoding':EfficientEncoding}\n",
     "qubols = QUBOLS(options)\n",
     "sol_num = qubols.solve(A, b)"

example/qiskit/vqls/vqls_poisson.ipynb → example/vqls/vqls_poisson.ipynb

@@ -6,7 +6,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from qalcore.qiskit.vqls.vqls import VQLS\n",
+    "from qalcore.vqls import VQLS\n",
     "from qiskit.circuit.library.n_local.real_amplitudes import RealAmplitudes\n",
     "from qiskit.algorithms.optimizers import COBYLA\n",
     "from qiskit.quantum_info import Statevector\n",

example/qiskit/vqls/vqls_runtime.py → example/vqls/vqls_runtime.py

@@ -1,4 +1,4 @@
-from qalcore.qiskit.vqls import VQLS
+from qalcore.vqls import VQLS
 from qiskit.circuit.library.n_local.real_amplitudes import RealAmplitudes
 from qiskit.algorithms.optimizers import COBYLA, ADAM
 import numpy as np
@@ -7,8 +7,13 @@
 from qiskit.quantum_info import Statevector
 
 # from qiskit.primitives import Estimator, Sampler, BackendEstimator
-from qiskit_ibm_runtime import QiskitRuntimeService, Estimator, Sampler, Session, Options
-
+from qiskit_ibm_runtime import (
+    QiskitRuntimeService,
+    Estimator,
+    Sampler,
+    Session,
+    Options,
+)
 
 
 # define the problem
@@ -20,8 +25,7 @@
 # define ansatz
 ansatz = RealAmplitudes(2, entanglement="full", reps=3, insert_barriers=False)
 
-opts = {"use_overlap_test": False,
-        "use_local_cost_function": False}
+opts = {"use_overlap_test": False, "use_local_cost_function": False}
 
 # define the runtime
 service = QiskitRuntimeService()
@@ -36,22 +40,17 @@
     estimator = Estimator(session=session, options=options)
 
     # Sampler = Sampler(session=session, options=options)
-    vqls = VQLS(
-        estimator,
-        ansatz,
-        ADAM(maxiter=5, disp=True),
-        options=opts
-    )
-
+    vqls = VQLS(estimator, ansatz, ADAM(maxiter=5, disp=True), options=opts)
+
     res = vqls.solve(A, b)
 
 
-classical_solution = np.linalg.solve(A,b)
+classical_solution = np.linalg.solve(A, b)
 
-ref_solution = classical_solution/ np.linalg.norm(classical_solution)
+ref_solution = classical_solution / np.linalg.norm(classical_solution)
 vqls_solution = np.real(Statevector(res.state).data)
 
 
 plt.scatter(ref_solution, vqls_solution)
 plt.plot([-1, 1], [-1, 1], "--")
-plt.show()
+plt.show()