Add support for target packages (merge from feature/decomp)

AdvantageBenchmark/privateBuild/host.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.13.20102604">
+<Project Sdk="Microsoft.Quantum.Sdk/0.14.2012122063-beta">
   <!-- Add project references to Simulator and other required packages: -->
   <Import Project="..\..\src\Simulation\Common\Simulators.Dev.props" />
 
@@ -8,4 +8,9 @@
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages> <!-- otherwise the standard library is included by the Sdk -->
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Simulation\Simulators\Microsoft.Quantum.Simulators.csproj" />
+    <ProjectReference Include="..\..\src\Simulation\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" />
+  </ItemGroup>
+
 </Project>

AdvantageBenchmark/releasedBuild/quantum/quantum.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Quantum.Sdk/0.13.20102604">
+<Project Sdk="Microsoft.Quantum.Sdk/0.14.2012122063-beta">
 
   <ItemGroup>
     <QSharpCompile Include="..\..\privateBuild\quantum.qs" />

NOTICE.txt

@@ -2715,7 +2715,7 @@ SOFTWARE.
 
 -------------------------------------------------------------------
 
-Microsoft.Quantum.Compiler 0.12.20082209-beta - MIT
+Microsoft.Quantum.Compiler 0.13.20102604 - MIT
 
 
 (c) 2008 VeriSign, Inc.

build/manifest.ps1

