Merge remote-tracking branch 'origin/master' into swernli/decomp-merge-master

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Automatically tag in libraries maintainers on Q# API changes.
+*.qs    @microsoft/quantumlibraries

.github/workflows/automerge.yml

@@ -0,0 +1,38 @@
+# This action allows using the automerge label to automatically merge in pull requests that have been reviewed and that pass
+# status checks (similar to the autocomplete functionality of Azure DevOps).
+name: automerge
+on:
+  pull_request:
+    # Note that we only support automerge on branches that have required checks.
+    branches: 
+      - master
+      - feature/*
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    # Note that we only support automerge on branches that have required checks.
+    branches: 
+      - master
+      - feature/*
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@4536e8847eb62fe2f0ee52c8fa92d17aa97f932f"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash

Simulation.sln

@@ -61,6 +61,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simulation", "Simulation",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Quantum.QSharp.Foundation", "src\Simulation\QsharpFoundation\Microsoft.Quantum.QSharp.Foundation.csproj", "{50614DF8-2DD8-4A0B-9AA9-7843BA563572}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simulators.Tests", "Simulators.Tests", "{0E9E6621-B3B9-42F9-AA13-AF97ADA026E9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestProjects", "TestProjects", "{3CB6D1AC-C606-433D-8D83-182B4A0475F1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Library with Spaces", "src\Simulation\Simulators.Tests\TestProjects\Library with Spaces\Library with Spaces.csproj", "{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -409,6 +415,22 @@ Global
 		{50614DF8-2DD8-4A0B-9AA9-7843BA563572}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
 		{50614DF8-2DD8-4A0B-9AA9-7843BA563572}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
 		{50614DF8-2DD8-4A0B-9AA9-7843BA563572}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.Debug|x64.Build.0 = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.Release|x64.ActiveCfg = Release|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.Release|x64.Build.0 = Release|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -437,6 +459,9 @@ Global
 		{4858E5E3-23FA-4928-B99A-54065875A2B9} = {37CDC768-16D4-4574-8553-07D99D0A72F7}
 		{83C5FC86-9D37-4679-9D91-66288DD975AE} = {2195B643-E782-42E0-9FB0-26F6D90131E6}
 		{50614DF8-2DD8-4A0B-9AA9-7843BA563572} = {83C5FC86-9D37-4679-9D91-66288DD975AE}
+		{0E9E6621-B3B9-42F9-AA13-AF97ADA026E9} = {83C5FC86-9D37-4679-9D91-66288DD975AE}
+		{3CB6D1AC-C606-433D-8D83-182B4A0475F1} = {0E9E6621-B3B9-42F9-AA13-AF97ADA026E9}
+		{F366DB0F-EF25-4196-94F1-0FCC9B9DB1B5} = {3CB6D1AC-C606-433D-8D83-182B4A0475F1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {929C0464-86D8-4F70-8835-0A5EAF930821}

src/Azure/Azure.Quantum.Client/Storage/StorageHelper.cs

@@ -62,7 +62,7 @@ public async Task UploadBlobAsync(
             try
             {
                 // Ensure container is created
-                await containerClient.CreateIfNotExistsAsync(PublicAccessType.Blob, cancellationToken: cancellationToken);
+                await containerClient.CreateIfNotExistsAsync(PublicAccessType.None, cancellationToken: cancellationToken);
 
                 // Upload blob
                 BlobClient blob = containerClient.GetBlobClient(blobName);

src/Simulation/Common/IQuantumProcessor.cs

@@ -517,7 +517,7 @@ public interface IQuantumProcessor
         void Assert(IQArray<Pauli> bases, IQArray<Qubit> qubits, Result result, string msg);
 
         /// <summary>
-        /// Called when <a href="https://docs.microsoft.com/qsharp/api/qsharp/microsoft.quantum.intrinsic.assertprob">Microsoft.Quantum.Intrinsic.Assert</a> is called in Q#.
+        /// Called when <a href="https://docs.microsoft.com/qsharp/api/qsharp/microsoft.quantum.intrinsic.assertprob">Microsoft.Quantum.Intrinsic.AssertProb</a> is called in Q#.
         /// </summary>
         /// <remarks>
         /// The names and the order of the parameters is similar to the corresponding Q# operation./

src/Simulation/Common/SimulatorBase.cs

@@ -31,6 +31,14 @@ public abstract class SimulatorBase : AbstractFactory<AbstractCallable>, IOperat
         public event Action<string>? OnLog = null;
         public event Action<Exception, IEnumerable<StackFrame>>? OnException = null;
 
+
+        /// <summary>
+        ///     An event fired whenever a simulator has additional diagnostic data
+        ///     available for display (e.g. state information, assertion details,
+        ///     execution traces).
+        /// </summary>
+        public event Action<object>? OnDisplayableDiagnostic = null;
+
         public IQubitManager? QubitManager { get; }
 
         public abstract string Name { get; }
@@ -182,6 +190,17 @@ public void EnableExceptionPrinting()
             OnException += WriteStackTraceToLog;
         }
 
+        /// <summary>
+        ///     Sends diagnostic data to any listening display handlers.
+        ///     Display handlers may discard any unrecognized data, such that
+        ///     no guarantee is made as to any particular action taken as a result
+        ///     of calling this method.
+        /// </summary>
+        protected void MaybeDisplayDiagnostic(object data)
+        {
+            OnDisplayableDiagnostic?.Invoke(data);
+        }
+
 
         /// <summary>
         ///     Disables default handling of stack traces, such that stack

src/Simulation/CsharpGeneration.Tests/SimulationCodeTests.fs

@@ -7,6 +7,7 @@ open System
 open System.Collections.Immutable
 open System.IO
 open System.Globalization
+open System.Web
 
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.CSharp
@@ -218,9 +219,13 @@ namespace N1
 
 
     let testOneFile fileName (expected:string) =
-        let expected = expected.Replace("%%%", (Uri(Path.GetFullPath fileName)).AbsolutePath)
-        let expected = expected.Replace("%%", (Path.GetFullPath fileName).Replace("\\", "\\\\"))
-        let tree   = parse [(Path.Combine("Circuits","Intrinsic.qs")); fileName]
+        let fullPath = Path.GetFullPath fileName
+        let escapeCSharpString (s : string) = SymbolDisplay.FormatLiteral (s, false)
+        let expected =
+            expected
+            |> (fun s -> s.Replace("%%%", fullPath |> HttpUtility.JavaScriptStringEncode |> escapeCSharpString))
+            |> (fun s -> s.Replace("%%", fullPath |> escapeCSharpString))
+        let tree = parse [Path.Combine ("Circuits", "Intrinsic.qs"); fileName]
         let actual =
             CodegenContext.Create (tree, ImmutableDictionary.Empty)
             |> generate (Path.GetFullPath fileName |> NonNullable<string>.New)
@@ -2307,7 +2312,7 @@ namespace N1
         false |> testOne randomOperation
 
     let testOneClass (_,op : QsCallable) executionTarget (expected : string) =
-        let expected = expected.Replace("%%%", op.SourceFile.Value)
+        let expected = expected.Replace("%%%", HttpUtility.JavaScriptStringEncode op.SourceFile.Value)
         let assemblyConstants =
             new System.Collections.Generic.KeyValuePair<_,_> (AssemblyConstants.ExecutionTarget, executionTarget)
             |> Seq.singleton
@@ -3397,7 +3402,7 @@ using Microsoft.Quantum.Simulation.Core;
 #line hidden
 namespace Microsoft.Quantum.Tests.Inline
 {
-    [SourceLocation("%%%", OperationFunctor.Body, 7, -1)]
+    [SourceLocation("%%", OperationFunctor.Body, 7, -1)]
     public partial class HelloWorld : Operation<Int64, Int64>, ICallable
     {
         public HelloWorld(IOperationFactory m) : base(m)
@@ -3454,7 +3459,7 @@ using Microsoft.Quantum.Simulation.Core;
 #line hidden
 namespace Microsoft.Quantum.Tests.LineNumbers
 {
-    [SourceLocation("%%%", OperationFunctor.Body, 9, -1)]
+    [SourceLocation("%%", OperationFunctor.Body, 9, -1)]
     public partial class TestLineInBlocks : Operation<Int64, Result>, ICallable
     {
         public TestLineInBlocks(IOperationFactory m) : base(m)
@@ -3628,7 +3633,7 @@ namespace Microsoft.Quantum.Diagnostics
 #line hidden
 namespace Microsoft.Quantum.Tests.UnitTests
 {
-    [SourceLocation("%%%", OperationFunctor.Body, 22, 26)]
+    [SourceLocation("%%", OperationFunctor.Body, 22, 26)]
     public partial class UnitTest1 : Operation<QVoid, QVoid>, ICallable
     {
         public UnitTest1(IOperationFactory m) : base(m)
@@ -3651,7 +3656,7 @@ namespace Microsoft.Quantum.Tests.UnitTests
             [Xunit.Trait("Target", "QuantumSimulator")]
             [Xunit.Trait("Name", "UnitTest1")]
             public void UnitTest1()
-#line 22 "%%%"
+#line 22 "%%"
             {
                 var sim = new Microsoft.Quantum.Simulation.Simulators.QuantumSimulator();
                 if (sim is Microsoft.Quantum.Simulation.Common.SimulatorBase baseSim && this.Output != null)
@@ -3683,7 +3688,7 @@ namespace Microsoft.Quantum.Tests.UnitTests
             [Xunit.Trait("Target", "ToffoliSimulator")]
             [Xunit.Trait("Name", "UnitTest1")]
             public void UnitTest1()
-#line 22 "%%%"
+#line 22 "%%"
             {
                 var sim = new Microsoft.Quantum.Simulation.Simulators.ToffoliSimulator();
                 if (sim is Microsoft.Quantum.Simulation.Common.SimulatorBase baseSim && this.Output != null)
@@ -3721,7 +3726,7 @@ namespace Microsoft.Quantum.Tests.UnitTests
         }
     }
 
-    [SourceLocation("%%%", OperationFunctor.Body, 26, -1)]
+    [SourceLocation("%%", OperationFunctor.Body, 26, -1)]
     public partial class UnitTest2 : Operation<QVoid, QVoid>, ICallable
     {
         public UnitTest2(IOperationFactory m) : base(m)
@@ -3744,7 +3749,7 @@ namespace Microsoft.Quantum.Tests.UnitTests
             [Xunit.Trait("Target", "CustomSimulator")]
             [Xunit.Trait("Name", "UnitTest2")]
             public void UnitTest2()
-#line 26 "%%%"
+#line 26 "%%"
             {
                 var sim = new SomeNamespace.CustomSimulator();
                 if (sim is Microsoft.Quantum.Simulation.Common.SimulatorBase baseSim && this.Output != null)

src/Simulation/CsharpGeneration/Microsoft.Quantum.CsharpGeneration.fsproj

@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Quantum.Compiler" Version="0.11.2006.2118-beta" />
+    <PackageReference Include="Microsoft.Quantum.Compiler" Version="0.11.2006.3017-alpha" />
   </ItemGroup>
 
   <ItemGroup>

src/Simulation/CsharpGeneration/SimulationCode.fs

@@ -1573,13 +1573,10 @@ module SimulationCode =
         generator.Apply elements
 
     // Returns only those namespaces and their elements that are defined for the given file.
-    let findLocalElements selector fileName syntaxTree =
-        let path =
-            match CompilationBuilder.CompilationUnitManager.TryGetUri fileName with
-            | true, uri -> uri.AbsolutePath |> NonNullable<string>.New
-            | false, _ -> NonNullable<string>.New ""
+    let findLocalElements selector (fileName : NonNullable<string>) syntaxTree =
         syntaxTree
-        |> Seq.map (fun ns -> (ns.Name, (FilterBySourceFile.Apply (ns, path)).Elements |> Seq.choose selector |> Seq.toList))
+        |> Seq.map (fun ns ->
+            (ns.Name, (FilterBySourceFile.Apply (ns, fileName)).Elements |> Seq.choose selector |> Seq.toList))
         |> Seq.sortBy fst
         |> Seq.filter (fun (_,elements) -> not elements.IsEmpty)
         |> Seq.toList

src/Simulation/EntryPointDriver.Tests/Tests.Microsoft.Quantum.EntryPointDriver.fsproj

@@ -5,6 +5,7 @@
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
     <RootNamespace>Microsoft.Quantum.EntryPointDriver.Tests</RootNamespace>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>

src/Simulation/EntryPointDriver.Tests/Tests.fs

@@ -475,15 +475,15 @@ let ``Shadows --shots`` () =
 
 // The expected output from the resources estimator.
 let private resourceSummary =
-    "Metric          Sum
-     CNOT            0
-     QubitClifford   1
-     R               0
-     Measure         1
-     T               0
-     Depth           0
-     Width           1
-     BorrowedWidth   0"
+    "Metric          Sum Max
+     CNOT            0   0
+     QubitClifford   1   1
+     R               0   0
+     Measure         1   1
+     T               0   0
+     Depth           0   0
+     Width           1   1
+     BorrowedWidth   0   0"
 
 [<Fact>]
 let ``Supports QuantumSimulator`` () =

src/Simulation/EntryPointDriver/Microsoft.Quantum.EntryPointDriver.csproj

@@ -7,6 +7,18 @@
     <Nullable>enable</Nullable>
     <PackageId>Microsoft.Quantum.EntryPointDriver</PackageId>
     <Description>The standard command-line interface for standalone Q# console applications.</Description>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Authors>Microsoft</Authors>
+    <Description>Entry point driver for Q# command line applications.</Description>
+    <PackageReleaseNotes>See: https://docs.microsoft.com/en-us/quantum/relnotes/</PackageReleaseNotes>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/microsoft/qsharp-runtime</PackageProjectUrl>
+    <PackageIconUrl>https://secure.gravatar.com/avatar/bd1f02955b2853ba0a3b1cdc2434e8ec.png</PackageIconUrl>
+    <PackageTags>Quantum Q# Qsharp</PackageTags>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>

src/Simulation/QCTraceSimulator.Tests/Circuits/RandomTests.qs

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+
+namespace Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.Tests {
+    open Microsoft.Quantum.Intrinsic;
+    open Microsoft.Quantum.Diagnostics;
+
+    internal function Fact(condition : Bool, message : String) : Unit {
+        if (not condition) {
+            fail message;
+        }
+    }
+
+    @Test("ResourcesEstimator")
+    /// # Summary
+    /// Checks for regression against microsoft/qsharp-runtime#256.
+    operation CheckRandomInCorrectRange() : Unit {
+        for (idxTrial in 0..99) {
+            let sample = Random([1.0, 2.0, 2.0]);
+
+            Fact(0 <= sample and sample <= 2, $"sample was {sample}, not in range [0, 2]");
+        }
+    }
+}

src/Simulation/QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.11.2006.2118-beta">
+<Project Sdk="Microsoft.Quantum.Sdk/0.11.2006.3017-alpha">
 
   <Import Project="..\Common\AssemblyCommon.props" />
   <Import Project="..\Common\Simulators.Dev.props" />

src/Simulation/QsharpCore/Arrays/Enumeration.qs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace Microsoft.Quantum.Arrays {
+    open Microsoft.Quantum.Intrinsic;
+    open Microsoft.Quantum.Canon;
+
+    /// # Summary
+    /// Given an array, returns a range over the indices of that array, suitable
+    /// for use in a for loop.
+    ///
+    /// # Type Parameters
+    /// ## 'TElement
+    /// The type of elements of the array.
+    ///
+    /// # Input
+    /// ## array
+    /// An array for which a range of indices should be returned.
+    ///
+    /// # Output
+    /// A range over all indices of the array.
+    ///
+    /// # Example
+    /// The following `for` loops are equivalent:
+    /// ```Q#
+    /// for (idx in IndexRange(array)) { ... }
+    /// for (idx in IndexRange(array)) { ... }
+    /// ```
+    function IndexRange<'TElement>(array : 'TElement[]) : Range {
+       return 0..(Length(array) - 1);
+    }
+
+}