Skip to content

Commit c42079b

Browse files
committed
Deploying to main from @ openqasm/openqasm@08a896f 🚀
1 parent 40e5714 commit c42079b

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

_sources/language/openpulse.rst.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ extern definition at the top-level, such as:
390390
extern capture_v3(frame output, duration len) -> waveform;
391391
392392
// A capture that returns a count e.g. number of photons detected
393-
extern capture_v4(frame output, duration len) -> int
393+
extern capture_v4(frame output, duration len) -> int;
394394
395395
The return type of a ``capture`` command varies. It could be a raw trace, ie., a
396396
list of samples taken over a short period of time. It could be some averaged IQ
@@ -554,7 +554,7 @@ aligned to the latest time of the all ``frame``\s listed.
554554
// driveframe1.time == driveframe2.time == 13ns
555555
}
556556
557-
Moreover, ``defcal`` blocks have an implicit ``barrier`` on every frame enters the block e.g.
557+
Moreover, ``defcal`` blocks have an implicit ``barrier`` on every frame used by the block. For example:
558558

559559
.. code-block::
560560
@@ -842,9 +842,9 @@ The program aims to perform a Hahn echo sequence on q1, and a Ramsey sequence on
842842
frame raman_b_frame = newframe(eom_b_port, Δ-qubit_freq, 0.0);
843843
844844
// Three frames to phase track each qubit's rotating frame of reference at it's frequency
845-
frame q1_frame = newframe(aod_port, qubit_freq, 0)
846-
frame q2_frame = newframe(aod_port, qubit_freq, 0)
847-
frame q3_frame = newframe(aod_port, qubit_freq, 0)
845+
frame q1_frame = newframe(aod_port, qubit_freq, 0);
846+
frame q2_frame = newframe(aod_port, qubit_freq, 0);
847+
frame q3_frame = newframe(aod_port, qubit_freq, 0);
848848
849849
// Generic gaussian envelope
850850
waveform π_half_sig = gaussian(1.0, π_half_time, 100dt);

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ <h1>OpenQASM Live Specification<a class="headerlink" href="#openqasm-version-spe
133133
</li>
134134
<li class="toctree-l1"><a class="reference internal" href="grammar/index.html">OpenQasm 3.0 Grammar</a></li>
135135
<li class="toctree-l1"><a class="reference internal" href="release_notes.html">Release Notes</a><ul>
136-
<li class="toctree-l2"><a class="reference internal" href="release_notes.html#spec-v3-1-0-15">spec/v3.1.0-15</a><ul>
136+
<li class="toctree-l2"><a class="reference internal" href="release_notes.html#spec-v3-1-0-16">spec/v3.1.0-16</a><ul>
137137
<li class="toctree-l3"><a class="reference internal" href="release_notes.html#new-features">New Features</a></li>
138138
<li class="toctree-l3"><a class="reference internal" href="release_notes.html#upgrade-notes">Upgrade Notes</a></li>
139139
<li class="toctree-l3"><a class="reference internal" href="release_notes.html#bug-fixes">Bug Fixes</a></li>

language/openpulse.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ <h2>Capture Instruction<a class="headerlink" href="#capture-instruction" title="
366366
<span class="kt">extern</span><span class="w"> </span><span class="nf">capture_v3</span><span class="p">(</span><span class="kt">frame</span><span class="w"> </span><span class="n">output</span><span class="p">,</span><span class="w"> </span><span class="kt">duration</span><span class="w"> </span><span class="n">len</span><span class="p">)</span><span class="w"> </span><span class="o">-&gt;</span><span class="w"> </span><span class="kt">waveform</span><span class="p">;</span>
367367

368368
<span class="c1">// A capture that returns a count e.g. number of photons detected</span>
369-
<span class="kt">extern</span><span class="w"> </span><span class="nf">capture_v4</span><span class="p">(</span><span class="kt">frame</span><span class="w"> </span><span class="n">output</span><span class="p">,</span><span class="w"> </span><span class="kt">duration</span><span class="w"> </span><span class="n">len</span><span class="p">)</span><span class="w"> </span><span class="o">-&gt;</span><span class="w"> </span><span class="kt">int</span>
369+
<span class="kt">extern</span><span class="w"> </span><span class="nf">capture_v4</span><span class="p">(</span><span class="kt">frame</span><span class="w"> </span><span class="n">output</span><span class="p">,</span><span class="w"> </span><span class="kt">duration</span><span class="w"> </span><span class="n">len</span><span class="p">)</span><span class="w"> </span><span class="o">-&gt;</span><span class="w"> </span><span class="kt">int</span><span class="p">;</span>
370370
</pre></div>
371371
</div>
372372
<p>The return type of a <code class="docutils literal notranslate"><span class="pre">capture</span></code> command varies. It could be a raw trace, ie., a
@@ -516,7 +516,7 @@ <h3>Barrier<a class="headerlink" href="#barrier" title="Link to this heading">¶
516516
<span class="p">}</span>
517517
</pre></div>
518518
</div>
519-
<p>Moreover, <code class="docutils literal notranslate"><span class="pre">defcal</span></code> blocks have an implicit <code class="docutils literal notranslate"><span class="pre">barrier</span></code> on every frame enters the block e.g.</p>
519+
<p>Moreover, <code class="docutils literal notranslate"><span class="pre">defcal</span></code> blocks have an implicit <code class="docutils literal notranslate"><span class="pre">barrier</span></code> on every frame used by the block. For example:</p>
520520
<div class="highlight-qasm3 notranslate"><div class="highlight"><pre><span></span><span class="kn">defcalgrammar</span><span class="w"> </span><span class="s">&quot;openpulse&quot;</span><span class="p">;</span>
521521

