Skip to content
This repository has been archived by the owner on Jan 12, 2024. It is now read-only.

Regenerate Libraries #464

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

Regenerate Libraries #464

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6562491
Generate the C# for used libraries.
ScottCarda-MS Oct 2, 2020
320a29d
Libraries don't regenerate libraries
ScottCarda-MS Oct 5, 2020
8c37ae9
Merge branch 'main' into sccarda/RegenerateLibraries
ScottCarda-MS Oct 23, 2020
a8ae703
Merge branch 'main' into sccarda/RegenerateLibraries
ScottCarda-MS Oct 26, 2020
95adf33
Merge branch 'main' into sccarda/RegenerateLibraries
ScottCarda-MS Oct 28, 2020
ee0a4ad
Merge branch 'main' into sccarda/RegenerateLibraries
ScottCarda-MS Nov 2, 2020
0848dbb
Merge branch 'main' into sccarda/RegenerateLibraries
ScottCarda-MS Dec 7, 2020
0c33c2c
updated qdk version number to 0.14.201219763-alpha
ScottCarda-MS Dec 17, 2020
3b34c43
Dump Machine and Dump Register as body intrinsic
ScottCarda-MS Dec 17, 2020
f307ab5
update RegisterPrimitiveOperationsGivenAsCircuits
ScottCarda-MS Jan 5, 2021
d914b2b
Revert to original version numbers
ScottCarda-MS Jan 5, 2021
cfaa97d
Revert "update RegisterPrimitiveOperationsGivenAsCircuits"
ScottCarda-MS Jan 5, 2021
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
2 changes: 1 addition & 1 deletion src/Simulation/CsharpGeneration/Microsoft.Quantum.CsharpGeneration.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.201219763-alpha" />
</ItemGroup>

<ItemGroup>
Expand Down
22 changes: 16 additions & 6 deletions src/Simulation/CsharpGeneration/RewriteStep.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,22 @@ type Emitter() =
let context = CodegenContext.Create (compilation, step.AssemblyConstants)
let allSources = GetSourceFiles.Apply compilation.Namespaces

for source in allSources |> Seq.filter context.GenerateCodeForSource do
let content = SimulationCode.generate source context
CompilationLoader.GeneratedFile(source, dir, ".g.cs", content) |> ignore
for source in allSources |> Seq.filter (not << context.GenerateCodeForSource) do
let content = SimulationCode.loadedViaTestNames source context
if content <> null then CompilationLoader.GeneratedFile(source, dir, ".dll.g.cs", content) |> ignore
let isExe =
match context.assemblyConstants.TryGetValue AssemblyConstants.QsharpOutputType with
| true, outputType -> outputType = AssemblyConstants.QsharpExe
| _ -> false

if isExe then
Copy link
Contributor

@bettinaheim bettinaheim Dec 23, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic for determining whether to emit C# for a particular source (whether source code or an assembly reference) is handled by GenerateCodeForSource. Please adapt it there rather than adding an additional branching here.

for source in allSources do
let content = SimulationCode.generate source context
CompilationLoader.GeneratedFile(source, dir, ".g.cs", content) |> ignore
else
for source in allSources |> Seq.filter context.GenerateCodeForSource do
let content = SimulationCode.generate source context
CompilationLoader.GeneratedFile(source, dir, ".g.cs", content) |> ignore
for source in allSources |> Seq.filter (not << context.GenerateCodeForSource) do
let content = SimulationCode.loadedViaTestNames source context
if content <> null then CompilationLoader.GeneratedFile(source, dir, ".dll.g.cs", content) |> ignore

if not compilation.EntryPoints.IsEmpty then
let callable = context.allCallables.[Seq.exactlyOne compilation.EntryPoints]
Expand Down
2 changes: 1 addition & 1 deletion .../QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\Simulators.Dev.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/QsharpCore/Microsoft.Quantum.QSharp.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\DebugSymbols.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/HoneywellExe/HoneywellExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<PropertyGroup>
<OutputType>Library</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/IntrinsicTests/IntrinsicTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/IonQExe/IonQExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<PropertyGroup>
<OutputType>Library</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/Library with Spaces/Library with Spaces.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<CsharpGeneration>false</CsharpGeneration>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/Library1/Library1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/Library2/Library2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/QCIExe/QCIExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<PropertyGroup>
<OutputType>Library</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/QsharpExe/QsharpExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/TargetedExe/TargetedExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/TestProjects/UnitTests/UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators.Tests/Tests.Microsoft.Quantum.Simulators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\DebugSymbols.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Simulation/Simulators/Microsoft.Quantum.Simulators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.13.2011.802-alpha">
<Project Sdk="Microsoft.Quantum.Sdk/0.14.201219763-alpha">

<Import Project="..\Common\AssemblyCommon.props" />
<Import Project="..\Common\DebugSymbols.props" />
Expand Down