Merge branch 'ScQ-Cloud:master' into master

ScQ-Cloud · Sep 2, 2023 · a96f804 · a96f804
2 parents 7122ee0 + ccd8ee9
commit a96f804
Show file tree

Hide file tree

Showing 76 changed files with 44 additions and 10 deletions.
diff --git a/src/quafu/__init__.py → quafu/__init__.py b/src/quafu/__init__.py → quafu/__init__.py
diff --git a/quafu/algorithms/__init__.py b/quafu/algorithms/__init__.py
@@ -0,0 +1,3 @@
+"""Algorithm module"""
+
+from .hamiltonian import Hamiltonian
diff --git a/src/quafu/algorithms/ansatz.py → quafu/algorithms/ansatz.py b/src/quafu/algorithms/ansatz.py → quafu/algorithms/ansatz.py
diff --git a/src/quafu/algorithms/estimator.py → quafu/algorithms/estimator.py b/src/quafu/algorithms/estimator.py → quafu/algorithms/estimator.py
diff --git a/quafu/algorithms/hamiltonian.py b/quafu/algorithms/hamiltonian.py
@@ -0,0 +1,35 @@
+# (C) Copyright 2023 Beijing Academy of Quantum Information Sciences
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Quafu Hamiltonian class"""
+
+from __future__ import annotations
+
+from collections.abc import Iterable
+
+
+class Hamiltonian:
+    """TODO"""
+
+    def __init__(self) -> None:
+        pass
+
+    @staticmethod
+    def from_pauli_list(pauli: Iterable[tuple[str, complex]]) -> Hamiltonian:
+        """
+        Args:
+            pauli: The supported format of pauli list is [(<pauli-str>, <coefficient>)],
+                e.g., [('IIIZZ', 1), ("IIZIZ", 1), ...)], 0th qubit is farthest right
+        """
+        return Hamiltonian()
diff --git a/src/quafu/algorithms/sampler.py → quafu/algorithms/sampler.py b/src/quafu/algorithms/sampler.py → quafu/algorithms/sampler.py
diff --git a/src/quafu/backends/__init__.py → quafu/backends/__init__.py b/src/quafu/backends/__init__.py → quafu/backends/__init__.py
diff --git a/src/quafu/backends/backends.py → quafu/backends/backends.py b/src/quafu/backends/backends.py → quafu/backends/backends.py
diff --git a/src/quafu/benchmark/__init__.py → quafu/benchmark/__init__.py b/src/quafu/benchmark/__init__.py → quafu/benchmark/__init__.py
diff --git a/src/quafu/benchmark/adder.py → quafu/benchmark/adder.py b/src/quafu/benchmark/adder.py → quafu/benchmark/adder.py
diff --git a/src/quafu/benchmark/deutsch_jozsa.py → quafu/benchmark/deutsch_jozsa.py b/src/quafu/benchmark/deutsch_jozsa.py → quafu/benchmark/deutsch_jozsa.py
diff --git a/src/quafu/benchmark/unitary_test.py → quafu/benchmark/unitary_test.py b/src/quafu/benchmark/unitary_test.py → quafu/benchmark/unitary_test.py
diff --git a/...enchmark/variational/brickwall_circuit.py → ...enchmark/variational/brickwall_circuit.py b/...enchmark/variational/brickwall_circuit.py → ...enchmark/variational/brickwall_circuit.py
diff --git a/...u/benchmark/variational/ladder_circuit.py → ...u/benchmark/variational/ladder_circuit.py b/...u/benchmark/variational/ladder_circuit.py → ...u/benchmark/variational/ladder_circuit.py
diff --git a/src/quafu/benchmark/variational_n4.py → quafu/benchmark/variational_n4.py b/src/quafu/benchmark/variational_n4.py → quafu/benchmark/variational_n4.py
diff --git a/src/quafu/circuits/__init__.py → quafu/circuits/__init__.py b/src/quafu/circuits/__init__.py → quafu/circuits/__init__.py
diff --git a/src/quafu/circuits/quantum_circuit.py → quafu/circuits/quantum_circuit.py b/src/quafu/circuits/quantum_circuit.py → quafu/circuits/quantum_circuit.py
diff --git a/src/quafu/circuits/quantum_register.py → quafu/circuits/quantum_register.py b/src/quafu/circuits/quantum_register.py → quafu/circuits/quantum_register.py
diff --git a/src/quafu/dagcircuits/__init__.py → quafu/dagcircuits/__init__.py b/src/quafu/dagcircuits/__init__.py → quafu/dagcircuits/__init__.py
diff --git a/src/quafu/dagcircuits/circuit_dag.py → quafu/dagcircuits/circuit_dag.py b/src/quafu/dagcircuits/circuit_dag.py → quafu/dagcircuits/circuit_dag.py
diff --git a/src/quafu/dagcircuits/dag_circuit.py → quafu/dagcircuits/dag_circuit.py b/src/quafu/dagcircuits/dag_circuit.py → quafu/dagcircuits/dag_circuit.py
diff --git a/src/quafu/dagcircuits/instruction_node.py → quafu/dagcircuits/instruction_node.py b/src/quafu/dagcircuits/instruction_node.py → quafu/dagcircuits/instruction_node.py
diff --git a/src/quafu/elements/__init__.py → quafu/elements/__init__.py b/src/quafu/elements/__init__.py → quafu/elements/__init__.py
diff --git a/src/quafu/elements/element_gates/__init__.py → quafu/elements/element_gates/__init__.py b/src/quafu/elements/element_gates/__init__.py → quafu/elements/element_gates/__init__.py
diff --git a/src/quafu/elements/element_gates/c11.py → quafu/elements/element_gates/c11.py b/src/quafu/elements/element_gates/c11.py → quafu/elements/element_gates/c11.py
diff --git a/src/quafu/elements/element_gates/c12.py → quafu/elements/element_gates/c12.py b/src/quafu/elements/element_gates/c12.py → quafu/elements/element_gates/c12.py
diff --git a/src/quafu/elements/element_gates/c21.py → quafu/elements/element_gates/c21.py b/src/quafu/elements/element_gates/c21.py → quafu/elements/element_gates/c21.py
diff --git a/src/quafu/elements/element_gates/clifford.py → quafu/elements/element_gates/clifford.py b/src/quafu/elements/element_gates/clifford.py → quafu/elements/element_gates/clifford.py
diff --git a/src/quafu/elements/element_gates/cm1.py → quafu/elements/element_gates/cm1.py b/src/quafu/elements/element_gates/cm1.py → quafu/elements/element_gates/cm1.py
diff --git a/...ements/element_gates/matrices/__init__.py → ...ements/element_gates/matrices/__init__.py b/...ements/element_gates/matrices/__init__.py → ...ements/element_gates/matrices/__init__.py
diff --git a/...lements/element_gates/matrices/mat_lib.py → ...lements/element_gates/matrices/mat_lib.py b/...lements/element_gates/matrices/mat_lib.py → ...lements/element_gates/matrices/mat_lib.py
diff --git a/...ments/element_gates/matrices/mat_utils.py → ...ments/element_gates/matrices/mat_utils.py b/...ments/element_gates/matrices/mat_utils.py → ...ments/element_gates/matrices/mat_utils.py
diff --git a/src/quafu/elements/element_gates/pauli.py → quafu/elements/element_gates/pauli.py b/src/quafu/elements/element_gates/pauli.py → quafu/elements/element_gates/pauli.py
diff --git a/src/quafu/elements/element_gates/phase.py → quafu/elements/element_gates/phase.py b/src/quafu/elements/element_gates/phase.py → quafu/elements/element_gates/phase.py
diff --git a/src/quafu/elements/element_gates/rotation.py → quafu/elements/element_gates/rotation.py b/src/quafu/elements/element_gates/rotation.py → quafu/elements/element_gates/rotation.py
diff --git a/src/quafu/elements/element_gates/swap.py → quafu/elements/element_gates/swap.py b/src/quafu/elements/element_gates/swap.py → quafu/elements/element_gates/swap.py
diff --git a/...lements/element_gates/unitary/__init__.py → ...lements/element_gates/unitary/__init__.py b/...lements/element_gates/unitary/__init__.py → ...lements/element_gates/unitary/__init__.py
diff --git a/...ments/element_gates/unitary/decomposer.py → ...ments/element_gates/unitary/decomposer.py b/...ments/element_gates/unitary/decomposer.py → ...ments/element_gates/unitary/decomposer.py
diff --git a/...uafu/elements/quantum_element/__init__.py → quafu/elements/quantum_element/__init__.py b/...uafu/elements/quantum_element/__init__.py → quafu/elements/quantum_element/__init__.py
diff --git a/...u/elements/quantum_element/instruction.py → ...u/elements/quantum_element/instruction.py b/...u/elements/quantum_element/instruction.py → ...u/elements/quantum_element/instruction.py
diff --git a/...ements/quantum_element/pulses/__init__.py → ...ements/quantum_element/pulses/__init__.py b/...ements/quantum_element/pulses/__init__.py → ...ements/quantum_element/pulses/__init__.py
diff --git a/...s/quantum_element/pulses/quantum_pulse.py → ...s/quantum_element/pulses/quantum_pulse.py b/...s/quantum_element/pulses/quantum_pulse.py → ...s/quantum_element/pulses/quantum_pulse.py
diff --git a/...ements/quantum_element/quantum_element.py → ...ements/quantum_element/quantum_element.py b/...ements/quantum_element/quantum_element.py → ...ements/quantum_element/quantum_element.py
diff --git a/.../elements/quantum_element/quantum_gate.py → .../elements/quantum_element/quantum_gate.py b/.../elements/quantum_element/quantum_gate.py → .../elements/quantum_element/quantum_gate.py
diff --git a/src/quafu/exceptions/__init__.py → quafu/exceptions/__init__.py b/src/quafu/exceptions/__init__.py → quafu/exceptions/__init__.py
diff --git a/src/quafu/exceptions/circuit_error.py → quafu/exceptions/circuit_error.py b/src/quafu/exceptions/circuit_error.py → quafu/exceptions/circuit_error.py
diff --git a/src/quafu/exceptions/quafu_error.py → quafu/exceptions/quafu_error.py b/src/quafu/exceptions/quafu_error.py → quafu/exceptions/quafu_error.py
diff --git a/src/quafu/qfasm/__init__.py → quafu/qfasm/__init__.py b/src/quafu/qfasm/__init__.py → quafu/qfasm/__init__.py
diff --git a/src/quafu/qfasm/exceptions.py → quafu/qfasm/exceptions.py b/src/quafu/qfasm/exceptions.py → quafu/qfasm/exceptions.py
diff --git a/src/quafu/qfasm/qfasm_convertor.py → quafu/qfasm/qfasm_convertor.py b/src/quafu/qfasm/qfasm_convertor.py → quafu/qfasm/qfasm_convertor.py
diff --git a/src/quafu/qfasm/qfasm_parser.py → quafu/qfasm/qfasm_parser.py b/src/quafu/qfasm/qfasm_parser.py → quafu/qfasm/qfasm_parser.py
diff --git a/src/quafu/qfasm/qfasmlex.py → quafu/qfasm/qfasmlex.py b/src/quafu/qfasm/qfasmlex.py → quafu/qfasm/qfasmlex.py
diff --git a/src/quafu/requirements.txt → quafu/requirements.txt b/src/quafu/requirements.txt → quafu/requirements.txt
diff --git a/src/quafu/results/__init__.py → quafu/results/__init__.py b/src/quafu/results/__init__.py → quafu/results/__init__.py
diff --git a/src/quafu/results/results.py → quafu/results/results.py b/src/quafu/results/results.py → quafu/results/results.py
diff --git a/src/quafu/simulators/__init__.py → quafu/simulators/__init__.py b/src/quafu/simulators/__init__.py → quafu/simulators/__init__.py
diff --git a/src/quafu/simulators/default_simulator.py → quafu/simulators/default_simulator.py b/src/quafu/simulators/default_simulator.py → quafu/simulators/default_simulator.py
diff --git a/src/quafu/simulators/simulator.py → quafu/simulators/simulator.py b/src/quafu/simulators/simulator.py → quafu/simulators/simulator.py
diff --git a/src/quafu/synthesis/__init__.py → quafu/synthesis/__init__.py b/src/quafu/synthesis/__init__.py → quafu/synthesis/__init__.py
diff --git a/src/quafu/synthesis/evolution.py → quafu/synthesis/evolution.py b/src/quafu/synthesis/evolution.py → quafu/synthesis/evolution.py
diff --git a/src/quafu/tasks/__init__.py → quafu/tasks/__init__.py b/src/quafu/tasks/__init__.py → quafu/tasks/__init__.py
diff --git a/src/quafu/tasks/tasks.py → quafu/tasks/tasks.py b/src/quafu/tasks/tasks.py → quafu/tasks/tasks.py
diff --git a/src/quafu/users/__init__.py → quafu/users/__init__.py b/src/quafu/users/__init__.py → quafu/users/__init__.py
diff --git a/src/quafu/users/exceptions.py → quafu/users/exceptions.py b/src/quafu/users/exceptions.py → quafu/users/exceptions.py
diff --git a/src/quafu/users/userapi.py → quafu/users/userapi.py b/src/quafu/users/userapi.py → quafu/users/userapi.py
diff --git a/src/quafu/utils/__init__.py → quafu/utils/__init__.py b/src/quafu/utils/__init__.py → quafu/utils/__init__.py
diff --git a/src/quafu/utils/basis.py → quafu/utils/basis.py b/src/quafu/utils/basis.py → quafu/utils/basis.py
diff --git a/src/quafu/utils/paulis.py → quafu/utils/paulis.py b/src/quafu/utils/paulis.py → quafu/utils/paulis.py
diff --git a/src/quafu/utils/platform.py → quafu/utils/platform.py b/src/quafu/utils/platform.py → quafu/utils/platform.py
diff --git a/src/quafu/visualisation/__init__.py → quafu/visualisation/__init__.py b/src/quafu/visualisation/__init__.py → quafu/visualisation/__init__.py
diff --git a/src/quafu/visualisation/circuitPlot.py → quafu/visualisation/circuitPlot.py b/src/quafu/visualisation/circuitPlot.py → quafu/visualisation/circuitPlot.py
diff --git a/setup.py b/setup.py
@@ -41,9 +41,8 @@
     url="https://github.com/ScQ-Cloud/pyquafu",
     description="Python toolkit for Quafu-Cloud",
     install_requires=requirements,
-    packages=find_packages(where="src"),
-    package_dir={"": "src"},
-    cmake_install_dir="src/quafu/simulators/",
+    packages=find_packages(exclude=["test*"]),
+    cmake_install_dir="quafu/simulators/",
     include_package_data=True,
     long_description=long_description,
     long_description_content_type="text/markdown",

diff --git a/src/quafu/algorithms/__init__.py b/src/quafu/algorithms/__init__.py
diff --git a/tests/quafu/algorithms/ansatz.py → tests/quafu/algorithms/ansatz_test.py b/tests/quafu/algorithms/ansatz.py → tests/quafu/algorithms/ansatz_test.py
diff --git a/tests/quafu/algorithms/estimator.py → tests/quafu/algorithms/estimator_test.py b/tests/quafu/algorithms/estimator.py → tests/quafu/algorithms/estimator_test.py
diff --git a/src/quafu/algorithms/hamiltonian.py → tests/quafu/algorithms/hamiltonian_test.py b/src/quafu/algorithms/hamiltonian.py → tests/quafu/algorithms/hamiltonian_test.py
@@ -12,11 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Quafu Hamiltonian class"""
+from quafu.algorithms.hamiltonian import Hamiltonian
 
+class TestHamiltonian:
 
-class Hamiltonian:
-    """TODO"""
-
-    def __init__(self) -> None:
-        pass
+    def test_init(self):
+        h = Hamiltonian()