Move AlphaFeats to Main and restructure

kuonanhong · Oct 11, 2017 · 107f284 · 107f284
1 parent 291fda5
commit 107f284
Show file tree

Hide file tree

Showing 37 changed files with 26 additions and 28 deletions.
diff --git a/docs/bernstein_vazirani.rst b/docs/bernstein_vazirani.rst
@@ -29,7 +29,7 @@ Here you can find documentation for the different submodules in bernstein_vazira
 grove.bernstein_vazirani.bernstein_vazirani
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. automodule:: grove.alpha.bernstein_vazirani.bernstein_vazirani
+.. automodule:: grove.bernstein_vazirani.bernstein_vazirani
     :members:
     :undoc-members:
     :show-inheritance:

diff --git a/docs/simon.rst b/docs/simon.rst
@@ -68,7 +68,7 @@ Here you can find documentation for the different submodules in simon.
 grove.simon.simon
 ~~~~~~~~~~~~~~~~~
 
-.. automodule:: grove.alpha.simon.simon
+.. automodule:: grove.simon.simon
     :members:
     :undoc-members:
     :show-inheritance:

diff --git a/grove/alpha/amplification/__init__.py → grove/amplification/__init__.py b/grove/alpha/amplification/__init__.py → grove/amplification/__init__.py
diff --git a/grove/alpha/amplification/amplification.py → grove/amplification/amplification.py b/grove/alpha/amplification/amplification.py → grove/amplification/amplification.py
@@ -20,11 +20,10 @@
  <https://arxiv.org/abs/quant-ph/0005055 arXiv:quant-ph/0005055>`_ for more information.
 """
 import numpy as np
-
 import pyquil.quil as pq
 from pyquil.gates import H, X, Z, RZ, STANDARD_GATES
 
-from grove.alpha.utility_programs import ControlledProgramBuilder
+from grove.utils.utility_programs import ControlledProgramBuilder
 
 STANDARD_GATE_NAMES = list(STANDARD_GATES.keys())
 X_GATE = np.array([[0, 1], [1, 0]])

diff --git a/grove/alpha/amplification/grover.py → grove/amplification/grover.py b/grove/alpha/amplification/grover.py → grove/amplification/grover.py
@@ -17,12 +17,11 @@
 """
 
 import numpy as np
-
 import pyquil.quil as pq
 from pyquil.gates import H
 from pyquil.quilbase import Qubit
 
-from grove.alpha.amplification.amplification import amplification_circuit
+from grove.amplification.amplification import amplification_circuit
 
 
 class Grover(object):

diff --git a/grove/alpha/amplification/oracles.py → grove/amplification/oracles.py b/grove/alpha/amplification/oracles.py → grove/amplification/oracles.py
@@ -20,7 +20,7 @@
 import pyquil.quil as pq
 from pyquil.gates import X, Z
 
-from grove.alpha.utility_programs import ControlledProgramBuilder
+from grove.utils.utility_programs import ControlledProgramBuilder
 
 
 def basis_selector_oracle(qubits, bitstring):

diff --git a/grove/alpha/bernstein_vazirani/__init__.py → grove/bernstein_vazirani/__init__.py b/grove/alpha/bernstein_vazirani/__init__.py → grove/bernstein_vazirani/__init__.py
diff --git a/.../bernstein_vazirani/bernstein_vazirani.py → .../bernstein_vazirani/bernstein_vazirani.py b/.../bernstein_vazirani/bernstein_vazirani.py → .../bernstein_vazirani/bernstein_vazirani.py
@@ -31,7 +31,7 @@
 import pyquil.quil as pq
 from pyquil.gates import H, X
 
-from grove.alpha.bernstein_vazirani import utils
+from grove.bernstein_vazirani import utils
 
 
 def create_bv_bitmap(dot_product_vector, dot_product_bias):

diff --git a/grove/alpha/bernstein_vazirani/utils.py → grove/bernstein_vazirani/utils.py b/grove/alpha/bernstein_vazirani/utils.py → grove/bernstein_vazirani/utils.py
diff --git a/grove/alpha/simon/__init__.py → grove/simon/__init__.py b/grove/alpha/simon/__init__.py → grove/simon/__init__.py
diff --git a/grove/alpha/simon/simon.py → grove/simon/simon.py b/grove/alpha/simon/simon.py → grove/simon/simon.py
@@ -43,7 +43,7 @@
 import pyquil.quil as pq
 from pyquil.gates import H
 