522522
<span class="k">cal</span><span class="w"> </span><span class="p">{</span>
@@ -778,9 +778,9 @@ <h3>Neutral atoms<a class="headerlink" href="#neutral-atoms" title="Link to this
778778
<span class="w"> </span><span class="kt">frame</span><span class="w"> </span><span class="n">raman_b_frame</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="nb">newframe</span><span class="p">(</span><span class="n">eom_b_port</span><span class="p">,</span><span class="w"> </span><span class="n">Δ</span><span class="o">-</span><span class="n">qubit_freq</span><span class="p">,</span><span class="w"> </span><span class="mf">0.0</span><span class="p">);</span>
779779

780780
<span class="w"> </span><span class="c1">// Three frames to phase track each qubit&#39;s rotating frame of reference at it&#39;s frequency</span>
781-
<span class="w"> </span><span class="kt">frame</span><span class="w"> </span><span class="n">q1_frame</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="nb">newframe</span><span class="p">(</span><span class="n">aod_port</span><span class="p">,</span><span class="w"> </span><span class="n">qubit_freq</span><span class="p">,</span><span class="w"> </span><span class="m">0</span><span class="p">)</span>
782-
<span class="w"> </span><span class="kt">frame</span><span class="w"> </span><span class="n">q2_frame</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="nb">newframe</span><span class="p">(</span><span class="n">aod_port</span><span class="p">,</span><span class="w"> </span><span class="n">qubit_freq</span><span class="p">,</span><span class="w"> </span><span class="m">0</span><span class="p">)</span>
783-
<span class="w"> </span><span class="kt">frame</span><span class="w"> </span><span class="n">q3_frame</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="nb">newframe</span><span class="p">(</span><span class="n">aod_port</span><span class="p">,</span><span class="w"> </span><span class="n">qubit_freq</span><span class="p">,</span><span class="w"> </span><span class="m">0</span><span class="p">)</span>
781+
<span class="w"> </span><span class="kt">frame</span><span class="w"> </span><span class="n">q1_frame</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="nb">newframe</span><span class="p">(</span><span class="n">aod_port</span><span class="p">,</span><span class="w"> </span><span class="n">qubit_freq</span><span class="p">,</span><span class="w"> </span><span class="m">0</span><span class="p">);</span>
782+
<span class="w"> </span><span class="kt">frame</span><span class="w"> </span><span class="n">q2_frame</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="nb">newframe</span><span class="p">(</span><span class="n">aod_port</span><span class="p">,</span><span class="w"> </span><span class="n">qubit_freq</span><span class="p">,</span><span class="w"> </span><span class="m">0</span><span class="p">);</span>
783+
<span class="w"> </span><span class="kt">frame</span><span class="w"> </span><span class="n">q3_frame</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="nb">newframe</span><span class="p">(</span><span class="n">aod_port</span><span class="p">,</span><span class="w"> </span><span class="n">qubit_freq</span><span class="p">,</span><span class="w"> </span><span class="m">0</span><span class="p">);</span>
784784

785785
<span class="w"> </span><span class="c1">// Generic gaussian envelope</span>
786786
<span class="w"> </span><span class="kt">waveform</span><span class="w"> </span><span class="n">π_half_sig</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="nf">gaussian</span><span class="p">(</span><span class="mf">1.0</span><span class="p">,</span><span class="w"> </span><span class="n">π_half_time</span><span class="p">,</span><span class="w"> </span><span class="mf">100dt</span><span class="p">);</span>

objects.inv

1 Byte
Binary file not shown.

release_notes.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434

3535
<section id="release-notes">
3636
<h1>Release Notes<a class="headerlink" href="#release-notes" title="Link to this heading"></a></h1>
37-
<section id="spec-v3-1-0-15">
38-
<span id="release-notes-spec-v3-1-0-15"></span><h2>spec/v3.1.0-15<a class="headerlink" href="#spec-v3-1-0-15" title="Link to this heading"></a></h2>
37+
<section id="spec-v3-1-0-16">
38+
<span id="release-notes-spec-v3-1-0-16"></span><h2>spec/v3.1.0-16<a class="headerlink" href="#spec-v3-1-0-16" title="Link to this heading"></a></h2>
3939
<section id="new-features">
40-
<span id="release-notes-spec-v3-1-0-15-new-features"></span><h3>New Features<a class="headerlink" href="#new-features" title="Link to this heading"></a></h3>
40+
<span id="release-notes-spec-v3-1-0-16-new-features"></span><h3>New Features<a class="headerlink" href="#new-features" title="Link to this heading"></a></h3>
4141
<ul class="simple">
4242
<li><p>The types <code class="docutils literal notranslate"><span class="pre">bool</span></code> and (scalar) <code class="docutils literal notranslate"><span class="pre">bit</span></code> are now explicitly described as being completely
4343
interchangeable in expression (r-value) positions, and that <code class="docutils literal notranslate"><span class="pre">bit</span></code> and <code class="docutils literal notranslate"><span class="pre">bit[1]</span></code> are distinct
@@ -49,7 +49,7 @@ <h1>Release Notes<a class="headerlink" href="#release-notes" title="Link to this
4949
</ul>
5050
</section>
5151
<section id="upgrade-notes">
52-
<span id="release-notes-spec-v3-1-0-15-upgrade-notes"></span><h3>Upgrade Notes<a class="headerlink" href="#upgrade-notes" title="Link to this heading"></a></h3>
52+
<span id="release-notes-spec-v3-1-0-16-upgrade-notes"></span><h3>Upgrade Notes<a class="headerlink" href="#upgrade-notes" title="Link to this heading"></a></h3>
5353
<ul class="simple">
5454
<li><p>The <code class="docutils literal notranslate"><span class="pre">qubit</span></code> type is no longer a valid base type for an <code class="docutils literal notranslate"><span class="pre">array</span></code>, and it is no longer stated
5555
that the register type <code class="docutils literal notranslate"><span class="pre">qubit[n]</span></code> is equivalent to an <code class="docutils literal notranslate"><span class="pre">array</span></code>; there is no need for these
@@ -58,7 +58,7 @@ <h1>Release Notes<a class="headerlink" href="#release-notes" title="Link to this
5858
</ul>
5959
</section>
6060
<section id="bug-fixes">
61-
<span id="release-notes-spec-v3-1-0-15-bug-fixes"></span><h3>Bug Fixes<a class="headerlink" href="#bug-fixes" title="Link to this heading"></a></h3>
61+
<span id="release-notes-spec-v3-1-0-16-bug-fixes"></span><h3>Bug Fixes<a class="headerlink" href="#bug-fixes" title="Link to this heading"></a></h3>
6262
<ul class="simple">
6363
<li><p>Some minor mathematical errors in the descriptions of the explicit gate
6464
actions in <a class="reference internal" href="language/standard_library.html#sdg" title="language/standard_library"><code class="xref oq oq-gate docutils literal notranslate"><span class="pre">sdg</span></code></a>, <a class="reference internal" href="language/standard_library.html#rx" title="language/standard_library"><code class="xref oq oq-gate docutils literal notranslate"><span class="pre">rx</span></code></a>, <a class="reference internal" href="language/standard_library.html#ry" title="language/standard_library"><code class="xref oq oq-gate docutils literal notranslate"><span class="pre">ry</span></code></a>, <a class="reference internal" href="language/standard_library.html#rz" title="language/standard_library"><code class="xref oq oq-gate docutils literal notranslate"><span class="pre">rz</span></code></a>, <a class="reference internal" href="language/standard_library.html#crx" title="language/standard_library"><code class="xref oq oq-gate docutils literal notranslate"><span class="pre">crx</span></code></a> and
@@ -91,7 +91,7 @@ <h3>Navigation</h3>
9191
<li class="toctree-l1"><a class="reference internal" href="language/index.html">Language</a></li>
9292
<li class="toctree-l1"><a class="reference internal" href="grammar/index.html">OpenQasm 3.0 Grammar</a></li>
9393
<li class="toctree-l1 current"><a class="current reference internal" href="#">Release Notes</a><ul>
94-
<li class="toctree-l2"><a class="reference internal" href="#spec-v3-1-0-15">spec/v3.1.0-15</a><ul>
94+
<li class="toctree-l2"><a class="reference internal" href="#spec-v3-1-0-16">spec/v3.1.0-16</a><ul>
9595
<li class="toctree-l3"><a class="reference internal" href="#new-features">New Features</a></li>
9696
<li class="toctree-l3"><a class="reference internal" href="#upgrade-notes">Upgrade Notes</a></li>
9797
<li class="toctree-l3"><a class="reference internal" href="#bug-fixes">Bug Fixes</a></li>

searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)