From f8e223552c6873710448f44bd691e94bbccef69c Mon Sep 17 00:00:00 2001 From: "REDMOND\\anburton" Date: Wed, 24 Mar 2021 14:07:46 -0700 Subject: [PATCH 1/2] fix links --- CONTRIBUTING.md | 10 +++++----- README.md | 12 ++++++------ .../Microsoft.Azure.Quantum.Client.csproj | 4 ++-- .../Microsoft.Quantum.Development.Kit.nuspec | 4 ++-- ...icrosoft.Quantum.CSharpGeneration.nuspec.template | 4 ++-- src/Simulation/Common/AssemblyCommon.props | 4 ++-- src/Simulation/Common/IQuantumProcessor.cs | 8 ++++---- src/Simulation/Native/CMakeLists.txt | 3 +++ .../Microsoft.Quantum.Simulators.nuspec.template | 4 ++-- src/Simulation/Simulators/QuantumSimulator/Qubit.cs | 6 ++++++ src/Xunit/Microsoft.Quantum.Xunit.nuspec | 4 ++-- 11 files changed, 36 insertions(+), 27 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f0dc1941d60..16cecebf8a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ Welcome, and thank you for your interest in contributing to Q#! There are many ways in which you can contribute, beyond writing code. The goal of this document is to provide a high-level overview of how you can get involved. -For more details on how to contribute to Q# or the rest of the Quantum Development Kit, please see the [contribution guide](https://docs.microsoft.com/quantum/contributing/). +For more details on how to contribute to Q# or the rest of the Quantum Development Kit, please see the [contribution guide](https://docs.microsoft.com/azure/quantum/contributing-overview). ## Asking Questions @@ -18,7 +18,7 @@ Have a feature request? We want to hear about it! Here's how you can make reporting your issue as effective as possible. -The Quantum Development Kit is distributed across multiple repositories. Filing an issue against the correct repository will help address it swiftly. Check the list [in the contribution guide](https://docs.microsoft.com/quantum/contributing/#where-do-contributions-go) to figure out which repo is a good place to file it. +The Quantum Development Kit is distributed across multiple repositories. Filing an issue against the correct repository will help address it swiftly. Check the list [in the contribution guide](https://docs.microsoft.com/azure/quantum/contributing-overview#where-do-contributions-go) to figure out which repo is a good place to file it. You can follow the [template](https://github.com/microsoft/qsharp-runtime/issues/new?assignees=&labels=bug&template=bug_report.md&title=) for reporting issues on this repository. @@ -43,7 +43,7 @@ please file one following the [feature request template](https://github.com/micr We will respond to feature requests and follow up with a discussion around its feasibility, how one might go about implementing it, and whether that is something we would consider adding to our repo. There are several reasons why we might not be able to eventually merge even a great feature for one reason or another. -Take a look at our general contribution guide for [reasons why this might be the case](https://docs.microsoft.com/quantum/contributing/code#when-well-reject-a-pull-request). +Take a look at our general contribution guide for [reasons why this might be the case](https://docs.microsoft.com/azure/quantum/contributing-code#when-well-reject-a-pull-request). Even if we are not able to incorporate something into the packages and extensions we distribute, we encourage you to pursue your passion project in your own fork, and share and discuss your thoughts and progress on the corresponding issue. @@ -53,12 +53,12 @@ search for example for the [good-first-issue](https://github.com/microsoft/qshar Also, look for issues that have already been discussed in more detail, and check if you can help someone who has already started working on it. -Whether you want to help fixing bugs or add new features, please take a look at our general guide for [Contributing Code](https://docs.microsoft.com/quantum/contributing/code). +Whether you want to help fixing bugs or add new features, please take a look at our general guide for [Contributing Code](https://docs.microsoft.com/azure/quantum/contributing-code). ## Contributing Documentation If you are interested in contributing to conceptual documentation about Q#, please see the [MicrosoftDocs/quantum-docs-pr](https://github.com/MicrosoftDocs/quantum-docs-pr) repository. -If you are interested in contributing API references, please see [Contributing Code](https://docs.microsoft.com/quantum/contributing/code) in the contribution guide. +If you are interested in contributing API references, please see [Contributing Code](https://docs.microsoft.com/azure/quantum/contributing-code) in the contribution guide. And last but not least: diff --git a/README.md b/README.md index 61905922d77..072e3f98d2d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Welcome to the Microsoft Quantum Development Kit! -This repository contains the runtime components for the [Quantum Development Kit](https://docs.microsoft.com/quantum/). +This repository contains the runtime components for the [Quantum Development Kit](https://docs.microsoft.com/azure/quantum/). It consists of the libraries and packages needed to create and simulate quantum applications using Q#. - **[Azure/](./src/Azure/)**: Source for client package to create and manage jobs in Azure Quantum. @@ -11,14 +11,14 @@ It consists of the libraries and packages needed to create and simulate quantum ## New to Quantum? ## -See the [introduction to quantum computing](https://docs.microsoft.com/quantum/concepts/) provided with the Quantum Development Kit. +See the [introduction to quantum computing](https://docs.microsoft.com/azure/quantum/concepts-overview) provided with the Quantum Development Kit. ## Installing the Quantum Development Kit -**If you're looking to use Q# to write quantum applications, please see the instructions on how to get started with using the [Quantum Development Kit](https://docs.microsoft.com/quantum/install-guide/) including the Q# compiler, language server, and development environment extensions.** +**If you're looking to use Q# to write quantum applications, please see the instructions on how to get started with using the [Quantum Development Kit](https://docs.microsoft.com/azure/quantum/install-overview-qdk) including the Q# compiler, language server, and development environment extensions.** -Please see the [installation guide](https://docs.microsoft.com/quantum/install-guide) for further information on how to get started using the Quantum Development Kit to develop quantum applications. +Please see the [installation guide](https://docs.microsoft.com/azure/quantum/install-overview-qdk) for further information on how to get started using the Quantum Development Kit to develop quantum applications. You may also visit our [Quantum](https://github.com/microsoft/quantum) repository, which offers a wide variety of samples on how to write quantum based programs. @@ -81,7 +81,7 @@ All unit tests are part of the `Simulation.sln` solution. To run the tests: ## Feedback ## If you have feedback about the Q# simulators or any other runtime component, please let us know by filing a [new issue](https://github.com/microsoft/qsharp-runtime/issues/new)! -If you have feedback about some other part of the Microsoft Quantum Development Kit, please see the [contribution guide](https://docs.microsoft.com/quantum/contributing/) for more information. +If you have feedback about some other part of the Microsoft Quantum Development Kit, please see the [contribution guide](https://docs.microsoft.com/azure/quantum/contributing-overview) for more information. ## Reporting Security Issues @@ -111,4 +111,4 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. -For more details, please see [CONTRIBUTING.md](./CONTRIBUTING.md), or the [contribution guide](https://docs.microsoft.com/quantum/contributing/). +For more details, please see [CONTRIBUTING.md](./CONTRIBUTING.md), or the [contribution guide](https://docs.microsoft.com/azure/quantum/contributing-overview). diff --git a/src/Azure/Azure.Quantum.Client/Microsoft.Azure.Quantum.Client.csproj b/src/Azure/Azure.Quantum.Client/Microsoft.Azure.Quantum.Client.csproj index 0b58a8e9699..54927775280 100644 --- a/src/Azure/Azure.Quantum.Client/Microsoft.Azure.Quantum.Client.csproj +++ b/src/Azure/Azure.Quantum.Client/Microsoft.Azure.Quantum.Client.csproj @@ -9,8 +9,8 @@ - https://docs.microsoft.com/quantum/ - See: https://docs.microsoft.com/quantum/relnotes/ + https://docs.microsoft.com/azure/quantum/ + See: https://docs.microsoft.com/azure/quantum/qdk-relnotes/ MIT https://github.com/microsoft/qsharp-runtime Azure Quantum Q# QSharp diff --git a/src/Quantum.Development.Kit/Microsoft.Quantum.Development.Kit.nuspec b/src/Quantum.Development.Kit/Microsoft.Quantum.Development.Kit.nuspec index 6a617e3b041..de6a81b711b 100644 --- a/src/Quantum.Development.Kit/Microsoft.Quantum.Development.Kit.nuspec +++ b/src/Quantum.Development.Kit/Microsoft.Quantum.Development.Kit.nuspec @@ -8,13 +8,13 @@ QuantumEngineering, Microsoft MIT - https://docs.microsoft.com/en-us/quantum + https://docs.microsoft.com/azure/quantum images\qdk-nuget-icon.png false Provides tools for developing quantum algorithms in the Q# programming language. - See: https://docs.microsoft.com/en-us/quantum/relnotes/ + See: https://docs.microsoft.com/azure/quantum/qdk-relnotes/ © Microsoft Corporation. All rights reserved. Quantum Q# QSharp diff --git a/src/Simulation/CSharpGeneration/Microsoft.Quantum.CSharpGeneration.nuspec.template b/src/Simulation/CSharpGeneration/Microsoft.Quantum.CSharpGeneration.nuspec.template index 3578f7afcd4..85f8de00fe1 100644 --- a/src/Simulation/CSharpGeneration/Microsoft.Quantum.CSharpGeneration.nuspec.template +++ b/src/Simulation/CSharpGeneration/Microsoft.Quantum.CSharpGeneration.nuspec.template @@ -8,13 +8,13 @@ QuantumEngineering, Microsoft MIT - https://docs.microsoft.com/en-us/quantum + https://docs.microsoft.com/azure/quantum images\qdk-nuget-icon.png false C# code generation for executing Q# programs on a quantum simulator. - See: https://docs.microsoft.com/en-us/quantum/relnotes/ + See: https://docs.microsoft.com/azure/quantum/qdk-relnotes/ $copyright$ Quantum Q# QSharp diff --git a/src/Simulation/Common/AssemblyCommon.props b/src/Simulation/Common/AssemblyCommon.props index 14c45ada66c..abc6491c495 100644 --- a/src/Simulation/Common/AssemblyCommon.props +++ b/src/Simulation/Common/AssemblyCommon.props @@ -5,9 +5,9 @@ Microsoft Microsoft Quantum Development Kit Preview © Microsoft Corporation. All rights reserved. - See: https://docs.microsoft.com/en-us/quantum/relnotes/ + See: https://docs.microsoft.com/azure/quantum/qdk-relnotes/ MIT - https://docs.microsoft.com/quantum/ + https://docs.microsoft.com/azure/quantum/ https://github.com/microsoft/qsharp-runtime qdk-nuget-icon.png true diff --git a/src/Simulation/Common/IQuantumProcessor.cs b/src/Simulation/Common/IQuantumProcessor.cs index ed6d7fcc3eb..8bd4dc6ec7f 100644 --- a/src/Simulation/Common/IQuantumProcessor.cs +++ b/src/Simulation/Common/IQuantumProcessor.cs @@ -563,7 +563,7 @@ public interface IQuantumProcessor void OnFail(System.Runtime.ExceptionServices.ExceptionDispatchInfo exceptionDispatchInfo); /// - /// Called when qubits are allocated by Q# using block. + /// Called when qubits are allocated by Q# using block. /// /// Qubits that are being allocated. /// @@ -573,7 +573,7 @@ public interface IQuantumProcessor void OnAllocateQubits(IQArray qubits); /// - /// Called when qubits are released in Q# in the end of using block. + /// Called when qubits are released in Q# in the end of using block. /// /// Qubits that are being released. /// @@ -583,7 +583,7 @@ public interface IQuantumProcessor void OnReleaseQubits(IQArray qubits); /// - /// Called when qubits are borrowed by Q# borrowing block. + /// Called when qubits are borrowed by Q# borrowing block. /// /// Qubits that are being borrowed. /// Number of qubits that have been allocated for borrowing. This might happen if there have not been enough already allocated qubits available for borrowing.. @@ -594,7 +594,7 @@ public interface IQuantumProcessor void OnBorrowQubits(IQArray qubits, long allocatedForBorrowingCount); /// - /// Called when qubits are returned in the end of Q# borrowing block. + /// Called when qubits are returned in the end of Q# borrowing block. /// /// Qubits that have been borrowed and are now being returned. /// Number of qubits that have been released once returned. This might happen if they have been allocated only for borrowing.. diff --git a/src/Simulation/Native/CMakeLists.txt b/src/Simulation/Native/CMakeLists.txt index 40e9ba946b8..b3167428e68 100644 --- a/src/Simulation/Native/CMakeLists.txt +++ b/src/Simulation/Native/CMakeLists.txt @@ -44,6 +44,9 @@ else (MSVC) set(CMAKE_CXX_FLAGS "-static-libgcc") endif (MSVC) +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Qspectre") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Qspectre") + include_directories(${PROJECT_BINARY_DIR}/src) include_directories(${PROJECT_SOURCE_DIR}/src) diff --git a/src/Simulation/Simulators/Microsoft.Quantum.Simulators.nuspec.template b/src/Simulation/Simulators/Microsoft.Quantum.Simulators.nuspec.template index 446ff2a8f7d..3c72204cd23 100644 --- a/src/Simulation/Simulators/Microsoft.Quantum.Simulators.nuspec.template +++ b/src/Simulation/Simulators/Microsoft.Quantum.Simulators.nuspec.template @@ -7,11 +7,11 @@ Microsoft QuantumEngineering, Microsoft MIT - https://docs.microsoft.com/en-us/quantum + https://docs.microsoft.com/azure/quantum images\qdk-nuget-icon.png false Classical simulators of quantum computers for the Q# programming language. - See: https://docs.microsoft.com/en-us/quantum/relnotes/ + See: https://docs.microsoft.com/azure/quantum/qdk-relnotes/ © Microsoft Corporation. All rights reserved. Quantum Q# QSharp diff --git a/src/Simulation/Simulators/QuantumSimulator/Qubit.cs b/src/Simulation/Simulators/QuantumSimulator/Qubit.cs index 02424dfbc3e..2f091f76df9 100644 --- a/src/Simulation/Simulators/QuantumSimulator/Qubit.cs +++ b/src/Simulation/Simulators/QuantumSimulator/Qubit.cs @@ -20,10 +20,16 @@ public QSimQubit(int id, uint simulatorId) : base(id) this.SimulatorId = simulatorId; } + public QSimQubit(int id, uint simulatorId, string label) : this(id, simulatorId) { + this.Label = label; + } + [DebuggerBrowsable(DebuggerBrowsableState.Never)] public uint SimulatorId { get; } public double Probability => JointEnsembleProbability(this.SimulatorId, 1, PAULI_Z, new uint[] { (uint)this.Id }); + + public string? Label {get; set;} } } } diff --git a/src/Xunit/Microsoft.Quantum.Xunit.nuspec b/src/Xunit/Microsoft.Quantum.Xunit.nuspec index 52887b4328b..2185ff6d3ad 100644 --- a/src/Xunit/Microsoft.Quantum.Xunit.nuspec +++ b/src/Xunit/Microsoft.Quantum.Xunit.nuspec @@ -8,13 +8,13 @@ QuantumEngineering, Microsoft MIT - https://docs.microsoft.com/en-us/quantum + https://docs.microsoft.com/azure/quantum images\qdk-nuget-icon.png false Library for testing Q# programs and algorithms using the xUnit framework. - See: https://docs.microsoft.com/en-us/quantum/relnotes/ + See: https://docs.microsoft.com/azure/quantum/qdk-relnotes/ $copyright$ Quantum Q# QSharp test xunit From 45b1da54c111dfc53bfbfba7409159a4f449e87b Mon Sep 17 00:00:00 2001 From: "REDMOND\\anburton" Date: Wed, 24 Mar 2021 14:50:59 -0700 Subject: [PATCH 2/2] revert unwanted changes --- src/Simulation/Native/CMakeLists.txt | 3 --- src/Simulation/Simulators/QuantumSimulator/Qubit.cs | 6 ------ 2 files changed, 9 deletions(-) diff --git a/src/Simulation/Native/CMakeLists.txt b/src/Simulation/Native/CMakeLists.txt index b3167428e68..40e9ba946b8 100644 --- a/src/Simulation/Native/CMakeLists.txt +++ b/src/Simulation/Native/CMakeLists.txt @@ -44,9 +44,6 @@ else (MSVC) set(CMAKE_CXX_FLAGS "-static-libgcc") endif (MSVC) -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Qspectre") -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Qspectre") - include_directories(${PROJECT_BINARY_DIR}/src) include_directories(${PROJECT_SOURCE_DIR}/src) diff --git a/src/Simulation/Simulators/QuantumSimulator/Qubit.cs b/src/Simulation/Simulators/QuantumSimulator/Qubit.cs index 2f091f76df9..02424dfbc3e 100644 --- a/src/Simulation/Simulators/QuantumSimulator/Qubit.cs +++ b/src/Simulation/Simulators/QuantumSimulator/Qubit.cs @@ -20,16 +20,10 @@ public QSimQubit(int id, uint simulatorId) : base(id) this.SimulatorId = simulatorId; } - public QSimQubit(int id, uint simulatorId, string label) : this(id, simulatorId) { - this.Label = label; - } - [DebuggerBrowsable(DebuggerBrowsableState.Never)] public uint SimulatorId { get; } public double Probability => JointEnsembleProbability(this.SimulatorId, 1, PAULI_Z, new uint[] { (uint)this.Id }); - - public string? Label {get; set;} } } }