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

Adapting for the QuantumSimulator change. (#586) #590

Merged
kuzminrobin merged 2 commits into from
Feb 17, 2022
Merged

Adapting for the QuantumSimulator change. (#586) #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3644c6d
Adapting for the QuantumSimulator change. (#586)
kuzminrobin Feb 11, 2022
a17e730
Fake commit to kick off the CI build.
kuzminrobin Feb 17, 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 images/iqsharp-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ ENV PATH=$PATH:${HOME}/dotnet:${HOME}/.dotnet/tools \
# Install IQ# and the project templates, using the NuGet packages from the
# build context.
ARG IQSHARP_VERSION
RUN dotnet new -i "Microsoft.Quantum.ProjectTemplates::0.22.192090-beta" && \
RUN dotnet new -i "Microsoft.Quantum.ProjectTemplates::0.22.191200-beta" && \
dotnet tool install \
--global \
Microsoft.Quantum.IQSharp \
Expand Down
8 changes: 4 additions & 4 deletions src/Core/Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
<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.22.192090-beta" />
<PackageReference Include="Microsoft.Quantum.CSharpGeneration" Version="0.22.192090-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.22.192090-beta" />
<PackageReference Include="Microsoft.Quantum.QSharp.Core" Version="0.22.192090-beta" />
<PackageReference Include="Microsoft.Quantum.Compiler" Version="0.22.191200-beta" />
<PackageReference Include="Microsoft.Quantum.CSharpGeneration" Version="0.22.191200-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.22.191200-beta" />
<PackageReference Include="Microsoft.Quantum.QSharp.Core" Version="0.22.191200-beta" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.2" />
<PackageReference Include="NuGet.Resolver" Version="5.1.0" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
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.22.192090-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.22.191200-beta" />
</ItemGroup>

</Project>
11 changes: 6 additions & 5 deletions src/Kernel/Magic/DebugMagic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using System.Runtime.InteropServices;
using Microsoft.Extensions.Logging;
using Microsoft.Jupyter.Core;
using Microsoft.Jupyter.Core.Protocol;
Expand All @@ -21,23 +22,23 @@ namespace Microsoft.Quantum.IQSharp.Kernel
{
internal class DebugStateDumper : QuantumSimulator.StateDumper
{
private IDictionary<int, Complex>? _data = null;
private IDictionary<BigInteger, Complex>? _data = null;

public DebugStateDumper(QuantumSimulator qsim) : base(qsim)
{
}

public override bool Callback(uint idx, double real, double img)
public override bool Callback([MarshalAs(UnmanagedType.LPStr)] string idx, double real, double img)
{
if (_data == null) throw new Exception("Expected data buffer to be initialized before callback, but it was null.");
_data[(int)idx] = new Complex(real, img);
_data[CommonNativeSimulator.DisplayableState.BasisStateLabelToBigInt(idx)] = new Complex(real, img);
return true;
}

public IDictionary<int, Complex> GetAmplitudes()
public IDictionary<BigInteger, Complex> GetAmplitudes()
{
var count = this.Simulator.QubitManager?.AllocatedQubitsCount ?? 0;
_data = new Dictionary<int, Complex>();
_data = new Dictionary<BigInteger, Complex>();
_ = base.Dump();
return _data;
}
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.22.192090-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.22.191200-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.22.192090-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.22.191200-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.22.192090-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.22.191200-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.22.192090-beta" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.22.191200-beta" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions src/Tests/DisplayConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.Quantum.IQSharp.Jupyter;
using Microsoft.Quantum.Simulation.Simulators;
using System.Numerics;
using System.Linq;
using System.Collections.Generic;

Expand Down Expand Up @@ -32,9 +33,10 @@ public class DisplayConverterTests
{
QubitIds = new[] {0, 1, 2},
NQubits = 3,
Amplitudes = new Dictionary<int, System.Numerics.Complex>(Enumerable
Amplitudes = new Dictionary<BigInteger, System.Numerics.Complex>(Enumerable
.Range(0, 8)
.Select(idx => new KeyValuePair<int, System.Numerics.Complex>(idx, new System.Numerics.Complex(0, idx)))
.Select(idx => new KeyValuePair<BigInteger, System.Numerics.Complex>(
new BigInteger(idx), new System.Numerics.Complex(0, idx)))
)
};

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.22.192090-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.22.191200-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.22.192090-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.22.191200-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.22.192090-beta">
<Project Sdk="Microsoft.Quantum.Sdk/0.22.191200-beta">

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

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.22.192090-beta" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.22.191200-beta" />
</ItemGroup>

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