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

IQ# - Fullstate Simulator V1 Output Format #713

Closed
wants to merge 21 commits into from
Closed

IQ# - Fullstate Simulator V1 Output Format #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3bf085b
Pass Assembly Constants in to GenerateBitcode
ScottCarda-MS Jul 12, 2022
1225d74
Get the processor architecture from the execution target.
ScottCarda-MS Jul 12, 2022
0fab004
versions
ScottCarda-MS Aug 25, 2022
d5649c6
merge in from main
ScottCarda-MS Aug 25, 2022
2b82bdc
Removed special handling for Microsoft simulator for cloud jobs.
ScottCarda-MS Aug 26, 2022
bfb6bbf
Added test for IQ# change
ScottCarda-MS Aug 29, 2022
a26e9bd
Differentiate logic based on job.OutputDataFormat
ScottCarda-MS Aug 30, 2022
df9cca3
Add output format to cloud job mocks.
ScottCarda-MS Aug 31, 2022
394091c
Got a test working
ScottCarda-MS Aug 31, 2022
0e03b64
Merge branch 'main' into sccarda/V1OutputRecording
ricardo-espinoza Sep 6, 2022
20ca1ef
small changes
ScottCarda-MS Sep 10, 2022
e71c622
Merge branch 'sccarda/V1OutputRecording' of https://github.com/micros…
ScottCarda-MS Sep 10, 2022
0e4218f
combine uses of assemblyConstants
ScottCarda-MS Sep 10, 2022
084941e
merge in from main
ScottCarda-MS Sep 12, 2022
0b3d489
use beta packages
ScottCarda-MS Sep 13, 2022
06997d5
removed unused using
ScottCarda-MS Sep 16, 2022
d7f405b
Merge branch 'main' into sccarda/V1OutputRecording
ScottCarda-MS Sep 16, 2022
cb8cc16
Merge branch 'main' into sccarda/V1OutputRecording
ScottCarda-MS Sep 16, 2022
95ddbb6
Merge branch 'main' into sccarda/V1OutputRecording
ScottCarda-MS Sep 19, 2022
67bdc28
Merge branch 'sccarda/V1OutputRecording' of https://github.com/micros…
ScottCarda-MS Sep 19, 2022
6cfaf7f
Merge branch 'main' into sccarda/V1OutputRecording
ScottCarda-MS Sep 19, 2022
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/AzureClient/AzureClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="Azure.Quantum.Jobs" Version="1.0.0-beta.3" />
<PackageReference Include="Microsoft.Azure.Quantum.Client" Version="0.25.228311" />
<PackageReference Include="Microsoft.Azure.Quantum.Client" Version="0.26.230521-beta" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23" />
<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.19" />
<PackageReference Include="System.Reactive" Version="4.3.2" />
Expand Down
12 changes: 10 additions & 2 deletions src/Core/Compiler/CompilerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,17 @@ public IEnumerable<QsNamespaceElement> IdentifyElements(string source, ITaskRepo
? TargetPackageAssemblyPaths(executionTarget, capability?.Name)
: Enumerable.Empty<string>();
Logger.LogDebug("Using target package assemblies:\n{TargetAssemblies}", string.Join("\n", targetPackages));

var processorArchitecture = executionTarget ?? string.Empty;
if (string.Compare(executionTarget, "microsoft.simulator.fullstate", StringComparison.InvariantCultureIgnoreCase) == 0)
{
processorArchitecture = AssemblyConstants.MicrosoftSimulator;
}

var assemblyConstants = new Dictionary<string, string>
{
[AssemblyConstants.ProcessorArchitecture] = executionTarget ?? string.Empty,
[AssemblyConstants.ProcessorArchitecture] = processorArchitecture,
[AssemblyConstants.TargetCapability] = capability?.Name ?? string.Empty,
[AssemblyConstants.TargetPackageAssemblies] =
string.Join(";", targetPackages.Where(s => !string.IsNullOrWhiteSpace(s)))
};
Expand Down Expand Up @@ -454,7 +462,7 @@ public IEnumerable<QsNamespaceElement> IdentifyElements(string source, ITaskRepo
var tempPath = Path.GetTempFileName();
var bcFile = CompilationLoader.GeneratedFile(tempPath, Path.GetDirectoryName(tempPath), ".bc", "");
var diagnostics = new List<IRewriteStep.Diagnostic>();
CompilationSteps.GenerateBitcode(qsCompilation, capability, bcFile, diagnostics: diagnostics);
CompilationSteps.GenerateBitcode(qsCompilation, (IDictionary<string, string?>)assemblyConstants, bcFile, diagnostics: diagnostics);
foreach (var diagnostic in diagnostics)
{
Logger?.Log(
Expand Down
10 changes: 5 additions & 5 deletions src/Core/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.QirGeneration" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.CSharpGeneration" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.QSharp.Core" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.26.230521-beta" />
<PackageReference Include="Microsoft.Quantum.QirGeneration" Version="0.26.230521-beta" />
<PackageReference Include="Microsoft.Quantum.CSharpGeneration" Version="0.26.230521-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.26.230521-beta" />
<PackageReference Include="Microsoft.Quantum.QSharp.Core" Version="0.26.230521-beta" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.2" />
<PackageReference Include="NuGet.Resolver" Version="5.1.0" />
<PackageReference Include="System.DirectoryServices.Protocols" Version="5.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/ExecutionPathTracer/ExecutionPathTracer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.26.230521-beta" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Kernel/Kernel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.3.2" />
<PackageReference Include="Microsoft.Quantum.QirGeneration" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.QirGeneration" Version="0.26.230521-beta" />
</ItemGroup>

<!-- TypeScript compilation -->
Expand Down
4 changes: 2 additions & 2 deletions src/MockLibraries/Mock.Chemistry/Mock.Chemistry.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.25.228311">
<Project Sdk="Microsoft.Quantum.Sdk/0.26.230521-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages> <!-- otherwise the standard library is included by the Sdk -->
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.26.230521-beta" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/MockLibraries/Mock.Standard/Mock.Standard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.25.228311">
<Project Sdk="Microsoft.Quantum.Sdk/0.26.230521-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<IncludeQsharpCorePackages>false</IncludeQsharpCorePackages> <!-- otherwise the standard library is included by the Sdk -->
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.26.230521-beta" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Tests/NugetPackagesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class NugetPackagesTests
/// We use a known-good version to avoid breaking IQ# tests due to changes in Libraries
/// also, to make sure an end-to-end QDK build does not have circular build dependencies
/// between Libraries and IQ#.
public static readonly NuGetVersion QDK_LIBRARIES_VERSION = NuGetVersion.Parse("0.25.228311");
public static readonly NuGetVersion QDK_LIBRARIES_VERSION = NuGetVersion.Parse("0.26.230521-beta");

public NugetPackages Init()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Workspace.ProjectReferences.ProjectA/ProjectA.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.25.228311">
<Project Sdk="Microsoft.Quantum.Sdk/0.26.230521-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Workspace.ProjectReferences.ProjectB/ProjectB.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.25.228311">
<Project Sdk="Microsoft.Quantum.Sdk/0.26.230521-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions src/Tests/Workspace.ProjectReferences/Workspace.ProjectReferences.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.25.228311">
<Project Sdk="Microsoft.Quantum.Sdk/0.26.230521-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand All @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.25.228311" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.26.230521-beta" />
</ItemGroup>

<ItemGroup>
Expand Down
34 changes: 17 additions & 17 deletions src/Tool/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
},
"AllowedHosts": "*",
"DefaultPackageVersions": [
"Microsoft.Quantum.Compiler::0.25.228311",
"Microsoft.Quantum.CSharpGeneration::0.25.228311",
"Microsoft.Quantum.QirGeneration::0.25.228311",
"Microsoft.Quantum.Compiler::0.26.230521-beta",
"Microsoft.Quantum.CSharpGeneration::0.26.230521-beta",
"Microsoft.Quantum.QirGeneration::0.26.230521-beta",
"Microsoft.Quantum.Development.Kit::0.25.228311",
"Microsoft.Quantum.Simulators::0.25.228311",
"Microsoft.Quantum.Xunit::0.25.228311",
"Microsoft.Quantum.Standard::0.25.228311",
"Microsoft.Quantum.Standard.Visualization::0.25.228311",
"Microsoft.Quantum.Chemistry::0.25.228311",
"Microsoft.Quantum.Chemistry.Jupyter::0.25.228311",
"Microsoft.Quantum.MachineLearning::0.25.228311",
"Microsoft.Quantum.Numerics::0.25.228311",
"Microsoft.Quantum.Katas::0.25.228311",
"Microsoft.Quantum.Research::0.25.228311",
"Microsoft.Quantum.Providers.IonQ::0.25.228311",
"Microsoft.Quantum.Providers.Honeywell::0.25.228311",
"Microsoft.Quantum.Providers.QCI::0.25.228311",
"Microsoft.Quantum.Providers.Rigetti::0.25.228311"
"Microsoft.Quantum.Simulators::0.26.230521-beta",
"Microsoft.Quantum.Xunit::0.26.230521-beta",
"Microsoft.Quantum.Standard::0.26.230521-beta",
"Microsoft.Quantum.Standard.Visualization::0.26.230521-beta",
"Microsoft.Quantum.Chemistry::0.26.230521-beta",
"Microsoft.Quantum.Chemistry.Jupyter::0.26.230521-beta",
"Microsoft.Quantum.MachineLearning::0.26.230521-beta",
"Microsoft.Quantum.Numerics::0.26.230521-beta",
"Microsoft.Quantum.Katas::0.26.230521-beta",
"Microsoft.Quantum.Research::0.26.230521-beta",
"Microsoft.Quantum.Providers.IonQ::0.26.230521-beta",
"Microsoft.Quantum.Providers.Honeywell::0.26.230521-beta",
"Microsoft.Quantum.Providers.QCI::0.26.230521-beta",
"Microsoft.Quantum.Providers.Rigetti::0.26.230521-beta"
]
}