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

Adapting to API update in qsharp-runtime/#370 #363

Merged
bettinaheim merged 4 commits into from
Nov 5, 2020
Merged

Adapting to API update in qsharp-runtime/#370 #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28ae562
Adapting to API update
Nov 3, 2020
b4e77b5
that should hopefully update what needs updating
Nov 3, 2020
c7e520a
correct package number
Nov 5, 2020
ca2df46
Merge branch 'main' into beheim/qubitManager
Nov 5, 2020
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 Build/props/tests.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.13.20102604" />
<PackageReference Include="Microsoft.Quantum.Xunit" Version="0.13.201118141-beta" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
Expand Down
4 changes: 2 additions & 2 deletions Chemistry/src/Runtime/Runtime.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.20102604">
<Project Sdk="Microsoft.Quantum.Sdk/0.13.201118141-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down Expand Up @@ -40,7 +40,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.13.20102604" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.13.201118141-beta" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/tests/ChemistryTests/QSharpTests.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.20102604">
<Project Sdk="Microsoft.Quantum.Sdk/0.13.201118141-beta">

<Import Project="..\..\..\Build\props\tests.props" />

Expand Down
2 changes: 1 addition & 1 deletion Chemistry/tests/SystemTests/SystemTests.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.20102604">
<Project Sdk="Microsoft.Quantum.Sdk/0.13.201118141-beta">

<Import Project="..\..\..\Build\props\tests.props" />

Expand Down
31 changes: 24 additions & 7 deletions MachineLearning.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.30413.136
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MachineLearning", "MachineLearning", "{D067C787-94C3-4DB8-9012-1F22AE784BEF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineLearningTests", "MachineLearning\tests\MachineLearningTests.csproj", "{94EBDF5F-0A9D-4CE5-9D16-3FF323B8792C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MachineLearningTests", "MachineLearning\tests\MachineLearningTests.csproj", "{94EBDF5F-0A9D-4CE5-9D16-3FF323B8792C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MachineLearning", "MachineLearning\src\MachineLearning.csproj", "{B045BF35-6BE6-4982-9618-8725C70D3F91}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MachineLearning", "MachineLearning\src\MachineLearning.csproj", "{B045BF35-6BE6-4982-9618-8725C70D3F91}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Standard", "Standard\src\Standard.csproj", "{9907AAA7-10DA-470B-A154-5A19D1A831E6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -18,9 +20,6 @@ Global
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{94EBDF5F-0A9D-4CE5-9D16-3FF323B8792C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{94EBDF5F-0A9D-4CE5-9D16-3FF323B8792C}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand All @@ -46,9 +45,27 @@ Global
{B045BF35-6BE6-4982-9618-8725C70D3F91}.Release|x64.Build.0 = Release|Any CPU
{B045BF35-6BE6-4982-9618-8725C70D3F91}.Release|x86.ActiveCfg = Release|Any CPU
{B045BF35-6BE6-4982-9618-8725C70D3F91}.Release|x86.Build.0 = Release|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Debug|x64.ActiveCfg = Debug|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Debug|x64.Build.0 = Debug|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Debug|x86.ActiveCfg = Debug|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Debug|x86.Build.0 = Debug|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Release|Any CPU.Build.0 = Release|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Release|x64.ActiveCfg = Release|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Release|x64.Build.0 = Release|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Release|x86.ActiveCfg = Release|Any CPU
{9907AAA7-10DA-470B-A154-5A19D1A831E6}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{94EBDF5F-0A9D-4CE5-9D16-3FF323B8792C} = {D067C787-94C3-4DB8-9012-1F22AE784BEF}
{B045BF35-6BE6-4982-9618-8725C70D3F91} = {D067C787-94C3-4DB8-9012-1F22AE784BEF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {08B056E4-F7DA-4802-B23C-BB11D6616F5E}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion MachineLearning/src/MachineLearning.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.20102604">
<Project Sdk="Microsoft.Quantum.Sdk/0.13.201118141-beta">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Microsoft.Quantum.MachineLearning</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion MachineLearning/tests/MachineLearningTests.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.20102604">
<Project Sdk="Microsoft.Quantum.Sdk/0.13.201118141-beta">

<Import Project="..\..\Build\props\tests.props" />

Expand Down
4 changes: 2 additions & 2 deletions Numerics/src/Numerics.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.20102604">
<Project Sdk="Microsoft.Quantum.Sdk/0.13.201118141-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down Expand Up @@ -41,7 +41,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.13.20102604" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.13.201118141-beta" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Numerics/tests/NumericsTests.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.20102604">
<Project Sdk="Microsoft.Quantum.Sdk/0.13.201118141-beta">

<Import Project="..\..\Build\props\tests.props" />

Expand Down
14 changes: 7 additions & 7 deletions Standard/src/Diagnostics/Emulation/AllowQubitAllocations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ public Native(IOperationFactory m) : base(m)
);
}
},
setup: handler => Simulator.OnAllocateQubits += handler,
cleanup: handler => Simulator.OnAllocateQubits -= handler
setup: handler => Simulator.BeforeAllocateQubits += handler,
cleanup: handler => Simulator.BeforeAllocateQubits -= handler
),

new ActionDisposer<Action<IQArray<Qubit>>>(
register =>
new ActionDisposer<Action<long>>(
nQubits =>
{
nQubitsAllocated -= register.Length;
nQubitsAllocated -= nQubits;
},
setup: handler => Simulator.OnReleaseQubits += handler,
cleanup: handler => Simulator.OnReleaseQubits -= handler
setup: handler => Simulator.AfterReleaseQubits += handler,
cleanup: handler => Simulator.AfterReleaseQubits -= handler
)
));

Expand Down
2 changes: 1 addition & 1 deletion Standard/src/Diagnostics/Emulation/Internal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public override bool Callback(uint idx, double real, double img)

public override bool Dump(IQArray<Qubit>? qubits = null)
{
var count = qubits?.Length ?? Simulator.QubitManager!.GetAllocatedQubitsCount();
var count = qubits?.Length ?? Simulator.QubitManager!.AllocatedQubitsCount;
var nQubitsPerRegister = ((int)count / 2);
Data = np.empty(new Shape(1 << ((int)count), 2));
var result = base.Dump(qubits);
Expand Down
4 changes: 2 additions & 2 deletions Standard/src/Standard.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.20102604">
<Project Sdk="Microsoft.Quantum.Sdk/0.13.201118141-beta">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down Expand Up @@ -37,7 +37,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.13.20102604" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.13.201118141-beta" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="NumSharp" Version="0.20.5" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Standard/tests/Standard.Tests.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.20102604">
<Project Sdk="Microsoft.Quantum.Sdk/0.13.201118141-beta">

<Import Project="..\..\Build\props\tests.props" />

Expand Down
4 changes: 2 additions & 2 deletions Visualization/src/Visualization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.13.20102604" />
<PackageReference Include="Microsoft.Quantum.Simulators" Version="0.13.201118141-beta" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Quantum.IQSharp.Jupyter" Version="0.13.20102604" PrivateAssets="All" />
<PackageReference Include="Microsoft.Quantum.IQSharp.Jupyter" Version="0.13.201118141-beta" PrivateAssets="All" />
<PackageReference Include="NumSharp" Version="0.20.5" />
</ItemGroup>

Expand Down