-import grove.alpha.simon.utils as utils
+import grove.simon.utils as utils
 
 
 def create_1to1_bitmap(mask):

diff --git a/grove/alpha/simon/utils.py → grove/simon/utils.py b/grove/alpha/simon/utils.py → grove/simon/utils.py
diff --git a/grove/alpha/amplification/tests/__init__.py → grove/tests/__init__.py b/grove/alpha/amplification/tests/__init__.py → grove/tests/__init__.py
diff --git a/...lpha/bernstein_vazirani/tests/__init__.py → grove/tests/amplification/__init__.py b/...lpha/bernstein_vazirani/tests/__init__.py → grove/tests/amplification/__init__.py
diff --git a/...amplification/tests/test_amplification.py → ...tests/amplification/test_amplification.py b/...amplification/tests/test_amplification.py → ...tests/amplification/test_amplification.py
@@ -17,8 +17,8 @@
 import pyquil.quil as pq
 from pyquil.gates import X, H, RZ, CZ
 
-from grove.alpha.amplification.amplification import amplification_circuit, diffusion_program
-from grove.alpha.tests.utils_for_testing import prog_equality
+from grove.amplification.amplification import amplification_circuit, diffusion_program
+from grove.tests.utils.utils_for_testing import prog_equality
 
 triple_hadamard = pq.Program().inst(H(0)).inst(H(1)).inst(H(2))
 cz_gate = pq.Program(CZ(0, 1))

diff --git a/.../alpha/amplification/tests/test_grover.py → grove/tests/amplification/test_grover.py b/.../alpha/amplification/tests/test_grover.py → grove/tests/amplification/test_grover.py
@@ -4,8 +4,8 @@
 from pyquil.gates import X, Z, H
 from pyquil.quil import Program
 
-from grove.alpha.amplification.grover import Grover
-from grove.alpha.tests.utils_for_testing import prog_equality, synthesize_programs
+from grove.amplification.grover import Grover
+from grove.tests.utils.utils_for_testing import prog_equality, synthesize_programs
 
 identity_oracle = Program()
 """Does nothing on all inputs."""

diff --git a/...alpha/amplification/tests/test_oracles.py → grove/tests/amplification/test_oracles.py b/...alpha/amplification/tests/test_oracles.py → grove/tests/amplification/test_oracles.py
@@ -1,8 +1,7 @@
 import pytest
-
 from pyquil.quil import Program
 
-from grove.alpha.amplification.oracles import basis_selector_oracle
+from grove.amplification.oracles import basis_selector_oracle
 
 
 def test_basis_selector_oracle():

diff --git a/grove/alpha/simon/tests/__init__.py → grove/tests/bernstein_vazirani/__init__.py b/grove/alpha/simon/tests/__init__.py → grove/tests/bernstein_vazirani/__init__.py
diff --git a/...vazirani/tests/test_bernstein_vazirani.py → ...stein_vazirani/test_bernstein_vazirani.py b/...vazirani/tests/test_bernstein_vazirani.py → ...stein_vazirani/test_bernstein_vazirani.py
@@ -1,7 +1,7 @@
-from mock import patch
 import numpy as np
+from mock import patch
 
-from grove.alpha.bernstein_vazirani.bernstein_vazirani import BernsteinVazirani, create_bv_bitmap
+from grove.bernstein_vazirani.bernstein_vazirani import BernsteinVazirani, create_bv_bitmap
 
 
 def test_bv_bitmap_generator():

diff --git a/...ha/bernstein_vazirani/tests/test_utils.py → grove/tests/bernstein_vazirani/test_utils.py b/...ha/bernstein_vazirani/tests/test_utils.py → grove/tests/bernstein_vazirani/test_utils.py
@@ -1,6 +1,6 @@
 import pytest
 
-from grove.alpha.bernstein_vazirani import utils as u
+from grove.bernstein_vazirani import utils as u
 
 
 def test_bitwise_dot_product():

