Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Feature/isometries #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emanuel-malvetti wants to merge 34 commits into ProjectQ-Framework:develop
base: develop
Choose a base branch
Loading
from emanuel-malvetti:feature/isometries
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0871984
Initial implementation of uniformly controlled gates and column-by-co...
Apr 3, 2018
bf67147
Implemented diagonal gates and decomposition into elementary gates
Apr 4, 2018
703631b
Isometries should work now, using the Simulator for local quregs and ...
Apr 6, 2018
869fa26
Implement decompositions in C++, need to finish testing.
Apr 18, 2018
3324513
Restructure Code for C++
Apr 24, 2018
e77f047
Code mostly functional, errors accumulate for many qubits.
Apr 30, 2018
fec25c0
All important features functional.
Jun 5, 2018
c55d386
Move to libs, implement controls.
Jun 11, 2018
e196cb8
Remove a.out
Jun 11, 2018
1bbbbbd
Fix pep8 issues
Feb 17, 2019
b242743
Optimize final diagonal gate
Feb 17, 2019
827bc3f
Merge branch 'develop' into feature/isometries
Feb 17, 2019
44ca63d
Fix failing tests
Feb 19, 2019
769fe73
Fix python 2.7 compatibility
Feb 19, 2019
29e2f77
Merge branch 'develop' into feature/isometries
Takishima Jul 1, 2019
de9f4bb
Add missing license header
Takishima Feb 3, 2020
41a6806
Fix some more issues
Takishima Feb 3, 2020
f3b3201
Fix missing license header
Takishima Feb 3, 2020
13b5160
Fix compilation issue with cppdec.cpp
Takishima Feb 3, 2020
c651d54
Fix compilation issue
Takishima Feb 3, 2020
25f1121
Merge branch 'develop' into pr/314
Takishima Feb 3, 2020
d91b760
Move to C++14 and address a couple more comments
Takishima Feb 3, 2020
e2b91a8
Increase test coverage
Takishima Feb 4, 2020
c43c164
Merge branch 'develop' into pr/314
Takishima Feb 4, 2020
f6ebd35
Revert "Merge branch 'develop' into pr/314"
Takishima Feb 4, 2020
edcf421
Fix failing tests
Takishima Feb 5, 2020
0257934
Fix failing tests
Takishima Feb 5, 2020
73a5dfe
Fix failing tests v3
Takishima Feb 5, 2020
5ec4d17
Disable full python and C++ test for problematic tests
Takishima Feb 5, 2020
ffeb416
Merge branch 'develop' into pr/314
Takishima Feb 5, 2020
ee3f1b0
Ignore a few lines in _ibm_http_client.py for coverage
Takishima Feb 5, 2020
6f759da
Fix coverage
Takishima Feb 5, 2020
3ccb3eb
Merge branch 'develop' into pr/314
Takishima Apr 20, 2020
d4ebc28
Merge branch 'develop' into feature/isometries
Takishima Apr 20, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .travis.yml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ install:
- if [ "${PYTHON:0:1}" = "3" ]; then pip$PY install dormouse; fi
- pip$PY install -e .

before_script:
- "echo 'backend: Agg' > matplotlibrc"

# command to run tests
script: export OMP_NUM_THREADS=1 && pytest projectq --cov projectq

Expand Down
2 changes: 1 addition & 1 deletion examples/ibm.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import projectq.setups.ibm


def run_entangle(eng, num_qubits=3):
def run_entangle(eng, num_qubits=5):
"""
Runs an entangling operation on the provided compiler engine.

Expand Down
2 changes: 1 addition & 1 deletion projectq/backends/__init__.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* an interface to the AQT trapped ion system (and simulator).
"""
from ._printer import CommandPrinter
from ._circuits import CircuitDrawer, CircuitDrawerMatplotlib
from ._circuits import CircuitDrawer
from ._sim import Simulator, ClassicalSimulator
from ._resource import ResourceCounter
from ._ibm import IBMBackend
Expand Down
4 changes: 0 additions & 4 deletions projectq/backends/_circuits/__init__.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,4 @@
# limitations under the License.

from ._to_latex import to_latex
from ._plot import to_draw

from ._drawer import CircuitDrawer
from ._drawer_matplotlib import CircuitDrawerMatplotlib

7 changes: 4 additions & 3 deletions projectq/backends/_circuits/_drawer.py
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
Contains a compiler engine which generates TikZ Latex code describing the
circuit.
"""
import sys

from builtins import input

from projectq.cengines import LastEngineException, BasicEngine
Expand Down Expand Up @@ -221,13 +223,12 @@ def _print_cmd(self, cmd):
self._free_lines.append(qubit_id)

if self.is_last_engine and cmd.gate == Measure:
assert get_control_count(cmd) == 0

assert (get_control_count(cmd) == 0)
for qureg in cmd.qubits:
for qubit in qureg:
if self._accept_input:
m = None
while m not in ('0', '1', 1, 0):
while m != '0' and m != '1' and m != 1 and m != 0:
prompt = ("Input measurement result (0 or 1) for "
"qubit " + str(qubit) + ": ")
m = input(prompt)
Expand Down
148 changes: 0 additions & 148 deletions projectq/backends/_circuits/_drawer_matplotlib_test.py
View file Open in desktop

This file was deleted.

Loading

AltStyle によって変換されたページ (->オリジナル) /