diff --git a/.gitignore b/.gitignore index 7cffa506f2b..d23c8bcc645 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,9 @@ bld/ # Uncomment if you have tasks that create the project's static files in wwwroot #wwwroot/ +# Visual Studio Code Ionide-FSharp extension cache directory +.ionide/ + # Visual Studio 2017 auto generated files Generated\ Files/ diff --git a/src/Simulation/Core/EntryPointInfo.cs b/src/Simulation/Core/EntryPointInfo.cs index dd4373777f0..7061be98855 100644 --- a/src/Simulation/Core/EntryPointInfo.cs +++ b/src/Simulation/Core/EntryPointInfo.cs @@ -20,36 +20,36 @@ public EntryPointInfo(Type operation) => /// /// Base class containing information about an entry point - /// for a Q# executable targeted for a Alfred quantum processor. + /// for a Q# executable targeted for a Honeywell quantum processor. /// - public class AlfredEntryPointInfo + public class HoneywellEntryPointInfo : EntryPointInfo { - public AlfredEntryPointInfo(Type operation) + public HoneywellEntryPointInfo(Type operation) : base(operation) { } } /// /// Base class containing information about an entry point - /// for a Q# executable targeted for a Bruno quantum processor. + /// for a Q# executable targeted for a IonQ quantum processor. /// - public class BrunoEntryPointInfo + public class IonQEntryPointInfo : EntryPointInfo { - public BrunoEntryPointInfo(Type operation) + public IonQEntryPointInfo(Type operation) : base(operation) { } } /// /// Base class containing information about an entry point - /// for a Q# executable targeted for a Clementine quantum processor. + /// for a Q# executable targeted for a QCI quantum processor. /// - public class ClementineEntryPointInfo + public class QCIEntryPointInfo : EntryPointInfo { - public ClementineEntryPointInfo(Type operation) + public QCIEntryPointInfo(Type operation) : base(operation) { } } diff --git a/src/Simulation/CsharpGeneration.Tests/SimulationCodeTests.fs b/src/Simulation/CsharpGeneration.Tests/SimulationCodeTests.fs index 5762139101d..6605b571cd2 100644 --- a/src/Simulation/CsharpGeneration.Tests/SimulationCodeTests.fs +++ b/src/Simulation/CsharpGeneration.Tests/SimulationCodeTests.fs @@ -2328,7 +2328,7 @@ namespace N1 String ICallable.Name => "emptyOperation"; String ICallable.FullName => "Microsoft.Quantum.Testing.emptyOperation"; - public static AlfredEntryPointInfo Info => new AlfredEntryPointInfo(typeof(emptyOperation)); + public static HoneywellEntryPointInfo Info => new HoneywellEntryPointInfo(typeof(emptyOperation)); public override void Init() { } @@ -2340,7 +2340,7 @@ namespace N1 } } """ - |> testOneClass emptyOperation AssemblyConstants.AlfredProcessor + |> testOneClass emptyOperation AssemblyConstants.HoneywellProcessor """ public abstract partial class randomAbstractOperation : Unitary<(Qubit,Basis,(Pauli,IQArray>,Boolean),Int64)>, ICallable @@ -2367,7 +2367,7 @@ namespace N1 String ICallable.Name => "randomAbstractOperation"; String ICallable.FullName => "Microsoft.Quantum.Testing.randomAbstractOperation"; - public static BrunoEntryPointInfo<(Qubit, Basis, (Pauli, IQArray>, Boolean), Int64), QVoid> Info => new BrunoEntryPointInfo<(Qubit, Basis, (Pauli, IQArray>, Boolean), Int64), QVoid>(typeof(randomAbstractOperation)); + public static IonQEntryPointInfo<(Qubit, Basis, (Pauli, IQArray>, Boolean), Int64), QVoid> Info => new IonQEntryPointInfo<(Qubit, Basis, (Pauli, IQArray>, Boolean), Int64), QVoid>(typeof(randomAbstractOperation)); public override void Init() { } @@ -2379,7 +2379,7 @@ namespace N1 } } """ - |> testOneClass randomAbstractOperation AssemblyConstants.BrunoProcessor + |> testOneClass randomAbstractOperation AssemblyConstants.IonQProcessor """ [SourceLocation("%%%", OperationFunctor.Body, 108, 113)] @@ -2395,7 +2395,7 @@ namespace N1 String ICallable.Name => "oneQubitOperation"; String ICallable.FullName => "Microsoft.Quantum.Testing.oneQubitOperation"; - public static ClementineEntryPointInfo Info => new ClementineEntryPointInfo(typeof(oneQubitOperation)); + public static QCIEntryPointInfo Info => new QCIEntryPointInfo(typeof(oneQubitOperation)); protected IUnitary X { get; set; } @@ -2449,7 +2449,7 @@ namespace N1 } } """ - |> testOneClass oneQubitOperation AssemblyConstants.ClementineProcessor + |> testOneClass oneQubitOperation AssemblyConstants.QCIProcessor [] let ``buildOperationClass - generics`` () = @@ -2481,7 +2481,7 @@ namespace N1 String ICallable.Name => "genCtrl3"; String ICallable.FullName => "Microsoft.Quantum.Compiler.Generics.genCtrl3"; - public static AlfredEntryPointInfo<(__X__, (Int64, (__Y__, __Z__), Result)), QVoid> Info => new AlfredEntryPointInfo<(__X__, (Int64, (__Y__, __Z__), Result)), QVoid>(typeof(genCtrl3<__X__,__Y__,__Z__>)); + public static HoneywellEntryPointInfo<(__X__, (Int64, (__Y__, __Z__), Result)), QVoid> Info => new HoneywellEntryPointInfo<(__X__, (Int64, (__Y__, __Z__), Result)), QVoid>(typeof(genCtrl3<__X__,__Y__,__Z__>)); public override void Init() { } @@ -2493,7 +2493,7 @@ namespace N1 } } """ - |> testOneClass genCtrl3 AssemblyConstants.AlfredProcessor + |> testOneClass genCtrl3 AssemblyConstants.HoneywellProcessor """ [SourceLocation("%%%", OperationFunctor.Body, 1266, 1272)] @@ -2522,7 +2522,7 @@ namespace N1 String ICallable.Name => "composeImpl"; String ICallable.FullName => "Microsoft.Quantum.Compiler.Generics.composeImpl"; - public static BrunoEntryPointInfo<(ICallable, ICallable, __B__), QVoid> Info => new BrunoEntryPointInfo<(ICallable, ICallable, __B__), QVoid>(typeof(composeImpl<__A__,__B__>)); + public static IonQEntryPointInfo<(ICallable, ICallable, __B__), QVoid> Info => new IonQEntryPointInfo<(ICallable, ICallable, __B__), QVoid>(typeof(composeImpl<__A__,__B__>)); public override Func<(ICallable,ICallable,__B__), QVoid> Body => (__in__) => { @@ -2542,7 +2542,7 @@ namespace N1 } } """ - |> testOneClass composeImpl AssemblyConstants.BrunoProcessor + |> testOneClass composeImpl AssemblyConstants.IonQProcessor [] let ``buildOperationClass - abstract function`` () = @@ -2556,7 +2556,7 @@ namespace N1 String ICallable.Name => "genF1"; String ICallable.FullName => "Microsoft.Quantum.Compiler.Generics.genF1"; - public static ClementineEntryPointInfo<__A__, QVoid> Info => new ClementineEntryPointInfo<__A__, QVoid>(typeof(genF1<__A__>)); + public static QCIEntryPointInfo<__A__, QVoid> Info => new QCIEntryPointInfo<__A__, QVoid>(typeof(genF1<__A__>)); public override void Init() { } @@ -2568,7 +2568,7 @@ namespace N1 } } """ - |> testOneClass genF1 AssemblyConstants.ClementineProcessor + |> testOneClass genF1 AssemblyConstants.QCIProcessor [] let ``buildOperationClass - access modifiers`` () = diff --git a/src/Simulation/CsharpGeneration/Microsoft.Quantum.CsharpGeneration.fsproj b/src/Simulation/CsharpGeneration/Microsoft.Quantum.CsharpGeneration.fsproj index 0a279b90245..abd7790b284 100644 --- a/src/Simulation/CsharpGeneration/Microsoft.Quantum.CsharpGeneration.fsproj +++ b/src/Simulation/CsharpGeneration/Microsoft.Quantum.CsharpGeneration.fsproj @@ -24,7 +24,7 @@ - + diff --git a/src/Simulation/CsharpGeneration/RewriteStep.fs b/src/Simulation/CsharpGeneration/RewriteStep.fs index 8384bcbc107..ceb0afa650f 100644 --- a/src/Simulation/CsharpGeneration/RewriteStep.fs +++ b/src/Simulation/CsharpGeneration/RewriteStep.fs @@ -53,7 +53,7 @@ type Emitter() = let context = CodegenContext.Create (compilation, step.AssemblyConstants) let targetsQuantumProcessor = match step.AssemblyConstants.TryGetValue AssemblyConstants.ExecutionTarget with - | true, target -> target = AssemblyConstants.AlfredProcessor || target = AssemblyConstants.BrunoProcessor || target = AssemblyConstants.ClementineProcessor + | true, target -> target = AssemblyConstants.HoneywellProcessor || target = AssemblyConstants.IonQProcessor || target = AssemblyConstants.QCIProcessor | _ -> false let allSources = GetSourceFiles.Apply compilation.Namespaces diff --git a/src/Simulation/CsharpGeneration/SimulationCode.fs b/src/Simulation/CsharpGeneration/SimulationCode.fs index 8a16823ff7e..b41111e373a 100644 --- a/src/Simulation/CsharpGeneration/SimulationCode.fs +++ b/src/Simulation/CsharpGeneration/SimulationCode.fs @@ -932,9 +932,9 @@ module SimulationCode = let buildOperationInfoProperty (globalContext:CodegenContext) operationInput operationOutput operationName = let propertyType = match globalContext.ExecutionTarget with - | target when target = AssemblyConstants.AlfredProcessor -> sprintf "AlfredEntryPointInfo<%s, %s>" operationInput operationOutput - | target when target = AssemblyConstants.BrunoProcessor -> sprintf "BrunoEntryPointInfo<%s, %s>" operationInput operationOutput - | target when target = AssemblyConstants.ClementineProcessor -> sprintf "ClementineEntryPointInfo<%s, %s>" operationInput operationOutput + | target when target = AssemblyConstants.HoneywellProcessor -> sprintf "HoneywellEntryPointInfo<%s, %s>" operationInput operationOutput + | target when target = AssemblyConstants.IonQProcessor -> sprintf "IonQEntryPointInfo<%s, %s>" operationInput operationOutput + | target when target = AssemblyConstants.QCIProcessor -> sprintf "QCIEntryPointInfo<%s, %s>" operationInput operationOutput | _ -> sprintf "EntryPointInfo<%s, %s>" operationInput operationOutput let operationType = simpleBase operationName let newInstanceArgs = [``invoke`` (``ident`` "typeof") ``(`` [operationType.Type] ``)``] diff --git a/src/Simulation/QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj b/src/Simulation/QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj index 017930d97f3..11158d03e1c 100644 --- a/src/Simulation/QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj +++ b/src/Simulation/QCTraceSimulator.Tests/Tests.Microsoft.Quantum.Simulation.QCTraceSimulatorRuntime.csproj @@ -1,4 +1,4 @@ - + diff --git a/src/Simulation/QsharpCore/Microsoft.Quantum.QSharp.Core.csproj b/src/Simulation/QsharpCore/Microsoft.Quantum.QSharp.Core.csproj index 6fa9abf9f3b..9b7f42e1d98 100644 --- a/src/Simulation/QsharpCore/Microsoft.Quantum.QSharp.Core.csproj +++ b/src/Simulation/QsharpCore/Microsoft.Quantum.QSharp.Core.csproj @@ -1,4 +1,4 @@ - + diff --git a/src/Simulation/Simulators.Tests/TestProjects/QsharpExe/QsharpExe.csproj b/src/Simulation/Simulators.Tests/TestProjects/QsharpExe/QsharpExe.csproj index 25e28abe68d..f322981598f 100644 --- a/src/Simulation/Simulators.Tests/TestProjects/QsharpExe/QsharpExe.csproj +++ b/src/Simulation/Simulators.Tests/TestProjects/QsharpExe/QsharpExe.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/src/Simulation/Simulators.Tests/Tests.Microsoft.Quantum.Simulation.Simulators.csproj b/src/Simulation/Simulators.Tests/Tests.Microsoft.Quantum.Simulation.Simulators.csproj index 6e8583c9975..a491104600f 100644 --- a/src/Simulation/Simulators.Tests/Tests.Microsoft.Quantum.Simulation.Simulators.csproj +++ b/src/Simulation/Simulators.Tests/Tests.Microsoft.Quantum.Simulation.Simulators.csproj @@ -1,4 +1,4 @@ - + diff --git a/src/Simulation/Simulators/Microsoft.Quantum.Simulation.Simulators.csproj b/src/Simulation/Simulators/Microsoft.Quantum.Simulation.Simulators.csproj index 650f7494f49..2b39d659044 100644 --- a/src/Simulation/Simulators/Microsoft.Quantum.Simulation.Simulators.csproj +++ b/src/Simulation/Simulators/Microsoft.Quantum.Simulation.Simulators.csproj @@ -1,4 +1,4 @@ - +