diff --git a/grove/alpha/tests/__init__.py → grove/tests/pyqaoa/__init__.py b/grove/alpha/tests/__init__.py → grove/tests/pyqaoa/__init__.py
diff --git a/grove/pyqaoa/tests/test_maxcut.py → grove/tests/pyqaoa/test_maxcut.py b/grove/pyqaoa/tests/test_maxcut.py → grove/tests/pyqaoa/test_maxcut.py
diff --git a/grove/pyqaoa/tests/test_qaoa.py → grove/tests/pyqaoa/test_qaoa.py b/grove/pyqaoa/tests/test_qaoa.py → grove/tests/pyqaoa/test_qaoa.py
diff --git a/grove/tests/pyvqe/__init__.py b/grove/tests/pyvqe/__init__.py
diff --git a/grove/pyvqe/tests/test_algorithms.py → grove/tests/pyvqe/test_algorithms.py b/grove/pyvqe/tests/test_algorithms.py → grove/tests/pyvqe/test_algorithms.py
diff --git a/grove/tests/qft/__init__.py b/grove/tests/qft/__init__.py
diff --git a/grove/qft/tests/test_qft.py → grove/tests/qft/test_qft.py b/grove/qft/tests/test_qft.py → grove/tests/qft/test_qft.py
diff --git a/grove/tests/simon/__init__.py b/grove/tests/simon/__init__.py
diff --git a/...ha/simon/tests/data/simon_test_oracle.npy → grove/tests/simon/data/simon_test_oracle.npy b/...ha/simon/tests/data/simon_test_oracle.npy → grove/tests/simon/data/simon_test_oracle.npy
diff --git a/grove/alpha/simon/tests/test_simon.py → grove/tests/simon/test_simon.py b/grove/alpha/simon/tests/test_simon.py → grove/tests/simon/test_simon.py
@@ -1,15 +1,16 @@
 """Test class for helper methods found simon"""
 
+from os.path import abspath, dirname
+
 import numpy as np
-from grove.alpha.simon.simon import Simon, create_1to1_bitmap, create_valid_2to1_bitmap
+from mock import patch
 from pyquil.quil import Program
 
-from os.path import abspath, dirname
-from mock import patch
+from grove.simon.simon import Simon, create_1to1_bitmap, create_valid_2to1_bitmap
 
 package_path = abspath(dirname(dirname(__file__)))
 
-EXPECTED_SIMON_ORACLE = np.load(package_path + '/tests/data/simon_test_oracle.npy')
+EXPECTED_SIMON_ORACLE = np.load(package_path + '/simon/data/simon_test_oracle.npy')
 
 
 def _create_expected_program():

diff --git a/grove/alpha/simon/tests/test_utils.py → grove/tests/simon/test_utils.py b/grove/alpha/simon/tests/test_utils.py → grove/tests/simon/test_utils.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from grove.alpha.simon import utils as u
+from grove.simon import utils as u
 
 
 def test_unitary_two_by_two():

diff --git a/grove/tests/utils/__init__.py b/grove/tests/utils/__init__.py
diff --git a/grove/alpha/tests/test_utility_programs.py → grove/tests/utils/test_utility_programs.py b/grove/alpha/tests/test_utility_programs.py → grove/tests/utils/test_utility_programs.py
@@ -1,8 +1,8 @@
 import numpy as np
 from pyquil.quil import Program
 
-from grove.alpha.tests.utils_for_testing import non_action_insts, prog_len
-from grove.alpha.utility_programs import ControlledProgramBuilder
+from grove.tests.utils.utils_for_testing import non_action_insts, prog_len
+from grove.utils.utility_programs import ControlledProgramBuilder
 
 SIGMA_Z = np.array([[1, 0], [0, -1]])
 

diff --git a/grove/alpha/tests/utils_for_testing.py → grove/tests/utils/utils_for_testing.py b/grove/alpha/tests/utils_for_testing.py → grove/tests/utils/utils_for_testing.py
diff --git a/grove/utils/__init__.py b/grove/utils/__init__.py
diff --git a/grove/alpha/utility_programs.py → grove/utils/utility_programs.py b/grove/alpha/utility_programs.py → grove/utils/utility_programs.py
diff --git a/setup.py b/setup.py
@@ -29,13 +29,13 @@
         "grove.pyqaoa",
         "grove.pyvqe",
         "grove.qft",
+        "grove.bernstein_vazirani",
+        "grove.simon",
+        "grove.amplification",
         "grove.alpha",
         "grove.alpha.phaseestimation",
         "grove.alpha.deutsch_jozsa",
         "grove.alpha.arbitrary_state",
-        "grove.alpha.bernstein_vazirani",
-        "grove.alpha.simon",
-        "grove.alpha.amplification",
         "grove.alpha.fermion_transforms"
     ],
     install_requires=[