Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
808702a
Added class to simulator for supporting classical control API.
ScottCarda-MS May 26, 2020
ba5842d
Merge branch 'master' into sccarda/SimulatorClassicalControl
ScottCarda-MS May 27, 2020
2a7cd52
Changed namespace back to Quantum.Simulation.QuantumProcessor.Extensi…
ScottCarda-MS May 27, 2020
ffaded3
Merge branch 'master' into sccarda/SimulatorClassicalControl
ScottCarda-MS Jun 1, 2020
e5a2763
Simplified loop logic for AreEqual.
ScottCarda-MS Jun 1, 2020
ac29301
Added ToDo for namespace rename, removed unnecessary qualifiers, and …
ScottCarda-MS Jun 1, 2020
89f5abd
Added dummy classical control implementations for trace simulator.
ScottCarda-MS Jun 2, 2020
ff1db50
Added interface operations for the classical control operations. Adde…
ScottCarda-MS Jun 3, 2020
1602361
Added implementation to the classical control operation handlers for …
ScottCarda-MS Jun 3, 2020
ef50736
Removed unused variable
ScottCarda-MS Jun 3, 2020
efc961b
Fixed controls being treated as the whole argument set.
ScottCarda-MS Jun 4, 2020
fc7b454
Made classical control handles internal.
ScottCarda-MS Jun 4, 2020
6f86be7
Undoing making the operations internal.
ScottCarda-MS Jun 5, 2020
bbae112
Merge branch 'master' into sccarda/SimulatorClassicalControl
ScottCarda-MS Jun 5, 2020
3592c8a
Removed trailing whitespace
ScottCarda-MS Jun 5, 2020
106a1ed
Added two execution tests for testing the simulator and resources est…
ScottCarda-MS Jun 8, 2020
557b45c
Merged in master
ScottCarda-MS Jun 8, 2020
0cacfe7
Renamed 'classic control' to 'classical control'. Added to test that …
ScottCarda-MS Jun 9, 2020
e678a78
EOL conversion from CRLF to LF on Solution file.
ScottCarda-MS Jun 9, 2020
630c9a7
Removed 'execution target' tag from test project.
ScottCarda-MS Jun 9, 2020
a65b2c3
test setup for testing simulation of targeted executables
Jun 10, 2020
b3d731b
Added execution test projects for various simulators.
ScottCarda-MS Jun 27, 2020
053d857
merging in master
ScottCarda-MS Jun 29, 2020
911cc55
WIP
ScottCarda-MS Jun 29, 2020
98c05b4
Fixes from merge
ScottCarda-MS Jun 29, 2020
458aa0f
spacing fix
ScottCarda-MS Jun 29, 2020
89a797c
Fixed issue with Hello.qs not compiling.
ScottCarda-MS Jul 2, 2020
041e991
updated targeted qdk version, removed IonQExe tests as that simulator…
ScottCarda-MS Jul 2, 2020
c2827f7
Added measurement execution tests for IonQ Simulator.
ScottCarda-MS Jul 6, 2020
f5c3bbf
merged in from master
ScottCarda-MS Jul 6, 2020
f21917e
Changed version to 3017-alpha
ScottCarda-MS Jul 6, 2020
3456da8
Removed tests from a previous iteration of the implementation.
ScottCarda-MS Jul 6, 2020
9f4e02b
Added tests to check measurements on qubits work.
ScottCarda-MS Jul 7, 2020
7b99e34
Added tests for conditions on measurement results.
ScottCarda-MS Jul 7, 2020
09ca709
Added ToDos for the generics support bug fix.
ScottCarda-MS Jul 7, 2020
0ddc800
Merge branch 'master' into sccarda/SimulatorClassicalControl
ScottCarda-MS Jul 7, 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
935 changes: 496 additions & 439 deletions Simulation.sln

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.11.2006.3017-alpha">

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<!-- we will provide our own -->
<CsharpGeneration>false</CsharpGeneration>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
<IncludeProviderPackages>false</IncludeProviderPackages>
<NoEntryPoint>true</NoEntryPoint>
<ExecutionTarget>honeywell.qpu</ExecutionTarget>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\CsharpGeneration\Microsoft.Quantum.CsharpGeneration.fsproj" PrivateAssets="All" IsQscReference="true" />
<ProjectReference Include="..\..\..\QsharpCore\Microsoft.Quantum.QSharp.Core.csproj" />
</ItemGroup>

<Target Name="BeforeCsharpCompile">
<ItemGroup>
<Compile Include="$(GeneratedFilesOutputPath)**/*.g.cs" Exclude="@(Compile)" AutoGen="true" />
</ItemGroup>
</Target>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.


namespace Microsoft.Quantum.Simulation.Testing.Honeywell.MeasurementSupportTests {

open Microsoft.Quantum.Intrinsic;

operation MeasureInMiddle() : Unit {
using (qs = Qubit[2]) {
H(qs[0]);
let r1 = M(qs[0]);
H(qs[1]);
let r2 = M(qs[1]);
Reset(qs[0]);
Reset(qs[1]);
}
}

operation QubitAfterMeasurement() : Unit {
using (q = Qubit()) {
H(q);
let r1 = M(q);
H(q);
let r2 = M(q);
Reset(q);
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.11.2006.3017-alpha">

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<!-- we will provide our own -->
<CsharpGeneration>false</CsharpGeneration>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages>
<IncludeProviderPackages>false</IncludeProviderPackages>
<NoEntryPoint>true</NoEntryPoint>
<ExecutionTarget>ionq.qpu</ExecutionTarget>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\CsharpGeneration\Microsoft.Quantum.CsharpGeneration.fsproj" PrivateAssets="All" IsQscReference="true" />
<ProjectReference Include="..\..\..\QsharpCore\Microsoft.Quantum.QSharp.Core.csproj" />
</ItemGroup>

<Target Name="BeforeCsharpCompile">
<ItemGroup>
<Compile Include="$(GeneratedFilesOutputPath)**/*.g.cs" Exclude="@(Compile)" AutoGen="true" />
</ItemGroup>
</Target>

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.


namespace Microsoft.Quantum.Simulation.Testing.IonQ.MeasurementSupportTests {

open Microsoft.Quantum.Intrinsic;

operation MeasureInMiddle() : Unit {
using (qs = Qubit[2]) {
H(qs[0]);
let r1 = M(qs[0]);
H(qs[1]);
let r2 = M(qs[1]);
Reset(qs[0]);
Reset(qs[1]);
}
}

operation QubitAfterMeasurement() : Unit {
using (q = Qubit()) {
H(q);
let r1 = M(q);
H(q);
let r2 = M(q);
Reset(q);
}
}

}
Loading