Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
# Note that we only support automerge on branches that have required checks.
branches:
- master
- main
- feature/*
types:
- labeled
Expand All @@ -19,7 +19,7 @@ on:
pull_request_review:
# Note that we only support automerge on branches that have required checks.
branches:
- master
- main
- feature/*
types:
- submitted
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/qdk-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Sync QDK repos

on:
push:
branches:
- main

jobs:
sync-repos:
runs-on: ubuntu-latest
steps:
- name: Login to Azure
uses: Azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

- id: AzureKeyVault
uses: Azure/get-keyvault-secrets@v1.0
with:
keyvault: 'kv-qdk-build'
secrets: 'qdkBuildPAT'

- name: 'Trigger QDK sync build'
uses: Azure/pipelines@releases/v1
with:
azure-devops-project-url: 'https://dev.azure.com/ms-quantum-public/Microsoft Quantum (public)'
azure-pipeline-name: 'microsoft.qdk.sync'
azure-devops-token: ${{ steps.AzureKeyVault.outputs.qdkBuildPAT }}
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: trailing-whitespace
args: [--markdown-linebreak-ext=md]
- id: no-commit-to-branch
args: [-b, "master"]
args: [-b, "main"]
- id: check-yaml
- repo: local
hooks:
Expand Down
33 changes: 33 additions & 0 deletions Build/e2e.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: $(Build.Major).$(Build.Minor).$(date:yyMM).$(BuildId)

parameters:
- name: validation_level
displayName: Validation Level
type: string
default: normal
values:
- minimal
- normal
- full

trigger: none

pr:
- main
- feature/*
- features/*
- release/*

resources:
repositories:
- repository: qdk
type: github
endpoint: github
name: microsoft/qdk
ref: refs/heads/main

extends:
template: build/qdk-module-e2e.yml@qdk
parameters:
module: QuantumLibraries
validation_level: ${{ parameters.validation_level }}
6 changes: 3 additions & 3 deletions Chemistry/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Microsoft Quantum Chemistry Library #

This folder contains the C# and Q# sources used to implement the [Microsoft Quantum Chemistry library](https://docs.microsoft.com/en-us/quantum/libraries/chemistry/).
Samples of how to use the library can be found in the Chemistry folder of the [Microsoft/Quantum repository](https://github.com/Microsoft/Quantum/tree/master/Chemistry).
Samples of how to use the library can be found in the Chemistry folder of the [Microsoft/Quantum repository](https://github.com/microsoft/Quantum/tree/main/Chemistry).

## Building and testing ##

The quantum chemistry library consists of two cross-platform project built using [.NET Core](https://docs.microsoft.com/en-us/dotnet/core/):

- [**DataModel.csproj**](https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry/src/DataModel/DataModel.csproj): C# sources used to load, parse, and pre-compute Hamiltonians loaded from LIQ𝑈𝑖|〉 or Broombridge files.
- [**Runtime.csproj**](https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry/src/Runtime/Runtime.csproj): Q# sources used to implement quantum chemistry simulation algorithms, given representations produced by the DataModel.
- [**DataModel.csproj**](https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry/src/DataModel/DataModel.csproj): C# sources used to load, parse, and pre-compute Hamiltonians loaded from LIQ𝑈𝑖|〉 or Broombridge files.
- [**Runtime.csproj**](https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry/src/Runtime/Runtime.csproj): Q# sources used to implement quantum chemistry simulation algorithms, given representations produced by the DataModel.

Once .NET Core is installed, you may build and run its tests by executing the following from a command line:

Expand Down
2 changes: 1 addition & 1 deletion Chemistry/src/DataModel/DataModel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageId>Microsoft.Quantum.Chemistry.DataModel</PackageId>
<PackageReleaseNotes>See: https://docs.microsoft.com/en-us/quantum/relnotes/</PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry</PackageProjectUrl>
<PackageProjectUrl>https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry</PackageProjectUrl>
<PackageIcon>qdk-nuget-icon.png</PackageIcon>
<PackageTags>Quantum Q# Qsharp</PackageTags>
<NoWarn>1591</NoWarn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ internal static V0_1.IntegralSet ToBroombridgeV0_1(this ElectronicStructureProbl
#region Broombridge v0.1 format
public static class V0_1
{
public static string SchemaUrl = "https://raw.githubusercontent.com/microsoft/Quantum/master/Chemistry/Schema/broombridge-0.1.schema.json";
public static string SchemaUrl = "https://raw.githubusercontent.com/microsoft/Quantum/main/Chemistry/Schema/broombridge-0.1.schema.json";

public struct Data
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ this IEnumerable<V0_2.State> initialStates
#region Broombridge v0.2 format
public static class V0_2
{
public static string SchemaUrl = "https://raw.githubusercontent.com/microsoft/Quantum/master/Chemistry/Schema/broombridge-0.2.schema.json";
public static string SchemaUrl = "https://raw.githubusercontent.com/microsoft/Quantum/main/Chemistry/Schema/broombridge-0.2.schema.json";
internal static class UpdaterStrings
{
public const string SingleConfigurational = "single_configurational";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public static class Deserializers
/// </summary>
internal static Dictionary<string, VersionNumber> VersionNumberDict = new Dictionary<string, VersionNumber>()
{
// https://github.com/Microsoft/Quantum/blob/master/Chemistry/Schema/broombridge-0.1.schema.json
// https://github.com/microsoft/Quantum/blob/main/Chemistry/Schema/broombridge-0.1.schema.json
["0.1"] = VersionNumber.v0_1,
["broombridge-0.1.schema"] = VersionNumber.v0_1,
// TODO: URL of 0.2 schema.
Expand Down
4 changes: 2 additions & 2 deletions Chemistry/src/Jupyter/Jupyter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<Description>Microsoft's Quantum Chemistry Libraries Jupyter integration.</Description>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<PackageReleaseNotes>See: https://docs.microsoft.com/en-us/quantum/relnotes/</PackageReleaseNotes>
<PackageLicenseUrl>https://github.com/Microsoft/QuantumLibraries/raw/master/LICENSE.txt</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/microsoft/QuantumLibraries/raw/main/LICENSE.txt</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry</PackageProjectUrl>
<PackageIcon>qdk-nuget-icon.png</PackageIcon>
<PackageTags>Quantum Q# Qsharp Jupyter</PackageTags>
<NoWarn>1591</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/src/Metapackage/Metapackage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageId>Microsoft.Quantum.Chemistry</PackageId>
<PackageReleaseNotes>See: https://docs.microsoft.com/en-us/quantum/relnotes/</PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry</PackageProjectUrl>
<PackageProjectUrl>https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry</PackageProjectUrl>
<PackageIcon>qdk-nuget-icon.png</PackageIcon>
<PackageTags>Quantum Q# Qsharp</PackageTags>
<NoWarn>1591</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/src/Runtime/Runtime.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageId>Microsoft.Quantum.Chemistry.Runtime</PackageId>
<PackageReleaseNotes>See: https://docs.microsoft.com/en-us/quantum/relnotes/</PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Microsoft/QuantumLibraries/tree/master/Chemistry</PackageProjectUrl>
<PackageProjectUrl>https://github.com/microsoft/QuantumLibraries/tree/main/Chemistry</PackageProjectUrl>
<PackageIcon>qdk-nuget-icon.png</PackageIcon>
<PackageTags>Quantum Q# Qsharp</PackageTags>
<NoWarn>1591</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/tests/TestData/Broombridge/LiH_0.1.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.1.schema.json
"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.1.schema.json

bibliography:
- {url: 'https://www.nwchem-sw.org'}
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/tests/TestData/Broombridge/LiH_0.2.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.2.schema.json
"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.2.schema.json

bibliography:
- {url: 'https://www.nwchem-sw.org'}
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/tests/TestData/Broombridge/broombridge_v0.1.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Generated by nwchem version v...
"$schema": https://github.com/Microsoft/Quantum/blob/master/Chemistry/Schema/broombridge-0.1.schema.json
"$schema": https://github.com/microsoft/Quantum/blob/main/Chemistry/Schema/broombridge-0.1.schema.json
format: # required
version: "0.1" # must match exactly
generator: # optional
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/tests/TestData/Broombridge/broombridge_v0.2.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Generated by nwchem version v...
"$schema": https://github.com/Microsoft/Quantum/blob/master/Chemistry/Schema/broombridge-0.2.schema.json
"$schema": https://github.com/microsoft/Quantum/blob/main/Chemistry/Schema/broombridge-0.2.schema.json
format:
version: "0.2" # required. Must match exactly
generator: # optional
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/tests/TestData/Broombridge/hydrogen_0.1.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.1.schema.json
"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.1.schema.json

bibliography:
- {url: 'https://www.nwchem-sw.org'}
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/tests/TestData/Broombridge/hydrogen_0.2.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.2.schema.json
"$schema": https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.2.schema.json

bibliography:
- {url: 'https://www.nwchem-sw.org'}
Expand Down
2 changes: 1 addition & 1 deletion Chemistry/tests/TestData/FciDump/h2_631g.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# H2 molecule using 6-31G basis, containing 2 electrons 4 orbitals
$schema: https://raw.githubusercontent.com/Microsoft/Quantum/master/Chemistry/Schema/broombridge-0.2.schema.json
$schema: https://raw.githubusercontent.com/Microsoft/Quantum/main/Chemistry/Schema/broombridge-0.2.schema.json
format:
version: '0.2'
problem_description:
Expand Down
2 changes: 1 addition & 1 deletion MachineLearning/src/MachineLearning.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<PackageId>Microsoft.Quantum.MachineLearning</PackageId>
<PackageReleaseNotes>See: https://docs.microsoft.com/quantum/relnotes/</PackageReleaseNotes>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/Microsoft/QuantumLibraries/tree/master/MachineLearning</PackageProjectUrl>
<PackageProjectUrl>https://github.com/microsoft/QuantumLibraries/tree/main/MachineLearning</PackageProjectUrl>
<PackageIcon>qdk-nuget-icon.png</PackageIcon>
<PackageTags>Quantum Q# Qsharp</PackageTags>
<NoWarn>1591</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion Python/qsharp-chemistry/qsharp/tests/broombridge.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# © Microsoft
# MIT license
# Generated by nwchem version v...
"$schema": https://github.com/Microsoft/Quantum/blob/master/Chemistry/Schema/broombridge-0.2.schema.json
"$schema": https://github.com/microsoft/Quantum/blob/main/Chemistry/Schema/broombridge-0.2.schema.json
format:
version: "0.2" # required. Must match exactly
generator: # optional
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ of samples on how to use these libraries to write quantum based programs.

| branch | status |
|--------|-----------|
| master | [![Build Status](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_apis/build/status/Microsoft.QuantumLibraries?branchName=master)](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_build/latest?definitionId=1&branchName=master) |
| main | [![Build Status](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_apis/build/status/Microsoft.QuantumLibraries?branchName=main)](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_build/latest?definitionId=1&branchName=main) |

## Feedback ##

Expand Down
2 changes: 1 addition & 1 deletion Standard/src/Synthesis/ControlledOnTruthTable.qs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ namespace Microsoft.Quantum.Synthesis {
/// and the least significant bit `0` corresponds to the input assignment `(0, 0, 0)`.
/// It can be represented by the big integer `0xE8L` in hexadecimal notation or as `232L`
/// in decimal notation. The `L` suffix indicates that the constant is of type `BigInt`.
/// More details on this representation can also be found in the [truth tables kata](https://github.com/microsoft/QuantumKatas/tree/master/TruthTables).
/// More details on this representation can also be found in the [truth tables kata](https://github.com/microsoft/QuantumKatas/tree/main/TruthTables).
///
/// The implementation makes use of @"microsoft.quantum.intrinsic.cnot"
/// and @"microsoft.quantum.intrinsic.r1" gates.
Expand Down
9 changes: 7 additions & 2 deletions build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
# Build configuration file to run build on azure-pipelines
#
name: $(Build.Major).$(Build.Minor).$(date:yyMM).$(DayOfMonth)$(rev:rr)
trigger:
- master

trigger: none

pr:
- main
- feature/*
- features/*
- release/*

variables:
Build.Major: 0
Expand Down
2 changes: 1 addition & 1 deletion sync.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:: the public repository (https://github.com/Microsoft/Quantum.git)
::
set branch=%1
IF "%branch%" == "" SET branch=master
IF "%branch%" == "" SET branch=main

git fetch origin
git fetch public || call :addPublic
Expand Down