Skip to content
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.

Sign up for GitHub

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

Update pragma rewiring expectations #878

Merged
merged 4 commits into from
Apr 22, 2019
Merged

Update pragma rewiring expectations #878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90982cf
update tests to not expect PRAGMA ..._REWIRING
ecpeterson Apr 11, 2019
db2363d
tolerate extended whitespace before comments or newlines
ecpeterson Apr 11, 2019
2036d88
tolerate comments in replies from quilc
ecpeterson Apr 11, 2019
1c460ff
update the docs too
ecpeterson Apr 11, 2019
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
14 changes: 6 additions & 8 deletions docs/source/compiler.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ with output

.. code:: python

PRAGMA EXPECTED_REWIRING "#(0 1 2 3 4 5 6 7)"
RZ(pi/2) 0
RX(pi/2) 0
RZ(-pi/2) 1
Expand All @@ -73,7 +72,6 @@ with output
RZ(-pi/2) 1
RX(-pi/2) 2
RZ(pi/2) 2
PRAGMA CURRENT_REWIRING "#(0 1 2 3 4 5 6 7)"

The compiler connection is also available directly via the property ``qc.compiler``. The
precise class of this object changes based on context (e.g., ``QPUCompiler``,
Expand Down Expand Up @@ -247,12 +245,12 @@ Rewirings

When a Quil program contains multi-qubit instructions that do not name qubit-qubit links present on a
target device, the compiler will rearrange the qubits so that execution becomes possible. In order to
help the user understand what rearrangement may have been done, the compiler emits two forms of
``PRAGMA``: ``PRAGMA EXPECTED_REWIRING`` and ``PRAGMA CURRENT_REWIRING``. From the perspective of the
user, both ``PRAGMA`` instructions serve the same purpose: ``PRAGMA ..._REWIRING "#(n0 n1 ... nk)"``
indicates that the logical qubit labeled ``j`` in the program has been assigned to lie on the physical
qubit labeled ``nj`` on the device. This is strictly for human-readability: user-supplied instructions
of the form ``PRAGMA [EXPECTED|CURRENT]_REWIRING`` are discarded and have no effect.
help the user understand what rearrangement may have been done, the compiler emits comments at various
points in the raw Quil code (which is not currently visible from a pyQuil ``Program`` object's ``.out()``
method): ``# Entering rewiring`` and ``# Exiting rewiring``. From the perspective of the user, both
comments serve the same purpose: ``# Entering rewiring: #(n0 n1 ... nk)`` indicates that the logical
qubit labeled ``j`` in the program has been assigned to lie on the physical qubit labeled ``nj`` on
the device. This is strictly for human-readability: these comments are discarded and have no effect.

In addition, you have some control over how the compiler constructs its
rewiring, which is controlled by ``PRAGMA INITIAL_REWIRING``. The syntax is as follows.
Expand Down
4 changes: 2 additions & 2 deletions pyquil/_parser/Quil.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,11 @@ UNDERSCORE : '_' ;
// Whitespace

TAB : ' ' ;
NEWLINE : ( '\r'? '\n' | '\r' )+ ;
NEWLINE : (' ' | '\t' )* ( '\r'? '\n' | '\r' )+ ;

// Skips

COMMENT : '#' ~( '\n' | '\r' )* -> skip ;
COMMENT : (' ' | '\t' )* '#' ~( '\n' | '\r' )* -> skip ;
SPACE : ' ' -> skip ;

// Error
Expand Down
Loading