@@ -24,6 +24,8 @@ $artifacts = @{
         "Microsoft.Quantum.Development.Kit",
         "Microsoft.Quantum.EntryPointDriver",
         "Microsoft.Quantum.QSharp.Core",
+        "Microsoft.Quantum.Type1.Core",
+        "Microsoft.Quantum.Type2.Core",
         "Microsoft.Quantum.Runtime.Core",
         "Microsoft.Quantum.Simulators",
         "Microsoft.Quantum.Xunit"
@@ -37,6 +39,9 @@ $artifacts = @{
         ".\src\Simulation\Core\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Runtime.Core.dll",
         ".\src\Simulation\EntryPointDriver\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.EntryPointDriver.dll",
         ".\src\Simulation\QSharpCore\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.QSharp.Core.dll",
+        ".\src\Simulation\Type1Core\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Type1.Core.dll",
+        ".\src\Simulation\Type2Core\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Type2.Core.dll",
+        ".\src\Simulation\QSharpFoundation\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.QSharp.Foundation.dll",
         ".\src\Simulation\Simulators\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Simulation.Common.dll",
         ".\src\Simulation\Simulators\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.dll",
         ".\src\Simulation\Simulators\bin\$Env:BUILD_CONFIGURATION\netstandard2.1\Microsoft.Quantum.Simulators.dll",

build/pack.ps1

@@ -65,7 +65,11 @@ Pack-Dotnet '../src/Azure/Azure.Quantum.Client/Microsoft.Azure.Quantum.Client.cs
 Pack-One '../src/Simulation/CSharpGeneration/Microsoft.Quantum.CSharpGeneration.fsproj' '-IncludeReferencedProjects'
 Pack-Dotnet '../src/Simulation/EntryPointDriver/Microsoft.Quantum.EntryPointDriver.csproj'
 Pack-Dotnet '../src/Simulation/Core/Microsoft.Quantum.Runtime.Core.csproj'
+Pack-Dotnet '../src/Simulation/TargetDefinitions/Interfaces/Microsoft.Quantum.Targets.Interfaces.csproj'
+Pack-Dotnet '../src/Simulation/QSharpFoundation/Microsoft.Quantum.QSharp.Foundation.csproj'
 Pack-Dotnet '../src/Simulation/QSharpCore/Microsoft.Quantum.QSharp.Core.csproj'
+Pack-Dotnet '../src/Simulation/Type1Core/Microsoft.Quantum.Type1.Core.csproj'
+Pack-Dotnet '../src/Simulation/Type2Core/Microsoft.Quantum.Type2.Core.csproj'
 Pack-One '../src/Simulation/Simulators/Microsoft.Quantum.Simulators.nuspec'
 Pack-One '../src/Quantum.Development.Kit/Microsoft.Quantum.Development.Kit.nuspec'
 Pack-One '../src/Xunit/Microsoft.Quantum.Xunit.csproj'

src/Simulation/CSharpGeneration.Tests/SimulationCodeTests.fs

@@ -1710,7 +1710,7 @@ namespace N1
 
     let testOneSpecialization pick (_,op) expected =
         let context = createTestContext op
-        let actual  = op |> pick |> buildSpecialization context |> Option.map (fst >> formatSyntaxTree)
+        let actual  = op |> pick |> buildSpecialization context op |> Option.map (fst >> formatSyntaxTree)
         Assert.Equal(expected |> Option.map clearFormatting, actual |> Option.map clearFormatting)
 
     [<Fact>]
@@ -2315,7 +2315,7 @@ namespace N1
     [<Fact>]
     let ``is abstract`` () =
         let testOne (_,op) expected =
-            let actual = op |> isAbstract
+            let actual = op |> isIntrinsic
             Assert.Equal(expected, actual)
 
         true  |> testOne emptyOperation

src/Simulation/CSharpGeneration.Tests/Tests.CSharpGeneration.fsproj

@@ -52,10 +52,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Core\Microsoft.Quantum.Runtime.Core.csproj" />
     <ProjectReference Include="..\CSharpGeneration\Microsoft.Quantum.CSharpGeneration.fsproj" />
-    <ProjectReference Include="..\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" />
     <ProjectReference Include="..\Simulators\Microsoft.Quantum.Simulators.csproj" />
+    <ProjectReference Include="..\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" />
   </ItemGroup>
 
 </Project>

src/Simulation/CSharpGeneration/Microsoft.Quantum.CSharpGeneration.fsproj

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

src/Simulation/CSharpGeneration/SimulationCode.fs

@@ -45,6 +45,15 @@ module SimulationCode =
             "Microsoft.Quantum.Simulation.Core"
         ]
 
+    let autoNamespacesWithInterfaces =
+        [
+            "System"
+            "Microsoft.Quantum.Core"
+            "Microsoft.Quantum.Intrinsic"
+            "Microsoft.Quantum.Intrinsic.Interfaces"
+            "Microsoft.Quantum.Simulation.Core"
+        ]
+
     let funcsAsProps = [
         ("Length", { Namespace = "Microsoft.Quantum.Core"; Name = "Length" } )
         ("Start",  { Namespace = "Microsoft.Quantum.Core"; Name = "RangeStart" } )
@@ -69,16 +78,24 @@ module SimulationCode =
     let prependNamespaceString (name : QsQualifiedName) =
         name.Namespace.Replace (".", "__") + "__" + name.Name
 
+    let isConcreteIntrinsic (context:CodegenContext) =
+        match context.assemblyConstants.TryGetValue AssemblyConstants.GenerateConcreteIntrinsic with
+        | true, "false" -> false
+        | true, _ -> true
+        | false, _ -> false
+
     let needsFullPath context (op:QsQualifiedName) =
         let hasMultipleDefinitions() = if context.byName.ContainsKey op.Name then context.byName.[op.Name].Length > 1 else false
         let sameNamespace = match context.current with | None -> false | Some n -> n.Namespace = op.Namespace
 
+        let namespaces = if isConcreteIntrinsic context then autoNamespacesWithInterfaces else autoNamespaces
+
         if sameNamespace then
             false
         elif hasMultipleDefinitions() then
             true
         else
-            not (autoNamespaces |> List.contains op.Namespace)
+            not (namespaces |> List.contains op.Namespace)
 
     let getOpName context n =
         if isCurrentOp context n then Directives.Self
@@ -913,6 +930,18 @@ module SimulationCode =
             ``{`` [] ``}``
         :> MemberDeclarationSyntax
 
+    /// Returns the constructor for the given intrinsic operation.
+    let buildIntrinsicConstructor context name : MemberDeclarationSyntax =
+        ``constructor`` name ``(`` [ ("m", ``type`` "IOperationFactory") ] ``)``
+            ``:`` [ "m" ]
+            [ ``public`` ]
+            ``{``
+                [
+                    (``ident`` "this") <|.|> (``ident`` "Gate") <-- (``ident`` "m") |~> ("IGate_" + name) |> statement
+                ]
+            ``}``
+        :> MemberDeclarationSyntax
+
     /// For each Operation used in the given OperationDeclartion, returns
     /// a Property that returns an instance of the operation by calling the
     /// IOperationFactory
@@ -957,41 +986,33 @@ module SimulationCode =
             (``=>`` newInstance)
         :> MemberDeclarationSyntax
 
-    let buildSpecializationBody context (sp:QsSpecialization) =
+    let buildSpecializationBody (context:CodegenContext) (op:QsCallable) (sp:QsSpecialization) =
+        let getInputVarWithInit args =
+            let inData = ``ident`` "__in__"
+            let name = function | ValidName n -> n | InvalidName -> ""
+            let rec buildVariableName = function
+                | QsTupleItem  one -> one.VariableName |> name
+                | QsTuple     many -> "(" + (many |> Seq.map buildVariableName |> String.concat ",") + ")"
+            match args with
+            | QsTupleItem one -> (one.VariableName |> name, [])
+            | QsTuple many    ->
+                if many.Length = 0 then
+                    ("__in__", [])
+                elif many.Length = 1 then
+                    ("__in__", [ ``var`` (buildVariableName many.[0]) (``:=`` <| inData) ])
+                else
+                    ("__in__", [ ``var`` (buildVariableName args) (``:=`` <| inData) ])
         match sp.Implementation with
         | Provided (args, _) ->
-            let returnType  = sp.Signature.ReturnType
+            let argName, argsInit = getInputVarWithInit args
             let statements  =
                 let builder = new SyntaxBuilder(context)
                 builder.Namespaces.OnSpecializationDeclaration sp |> ignore
                 builder.BuiltStatements
-
-            let inData = ``ident`` "__in__"
             let ret =
-                match returnType.Resolution with
-                | QsTypeKind.UnitType ->
-                    [
-                        ``#line hidden`` <|
-                        ``return`` ( Some ((``ident`` "QVoid") <|.|> (``ident`` "Instance")) )
-                    ]
-                | _ ->
-                    []
-            let (argName, argsInit) =
-//TODO: diagnostics.
-                let name = function | ValidName n -> n | InvalidName -> ""
-                let rec buildVariableName = function
-                    | QsTupleItem  one -> one.VariableName |> name
-                    | QsTuple     many -> "(" + (many |> Seq.map buildVariableName |> String.concat ",") + ")"
-                match args with
-                | QsTupleItem one -> (one.VariableName |> name, [])
-                | QsTuple many    ->
-                    if many.Length = 0 then
-                        ("__in__", [])
-                    elif many.Length = 1 then
-                        ("__in__", [ ``var`` (buildVariableName many.[0]) (``:=`` <| inData) ])
-                    else
-                        ("__in__", [ ``var`` (buildVariableName args) (``:=`` <| inData) ])
-
+                match sp.Signature.ReturnType.Resolution with
+                | QsTypeKind.UnitType -> [ ``return`` ( Some ((``ident`` "QVoid") <|.|> (``ident`` "Instance")) ) |> ``#line hidden`` ]
+                | _ -> []
             Some (``() => {}`` [ argName ] (argsInit @ statements @ ret) :> ExpressionSyntax)
         | Generated SelfInverse ->
             let adjointedBodyName =
@@ -1001,10 +1022,50 @@ module SimulationCode =
 //TODO: diagnostics.
                 | _ -> "__Body__"
             Some (``ident`` adjointedBodyName :> ExpressionSyntax)
+        | Intrinsic when isConcreteIntrinsic context ->
+            // Add in the control qubits parameter when dealing with a controlled spec
+            let args =
+                match sp.Kind with
+                | QsControlled | QsControlledAdjoint ->
+                    let ctlVar =
+                        let name = ValidName("__controlQubits__")
+                        let varType = Qubit |> ResolvedType.New |> ArrayType |> ResolvedType.New
+                        let info = InferredExpressionInformation.New(false, false)
+                        let pos = QsNullable<Position>.Null
+                        let range = Range.Zero
+                        {VariableName = name; Type = varType; InferredInformation = info; Position = pos; Range = range}
+                    match op.ArgumentTuple with
+                    | QsTuple many when many.Length = 1 ->
+                        QsTuple(ImmutableArray.Create(QsTupleItem(ctlVar), many.[0]))
+                    | _ -> QsTuple(ImmutableArray.Create(QsTupleItem(ctlVar), op.ArgumentTuple))
+                | _ -> op.ArgumentTuple
+            let argName, argsInit = getInputVarWithInit args
+            let specCall =
+                (userDefinedName None op.FullName.Name) + "__" +
+                match sp.Kind with
+                | QsBody -> ""
+                | QsAdjoint -> "Adjoint"
+                | QsControlled -> "Controlled"
+                | QsControlledAdjoint -> "ControlledAdjoint"
+                + "Body"
+            let name = function | ValidName n -> ``ident`` n | InvalidName -> ``ident`` ""
+            let rec argsToVars = function
+                | QsTupleItem one -> [one.VariableName |> name]
+                | QsTuple many -> many |> Seq.map argsToVars |> List.concat
+            let callExp = (``ident`` "Gate") <.> (``ident`` specCall, argsToVars args)
+            let statements =
+                match sp.Signature.ReturnType.Resolution with
+                | QsTypeKind.UnitType ->
+                    [
+                        callExp |> statement
+                        ``return`` ( Some ((``ident`` "QVoid") <|.|> (``ident`` "Instance")) ) |> ``#line hidden``
+                    ]
+                | _ -> [ ``return`` ( Some callExp ) ]
+            Some (``() => {}`` [ argName ] (argsInit @ statements) :> ExpressionSyntax)
         | _ ->
             None
 
-    let buildSpecialization context (sp:QsSpecialization) : (PropertyDeclarationSyntax * _) option =
+    let buildSpecialization context (op:QsCallable) (sp:QsSpecialization) : (PropertyDeclarationSyntax * _) option =
         let inType  = roslynTypeName context sp.Signature.ArgumentType
         let outType = roslynTypeName context sp.Signature.ReturnType
         let propertyType = "Func<" + inType + ", " + outType + ">"
@@ -1014,7 +1075,7 @@ module SimulationCode =
             | QsAdjoint           -> "Adjoint"
             | QsControlled        -> "Controlled"
             | QsControlledAdjoint -> "ControlledAdjoint"
-        let body = buildSpecializationBody context sp
+        let body = buildSpecializationBody context op sp
         let attributes =
             match sp.Location with
             | Null -> []
@@ -1217,6 +1278,10 @@ module SimulationCode =
             ``get`` (``=>`` (``literal`` name) )
         :> MemberDeclarationSyntax
 
+    let buildGate name =
+        ``propg`` ("IGate_" + name) "Gate" [ ``private``; ``protected`` ]
+        :> MemberDeclarationSyntax
+
     let buildFullName (name : QsQualifiedName) =
         let fqn =
             let ns = name.Namespace
@@ -1336,7 +1401,7 @@ module SimulationCode =
         let nonGeneric = if typeParameters.IsEmpty then name else sprintf "%s<%s>" name (String.Join(",", typeParameters))
         (name, nonGeneric)
 
-    let isAbstract op =
+    let isIntrinsic op =
         let isBody (sp:QsSpecialization) = match sp.Kind with | QsBody when sp.Implementation <> Intrinsic -> true | _ -> false
         not (op.Specializations |> Seq.exists isBody)
 
@@ -1385,16 +1450,20 @@ module SimulationCode =
         let opNames = operationDependencies op
         let inType   = op.Signature.ArgumentType |> roslynTypeName context
         let outType  = op.Signature.ReturnType   |> roslynTypeName context
+        let opIsIntrinsic = isIntrinsic op
+        let isConcreteIntrinsic = opIsIntrinsic && isConcreteIntrinsic context
 
-        let constructors = [ (buildConstructor context name) ]
+        let constructors = [ ((if isConcreteIntrinsic then buildIntrinsicConstructor else buildConstructor) context name) ]
         let properties =
             let opProperties = buildOpsProperties context opNames
-            buildName name ::
-            buildFullName context.current.Value ::
-            if globalContext.entryPoints |> Seq.contains op.FullName then
-                buildOperationInfoProperty globalContext inType outType nonGenericName ::
-                opProperties
-            else opProperties
+            [
+                yield buildName name
+                yield buildFullName context.current.Value
+                if globalContext.entryPoints |> Seq.contains op.FullName then
+                    yield buildOperationInfoProperty globalContext inType outType nonGenericName
+                if isConcreteIntrinsic then yield buildGate name
+                yield! opProperties
+            ]
 
         let baseOp =
             if isFunction op then
@@ -1411,7 +1480,7 @@ module SimulationCode =
         let typeParameters = typeParametersNames op.Signature
         let baseClass = genericBase baseOp ``<<`` typeArgsInterface ``>>``
         let bodies, attr =
-            op.Specializations |> Seq.map (buildSpecialization context) |> Seq.choose id |> Seq.toList
+            op.Specializations |> Seq.map (buildSpecialization context op) |> Seq.choose id |> Seq.toList
             |> List.map (fun (x, y) -> (x :> MemberDeclarationSyntax, y)) |> List.unzip
         let inData  = (buildDataWrapper context "In"  op.Signature.ArgumentType)
         let outData = (buildDataWrapper context "Out" op.Signature.ReturnType)
@@ -1441,7 +1510,7 @@ module SimulationCode =
 
         let modifiers =
             let access = classAccessModifier op.Modifiers.Access
-            if isAbstract op then
+            if opIsIntrinsic && not isConcreteIntrinsic then
                 [ access; ``abstract``; ``partial`` ]
             else
                 [ access; ``partial`` ]
@@ -1625,7 +1694,8 @@ module SimulationCode =
 
     // Builds the C# syntaxTree for the Q# elements defined in the given file.
     let buildSyntaxTree localElements (context : CodegenContext) =
-        let usings = autoNamespaces |> List.map (fun ns -> ``using`` ns)
+        let namespaces = if isConcreteIntrinsic context then autoNamespacesWithInterfaces else autoNamespaces
+        let usings = namespaces |> List.map (fun ns -> ``using`` ns)
         let attributes = localElements |> List.map (snd >> buildDeclarationAttributes) |> List.concat
         let namespaces = localElements |> List.map (buildNamespace context)
 

src/Simulation/Common/AssemblyCommon.props

@@ -5,6 +5,12 @@
     <Authors>Microsoft</Authors>
     <Product>Microsoft Quantum Development Kit Preview</Product>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <PackageReleaseNotes>See: https://docs.microsoft.com/en-us/quantum/relnotes/</PackageReleaseNotes>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <ProjectUrl>https://docs.microsoft.com/quantum/</ProjectUrl>
+    <PackageProjectUrl>https://github.com/microsoft/qsharp-runtime</PackageProjectUrl>
+    <PackageIcon>qdk-nuget-icon.png</PackageIcon>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>  
 
   <!-- 

src/Simulation/Common/Microsoft.Quantum.Simulation.Common.csproj

@@ -14,7 +14,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Core\Microsoft.Quantum.Runtime.Core.csproj" />
-    <ProjectReference Include="..\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" />
   </ItemGroup>
 
 </Project>