From 359afe80308e0400320c1d90ce27feda8a8fdcbc Mon Sep 17 00:00:00 2001 From: Raphael Koh Date: Wed, 22 Jul 2020 15:55:33 -0400 Subject: [PATCH 1/2] Add tests for operations with operations as arguments --- src/Tests/ExecutionPathTracerTests.cs | 19 ++++++++++++++++++- .../Workspace.ExecutionPathTracer/Circuits.qs | 7 +++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/Tests/ExecutionPathTracerTests.cs b/src/Tests/ExecutionPathTracerTests.cs index 4f8b3f9e66..1a832d63d9 100644 --- a/src/Tests/ExecutionPathTracerTests.cs +++ b/src/Tests/ExecutionPathTracerTests.cs @@ -441,7 +441,7 @@ public void EmptyTest() public void NoQubitArgsTest() { var path = GetExecutionPath("NoQubitArgsCirc"); - var qubits = new QubitDeclaration[] {}; + var qubits = new QubitDeclaration[] { }; var operations = new Operation[] { new Operation() @@ -454,6 +454,23 @@ public void NoQubitArgsTest() Assert.AreEqual(expected.ToJson(), path.ToJson()); } + [TestMethod] + public void OperationArgsTest() + { + var path = GetExecutionPath("OperationArgsCirc"); + var qubits = new QubitDeclaration[] { }; + var operations = new Operation[] + { + new Operation() + { + Gate = "OperationCirc", + DisplayArgs = "(H, 5)", + }, + }; + var expected = new ExecutionPath(qubits, operations); + Assert.AreEqual(expected.ToJson(), path.ToJson()); + } + [TestMethod] public void NestedTest() { diff --git a/src/Tests/Workspace.ExecutionPathTracer/Circuits.qs b/src/Tests/Workspace.ExecutionPathTracer/Circuits.qs index 2090706ffa..08cc8744bf 100644 --- a/src/Tests/Workspace.ExecutionPathTracer/Circuits.qs +++ b/src/Tests/Workspace.ExecutionPathTracer/Circuits.qs @@ -42,6 +42,13 @@ namespace Tests.ExecutionPathTracer { NoQubitCirc(2); } + operation OperationCirc(op : (Qubit => Unit), n : Int) : Unit { + } + + operation OperationArgsCirc() : Unit { + OperationCirc(H, 5); + } + operation NestedCirc() : Unit { using (q = Qubit()) { H(q); From 987a3e1ba22bd669aae05916ceae2a6779c564bf Mon Sep 17 00:00:00 2001 From: "Project Collection Build Service (ms-quantum)" <> Date: Thu, 23 Jul 2020 07:08:27 +0000 Subject: [PATCH 2/2] Build 0.12.2007.2301. --- images/iqsharp-base/Dockerfile | 2 +- src/AzureClient/AzureClient.csproj | 2 +- src/Core/Core.csproj | 6 +++--- src/Tool/appsettings.json | 30 +++++++++++++++--------------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/images/iqsharp-base/Dockerfile b/images/iqsharp-base/Dockerfile index 70de001825..ca13b38bed 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.20071622-beta" && \ +RUN dotnet new -i "Microsoft.Quantum.ProjectTemplates::0.12.20072301-beta" && \ dotnet tool install \ --global \ Microsoft.Quantum.IQSharp \ diff --git a/src/AzureClient/AzureClient.csproj b/src/AzureClient/AzureClient.csproj index bc935f111a..2a99281c8f 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 15ab736d85..082d045851 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -34,9 +34,9 @@ - - - + + + diff --git a/src/Tool/appsettings.json b/src/Tool/appsettings.json index eeda33e3fe..f3fd49e8e7 100644 --- a/src/Tool/appsettings.json +++ b/src/Tool/appsettings.json @@ -6,25 +6,25 @@ }, "AllowedHosts": "*", "DefaultPackageVersions": [ - "Microsoft.Quantum.Compiler::0.12.20071622-beta", + "Microsoft.Quantum.Compiler::0.12.20072301-beta", - "Microsoft.Quantum.CsharpGeneration::0.12.20071622-beta", - "Microsoft.Quantum.Development.Kit::0.12.20071622-beta", - "Microsoft.Quantum.Simulators::0.12.20071622-beta", - "Microsoft.Quantum.Xunit::0.12.20071622-beta", + "Microsoft.Quantum.CsharpGeneration::0.12.20072301-beta", + "Microsoft.Quantum.Development.Kit::0.12.20072301-beta", + "Microsoft.Quantum.Simulators::0.12.20072301-beta", + "Microsoft.Quantum.Xunit::0.12.20072301-beta", - "Microsoft.Quantum.Standard::0.12.20071622-beta", - "Microsoft.Quantum.Chemistry::0.12.20071622-beta", - "Microsoft.Quantum.Chemistry.Jupyter::0.12.20071622-beta", - "Microsoft.Quantum.MachineLearning::0.12.20071622-beta", - "Microsoft.Quantum.Numerics::0.12.20071622-beta", + "Microsoft.Quantum.Standard::0.12.20072301-beta", + "Microsoft.Quantum.Chemistry::0.12.20072301-beta", + "Microsoft.Quantum.Chemistry.Jupyter::0.12.20072301-beta", + "Microsoft.Quantum.MachineLearning::0.12.20072301-beta", + "Microsoft.Quantum.Numerics::0.12.20072301-beta", - "Microsoft.Quantum.Katas::0.12.20071622-beta", + "Microsoft.Quantum.Katas::0.12.20072301-beta", - "Microsoft.Quantum.Research::0.12.20071622-beta", + "Microsoft.Quantum.Research::0.12.20072301-beta", - "Microsoft.Quantum.Providers.IonQ::0.12.20071622-beta", - "Microsoft.Quantum.Providers.Honeywell::0.12.20071622-beta", - "Microsoft.Quantum.Providers.QCI::0.12.20071622-beta" + "Microsoft.Quantum.Providers.IonQ::0.12.20072301-beta", + "Microsoft.Quantum.Providers.Honeywell::0.12.20072301-beta", + "Microsoft.Quantum.Providers.QCI::0.12.20072301-beta" ] }