From cf54b15fd29a04596ba079687a516bc76e511444 Mon Sep 17 00:00:00 2001 From: "Project Collection Build Service (ms-quantum)" <> Date: Mon, 17 Aug 2020 21:58:35 +0000 Subject: [PATCH 1/2] Build 0.12.2008.1729. --- images/iqsharp-base/Dockerfile | 2 +- src/AzureClient/AzureClient.csproj | 2 +- src/Core/Core.csproj | 6 ++-- .../ExecutionPathTracer.csproj | 2 +- .../Mock.Chemistry/Mock.Chemistry.csproj | 4 +-- .../Mock.Standard/Mock.Standard.csproj | 4 +-- src/Tool/appsettings.json | 30 +++++++++---------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/images/iqsharp-base/Dockerfile b/images/iqsharp-base/Dockerfile index 738b1f292a..45b18b30e4 100644 --- a/images/iqsharp-base/Dockerfile +++ b/images/iqsharp-base/Dockerfile @@ -109,7 +109,7 @@ ENV PATH=$PATH:${HOME}/dotnet:${HOME}/.dotnet/tools \ # Install IQ# and the project templates, using the NuGet packages from the # build context. ARG IQSHARP_VERSION -RUN dotnet new -i "Microsoft.Quantum.ProjectTemplates::0.12.20073008-beta" && \ +RUN dotnet new -i "Microsoft.Quantum.ProjectTemplates::0.12.20081729-beta" && \ dotnet tool install \ --global \ Microsoft.Quantum.IQSharp \ diff --git a/src/AzureClient/AzureClient.csproj b/src/AzureClient/AzureClient.csproj index fc021e4a9a..072882ec0c 100644 --- a/src/AzureClient/AzureClient.csproj +++ b/src/AzureClient/AzureClient.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index f7a29284d3..431089b4fe 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -38,9 +38,9 @@ - - - + + + diff --git a/src/ExecutionPathTracer/ExecutionPathTracer.csproj b/src/ExecutionPathTracer/ExecutionPathTracer.csproj index 79ef1ef2ef..c7db69eb00 100644 --- a/src/ExecutionPathTracer/ExecutionPathTracer.csproj +++ b/src/ExecutionPathTracer/ExecutionPathTracer.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj b/src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj index 7900c48c47..405bfa9eef 100644 --- a/src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj +++ b/src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -6,6 +6,6 @@ - + diff --git a/src/MockLibraries/Mock.Standard/Mock.Standard.csproj b/src/MockLibraries/Mock.Standard/Mock.Standard.csproj index 7900c48c47..405bfa9eef 100644 --- a/src/MockLibraries/Mock.Standard/Mock.Standard.csproj +++ b/src/MockLibraries/Mock.Standard/Mock.Standard.csproj @@ -1,4 +1,4 @@ - + netstandard2.1 @@ -6,6 +6,6 @@ - + diff --git a/src/Tool/appsettings.json b/src/Tool/appsettings.json index 7ec58902e5..c3c9391e9a 100644 --- a/src/Tool/appsettings.json +++ b/src/Tool/appsettings.json @@ -6,25 +6,25 @@ }, "AllowedHosts": "*", "DefaultPackageVersions": [ - "Microsoft.Quantum.Compiler::0.12.20073008-beta", + "Microsoft.Quantum.Compiler::0.12.20081729-beta", - "Microsoft.Quantum.CsharpGeneration::0.12.20073008-beta", - "Microsoft.Quantum.Development.Kit::0.12.20073008-beta", - "Microsoft.Quantum.Simulators::0.12.20073008-beta", - "Microsoft.Quantum.Xunit::0.12.20073008-beta", + "Microsoft.Quantum.CsharpGeneration::0.12.20081729-beta", + "Microsoft.Quantum.Development.Kit::0.12.20081729-beta", + "Microsoft.Quantum.Simulators::0.12.20081729-beta", + "Microsoft.Quantum.Xunit::0.12.20081729-beta", - "Microsoft.Quantum.Standard::0.12.20073008-beta", - "Microsoft.Quantum.Chemistry::0.12.20073008-beta", - "Microsoft.Quantum.Chemistry.Jupyter::0.12.20073008-beta", - "Microsoft.Quantum.MachineLearning::0.12.20073008-beta", - "Microsoft.Quantum.Numerics::0.12.20073008-beta", + "Microsoft.Quantum.Standard::0.12.20081729-beta", + "Microsoft.Quantum.Chemistry::0.12.20081729-beta", + "Microsoft.Quantum.Chemistry.Jupyter::0.12.20081729-beta", + "Microsoft.Quantum.MachineLearning::0.12.20081729-beta", + "Microsoft.Quantum.Numerics::0.12.20081729-beta", - "Microsoft.Quantum.Katas::0.12.20073008-beta", + "Microsoft.Quantum.Katas::0.12.20081729-beta", - "Microsoft.Quantum.Research::0.12.20073008-beta", + "Microsoft.Quantum.Research::0.12.20081729-beta", - "Microsoft.Quantum.Providers.IonQ::0.12.20073008-beta", - "Microsoft.Quantum.Providers.Honeywell::0.12.20073008-beta", - "Microsoft.Quantum.Providers.QCI::0.12.20073008-beta" + "Microsoft.Quantum.Providers.IonQ::0.12.20081729-beta", + "Microsoft.Quantum.Providers.Honeywell::0.12.20081729-beta", + "Microsoft.Quantum.Providers.QCI::0.12.20081729-beta" ] } From af56d881195528808e0ddd529ef23e38aca86218 Mon Sep 17 00:00:00 2001 From: Raphael Koh Date: Mon, 17 Aug 2020 22:23:38 -0400 Subject: [PATCH 2/2] Add test to catch QArray args case --- src/Tests/ExecutionPathTracerTests.cs | 17 +++++++++++++++++ .../Workspace.ExecutionPathTracer/Circuits.qs | 18 ++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/Tests/ExecutionPathTracerTests.cs b/src/Tests/ExecutionPathTracerTests.cs index e626a557d2..3cc1c3b6b2 100644 --- a/src/Tests/ExecutionPathTracerTests.cs +++ b/src/Tests/ExecutionPathTracerTests.cs @@ -488,6 +488,23 @@ public void NoQubitArgsTest() Assert.AreEqual(expected.ToJson(), path.ToJson()); } + [TestMethod] + public void WithQArrayArgsTest() + { + var path = GetExecutionPath("WithQArrayArgsCirc"); + var qubits = new QubitDeclaration[] { }; + var operations = new Operation[] + { + new Operation() + { + Gate = "WithQArrayArgs", + DisplayArgs = "([False, True])", + }, + }; + var expected = new ExecutionPath(qubits, operations); + Assert.AreEqual(expected.ToJson(), path.ToJson()); + } + [TestMethod] public void OperationArgsTest() { diff --git a/src/Tests/Workspace.ExecutionPathTracer/Circuits.qs b/src/Tests/Workspace.ExecutionPathTracer/Circuits.qs index 40c01b8675..4dfbd55193 100644 --- a/src/Tests/Workspace.ExecutionPathTracer/Circuits.qs +++ b/src/Tests/Workspace.ExecutionPathTracer/Circuits.qs @@ -7,8 +7,7 @@ namespace Tests.ExecutionPathTracer { // Custom operation operation Foo(theta : Double, (qubit : Qubit, bar : String)) : Unit - is Adj + Ctl { - } + is Adj + Ctl { } operation FooCirc() : Unit { using (q = Qubit()) { @@ -35,16 +34,20 @@ namespace Tests.ExecutionPathTracer { } } - operation NoQubitCirc(n : Int) : Unit { - } + operation NoQubitCirc(n : Int) : Unit { } operation NoQubitArgsCirc() : Unit { NoQubitCirc(2); } - operation OperationCirc(op : (Qubit => Unit), n : Int) : Unit { + operation WithQArrayArgs(bits: Bool[]): Unit { } + + operation WithQArrayArgsCirc(): Unit { + WithQArrayArgs([false, true]); } + operation OperationCirc(op : (Qubit => Unit), n : Int) : Unit { } + operation OperationArgsCirc() : Unit { OperationCirc(H, 5); } @@ -78,8 +81,7 @@ namespace Tests.ExecutionPathTracer { } operation Bar((alpha : Double, beta : Double), (q : Qubit, name : String)) : Unit - is Adj + Ctl { - } + is Adj + Ctl { } operation BigCirc() : Unit { using (qs = Qubit[3]) { @@ -94,5 +96,5 @@ namespace Tests.ExecutionPathTracer { ResetAll(qs); } } - + }