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

Refactor controller into library #642

Merged
achocron merged 11 commits into from
Apr 23, 2021
Merged

Refactor controller into library #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
54ee700
WIP
achocron Apr 20, 2021
6b1642e
Remove controller unit tests
achocron Apr 20, 2021
29c6020
WIP
achocron Apr 21, 2021
9255b98
Update test file
achocron Apr 21, 2021
11570e4
Fix compile issue
achocron Apr 21, 2021
db7fcfc
Fix unit test
achocron Apr 21, 2021
bf5c894
Clean up
achocron Apr 21, 2021
9789e55
Fix visibility of classes
achocron Apr 22, 2021
c99315c
Fix controller and rename test namespace
achocron Apr 22, 2021
1a8baba
Clean up and change constructors
achocron Apr 22, 2021
ed31121
Fix constructors
achocron Apr 23, 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
38 changes: 19 additions & 19 deletions Simulation.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controller", "Controller",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QirController", "src\Qir\Controller\QirController.csproj", "{A77E6661-D143-4E3E-BCD1-8E321A966829}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.QirController", "src\Qir\Controller\Tests.QirController\Tests.QirController.csproj", "{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Execution", "Execution", "{442E66C8-F69F-44E9-9CD9-1F52C37EA41B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Quantum.Qir.Tools", "src\Qir\Execution\Tools\Microsoft.Quantum.Qir.Tools.csproj", "{C60226E3-98DE-4E92-AED4-B4A93D4CA063}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Microsoft.Quantum.Qir.Tools", "src\Qir\Execution\Tests.Microsoft.Quantum.Qir.Tools\Tests.Microsoft.Quantum.Qir.Tools.csproj", "{4794FC80-4594-403F-AFEC-4889EFE87EA0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -775,22 +775,6 @@ Global
{A77E6661-D143-4E3E-BCD1-8E321A966829}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{A77E6661-D143-4E3E-BCD1-8E321A966829}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{A77E6661-D143-4E3E-BCD1-8E321A966829}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.Debug|x64.ActiveCfg = Debug|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.Debug|x64.Build.0 = Debug|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.MinSizeRel|x64.Build.0 = Debug|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.Release|Any CPU.Build.0 = Release|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.Release|x64.ActiveCfg = Release|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.Release|x64.Build.0 = Release|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{C60226E3-98DE-4E92-AED4-B4A93D4CA063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C60226E3-98DE-4E92-AED4-B4A93D4CA063}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C60226E3-98DE-4E92-AED4-B4A93D4CA063}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -807,6 +791,22 @@ Global
{C60226E3-98DE-4E92-AED4-B4A93D4CA063}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{C60226E3-98DE-4E92-AED4-B4A93D4CA063}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{C60226E3-98DE-4E92-AED4-B4A93D4CA063}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.Debug|x64.ActiveCfg = Debug|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.Debug|x64.Build.0 = Debug|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.MinSizeRel|x64.Build.0 = Debug|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.Release|Any CPU.Build.0 = Release|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.Release|x64.ActiveCfg = Release|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.Release|x64.Build.0 = Release|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{4794FC80-4594-403F-AFEC-4889EFE87EA0}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -862,9 +862,9 @@ Global
{D7D34736-A719-4B45-A33F-2723F59EC29D} = {A7DB7367-9FD6-4164-8263-A05077BE54AB}
{4E07F247-ED93-4497-8B58-022314308E67} = {F6C2D4C0-12DC-40E3-9C86-FA5308D9B567}
{A77E6661-D143-4E3E-BCD1-8E321A966829} = {4E07F247-ED93-4497-8B58-022314308E67}
{2E4B9604-A5CD-4B49-B1D4-A7AC8ABAEF68} = {4E07F247-ED93-4497-8B58-022314308E67}
{442E66C8-F69F-44E9-9CD9-1F52C37EA41B} = {F6C2D4C0-12DC-40E3-9C86-FA5308D9B567}
{C60226E3-98DE-4E92-AED4-B4A93D4CA063} = {442E66C8-F69F-44E9-9CD9-1F52C37EA41B}
{4794FC80-4594-403F-AFEC-4889EFE87EA0} = {442E66C8-F69F-44E9-9CD9-1F52C37EA41B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {929C0464-86D8-4F70-8835-0A5EAF930821}
Expand Down
32 changes: 14 additions & 18 deletions src/Qir/Controller/Controller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@

using System;
using System.IO;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using Microsoft.Quantum.Qir.Driver;
using Microsoft.Quantum.Qir.Executable;
using Microsoft.Quantum.Qir.Model;
using Microsoft.Quantum.Qir.Tools.Executable;
using Microsoft.Quantum.Qir.Utility;
using QirExecutionWrapperSerialization = Microsoft.Quantum.QsCompiler.BondSchemas.QirExecutionWrapper.Protocols;

namespace Microsoft.Quantum.Qir
{
public static class Controller
{
private const string SourceDirectoryPath = "src";
private const string BinaryDirectoryPath = "bin";
private const string ExecutableName = "simulation.exe";

Expand All @@ -25,9 +24,6 @@ public static async Task ExecuteAsync(
DirectoryInfo libraryDirectory,
DirectoryInfo includeDirectory,
FileInfo errorFile,
IQirSourceFileGenerator driverGenerator,
IQirExecutableGenerator executableGenerator,
IQuantumExecutableRunner executableRunner,
ILogger logger)
{
try
Expand All @@ -37,20 +33,20 @@ public static async Task ExecuteAsync(
using var inputFileStream = inputFile.OpenRead();
var input = QirExecutionWrapperSerialization.DeserializeFromFastBinary(inputFileStream);

// Step 2: Create driver.
logger.LogInfo("Creating driver file.");
var sourceDirectory = new DirectoryInfo(SourceDirectoryPath);
await driverGenerator.GenerateQirSourceFilesAsync(sourceDirectory, input.EntryPoint, input.QirBytecode);

// Step 3: Create executable.
logger.LogInfo("Compiling and linking executable.");
var binaryDirectory = new DirectoryInfo(BinaryDirectoryPath);
// Step 2: Create executable.
logger.LogInfo("Creating executable.");
var bytecodeArray = input.QirBytecode.Array.Skip(input.QirBytecode.Offset).Take(input.QirBytecode.Count).ToList().ToArray();
var executableFile = new FileInfo(Path.Combine(BinaryDirectoryPath, ExecutableName));
await executableGenerator.GenerateExecutableAsync(executableFile, sourceDirectory, libraryDirectory, includeDirectory);
var executable = new QirFullStateExecutable(executableFile, bytecodeArray, logger);
await executable.BuildAsync(input.EntryPoint, libraryDirectory, includeDirectory);

// Step 4: Run executable.
logger.LogInfo("Running executable.");
await executableRunner.RunExecutableAsync(executableFile, input.EntryPoint, outputFile);
// Step 3: Run executable.
if (outputFile.Exists)
{
outputFile.Delete();
}
using var outputStream = outputFile.OpenWrite();
await executable.RunAsync(input.EntryPoint, outputStream);
}
catch (Exception e)
{
Expand Down
22 changes: 0 additions & 22 deletions src/Qir/Controller/Driver/IQirSourceFileGenerator.cs
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions src/Qir/Controller/Driver/QirSourceFileGenerator.cs
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions src/Qir/Controller/Executable/IQuantumExecutableRunner.cs
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions src/Qir/Controller/Executable/QuantumExecutableRunner.cs
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions src/Qir/Controller/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
using System.CommandLine;
using System.CommandLine.Invocation;
using System.IO;
using Microsoft.Quantum.Qir.Driver;
using Microsoft.Quantum.Qir.Executable;
using Microsoft.Quantum.Qir.Utility;

namespace Microsoft.Quantum.Qir
Expand All @@ -15,9 +13,6 @@ class Program
static void Main(string[] args)
{
var logger = new Logger(new Clock());
var execGenerator = new QirExecutableGenerator(new ClangClient(logger), logger);
var driverGenerator = new QirSourceFileGenerator(logger);
var execRunner = new QuantumExecutableRunner(logger);
logger.LogInfo("QIR controller beginning.");

var rootCommand = new RootCommand(
Expand Down Expand Up @@ -69,7 +64,7 @@ static void Main(string[] args)
// Bind to a handler and invoke.
rootCommand.Handler = CommandHandler.Create<FileInfo, FileInfo, DirectoryInfo, DirectoryInfo, FileInfo>(
async (input, output, libraryDirectory, includeDirectory, error) =>
await Controller.ExecuteAsync(input, output, libraryDirectory, includeDirectory, error, driverGenerator, execGenerator, execRunner, logger));
await Controller.ExecuteAsync(input, output, libraryDirectory, includeDirectory, error, logger));
rootCommand.Invoke(args);
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/Qir/Controller/QirController.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Execution\Tools\Microsoft.Quantum.Qir.Tools.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="ErrorMessages.Designer.cs">
<DesignTime>True</DesignTime>
Expand Down
Loading