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
Show all changes
69 commits
Select commit Hold shift + click to select a range
c804d4f
Fix case consistency in test namespace
rmshaffer Apr 13, 2020
d9afad7
Enforce exact match for %magic command names
rmshaffer Apr 13, 2020
c757aa6
Make Extensions.Dedent() publicly accessible
rmshaffer Apr 13, 2020
8b931bb
Move Extensions.Dedent() to core project
rmshaffer Apr 13, 2020
7e5f3f6
Add AzureClient project to iqsharp solution
rmshaffer Apr 13, 2020
a0023f2
Add AzureClient project dependencies and update package versions to b…
rmshaffer Apr 13, 2020
e424eed
Add AzureClient class and register as magic symbol provider
rmshaffer Apr 13, 2020
dfc62ab
Add #nullable enable to new files
rmshaffer Apr 15, 2020
7d7bcc3
Add empty AzureClientTests
rmshaffer Apr 15, 2020
8d2b0eb
Update a few package references
rmshaffer Apr 16, 2020
435018a
Merge branch 'rmshaffer/azure-client' of https://github.com/microsoft…
rmshaffer Apr 17, 2020
0c5681a
Update IAzureClient API docs
Apr 17, 2020
65ccb8c
Update new array syntax
Apr 17, 2020
9c9cc67
Merge branch 'rmshaffer/azure-client' of https://github.com/microsoft…
rmshaffer Apr 17, 2020
ae883cb
Use Microsoft.Quantum.Development.Kit package
rmshaffer Apr 17, 2020
14822df
Merge pull request #119 from microsoft/rmshaffer/azure-client
Apr 17, 2020
097db8a
Merge branch 'master' into feature/azure-client
rmshaffer Apr 29, 2020
a105f20
Merge branch 'master' into feature/azure-client
rmshaffer May 8, 2020
abe204f
Update package references
rmshaffer May 8, 2020
e6e582d
Add AzureClient assembly to manifest (#141)
May 13, 2020
a0f30a6
Merge branch 'master' into feature/azure-quantum-preview
rmshaffer May 18, 2020
ce2327f
Update Microsoft.Identity.Client package versions
rmshaffer May 19, 2020
281bc15
Merge pull request #146 from microsoft/rmshaffer/identity-package-ver…
May 19, 2020
3c4803f
Initial IQ# magic command implementation for Azure Quantum (#144)
May 20, 2020
79cb1ee
Add remaining AzureClient magic commands (#150)
May 28, 2020
8e118b6
Updates to IQ# syntax highlighting
rmshaffer May 28, 2020
2891f4f
Remove azure magics from CodeMirror rules
rmshaffer May 29, 2020
e76dc50
Minor tweak for consistency
rmshaffer May 29, 2020
4f6051c
Merge remote-tracking branch 'origin/rmshaffer/syntax-highlighting' i…
rmshaffer Jun 1, 2020
d583763
Merge branch 'master' into feature/azure-client
rmshaffer Jun 3, 2020
946bfa4
Merge branch 'master' into feature/azure-client
rmshaffer Jun 3, 2020
1cc1cb8
Merge branch 'master' into feature/azure-client
rmshaffer Jun 3, 2020
2471dc7
Merge branch 'master' into feature/azure-client
rmshaffer Jun 5, 2020
0282eec
Validate and load packages for Azure execution targets (#152)
Jun 8, 2020
e569b0b
Merge branch 'master' into feature/azure-client
rmshaffer Jun 8, 2020
1c17687
Auto-generate entry point for Azure job submission (#156)
Jun 12, 2020
8d68193
Add simple display encoders for CloudJob, TargetStatus, and Histogram…
Jun 12, 2020
79cf9ca
Support several parameters for IQ# Azure Quantum job execution (#161)
Jun 12, 2020
fba06c9
Refactor Azure authentication and service calls (#164)
Jun 12, 2020
4e70a76
Mock AzureEnvironment and end-to-end tests
rmshaffer Jun 12, 2020
481a7a6
Merge branch 'master' into feature/azure-client
rmshaffer Jun 12, 2020
97829db
Merge branch 'feature/azure-client' into rmshaffer/azure-mock-tests
rmshaffer Jun 12, 2020
fb9e218
Raise Python exceptions rather than returning error objects
rmshaffer Jun 14, 2020
a6391c7
Fix nullable warnings
rmshaffer Jun 15, 2020
2fed647
Minor cleanup
rmshaffer Jun 15, 2020
8771325
Improvements to magic command argument parsing (#170)
Jun 15, 2020
7043e57
Merge branch 'feature/azure-client' into rmshaffer/azure-mock-tests
rmshaffer Jun 15, 2020
17c24e8
Add missing Dedent() in ConfigMagic
rmshaffer Jun 16, 2020
5164a0e
Add filter for %azure.jobs command
rmshaffer Jun 17, 2020
5974199
Move filter logic into extension function
rmshaffer Jun 17, 2020
f164738
Fix typo
rmshaffer Jun 18, 2020
b26ae42
Merge branch 'rmshaffer/azure-mock-tests' into rmshaffer/filter-jobs
rmshaffer Jun 19, 2020
83fa8f9
Tests and Python support
rmshaffer Jun 19, 2020
f328aa5
Few improvements to output when using Python
rmshaffer Jun 19, 2020
4f4c813
Merge branch 'rmshaffer/azure-mock-tests' into rmshaffer/filter-jobs
rmshaffer Jun 19, 2020
ca4b447
Small change to CloudJob encoder
rmshaffer Jun 22, 2020
4cf2894
Merge branch 'master' into feature/azure-client
rmshaffer Jun 22, 2020
8e0c21c
Merge branch 'feature/azure-client' into rmshaffer/azure-mock-tests
rmshaffer Jun 22, 2020
ee762f4
Merge branch 'rmshaffer/azure-mock-tests' into rmshaffer/filter-jobs
rmshaffer Jun 22, 2020
4896d9a
Add mock Azure classes, improve qsharp.azure Python API, implement en…
Jun 22, 2020
d584865
Merge branch 'feature/azure-client' into rmshaffer/filter-jobs
rmshaffer Jun 22, 2020
66742a9
Support kernel interrupt for %azure.execute (#176)
Jun 23, 2020
a10ea68
Merge branch 'feature/azure-client' into rmshaffer/filter-jobs
rmshaffer Jun 23, 2020
f5d7090
Add filter functionality to %azure.jobs command (#174)
Jun 23, 2020
d76cd53
Support connection to Azure Quantum workspace via resource ID (#173)
Jun 23, 2020
53c9a1c
Add terminating character to NuGet.config
rmshaffer Jun 23, 2020
fcf567a
Use correct encoding
rmshaffer Jun 23, 2020
afaf38f
Whitespace
rmshaffer Jun 23, 2020
deff3af
Merge branch 'master' into feature/azure-client
Jun 25, 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
4 changes: 4 additions & 0 deletions build/manifest.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

#!/usr/bin/env pwsh
#Requires -PSEdition Core

Expand All @@ -11,6 +14,7 @@
);
Assemblies = @(
"./src/Tool/bin/$Env:BUILD_CONFIGURATION/netcoreapp3.1/Microsoft.Quantum.IQSharp.dll",
"./src/Tool/bin/$Env:BUILD_CONFIGURATION/netcoreapp3.1/Microsoft.Quantum.IQSharp.AzureClient.dll",
"./src/Tool/bin/$Env:BUILD_CONFIGURATION/netcoreapp3.1/Microsoft.Quantum.IQSharp.Core.dll",
"./src/Tool/bin/$Env:BUILD_CONFIGURATION/netcoreapp3.1/Microsoft.Quantum.IQSharp.Jupyter.dll",
"./src/Tool/bin/$Env:BUILD_CONFIGURATION/netcoreapp3.1/Microsoft.Quantum.IQSharp.Kernel.dll",
Expand Down
5 changes: 5 additions & 0 deletions build/steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ steps:
- pwsh: .\build.ps1
displayName: "Building IQ#"
workingDirectory: '$(System.DefaultWorkingDirectory)/build'

- pwsh: .\manifest.ps1
displayName: "List built assemblies"
workingDirectory: '$(System.DefaultWorkingDirectory)/build'
condition: succeededOrFailed()

- pwsh: .\test.ps1
displayName: "Testing IQ#"
Expand Down
2 changes: 1 addition & 1 deletion build/test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function Test-Python {
Write-Host "##[info]Testing Python inside $testFolder"
Push-Location (Join-Path $PSScriptRoot $testFolder)
python --version
pytest -v
pytest -v --log-level=Debug
Pop-Location

if ($LastExitCode -ne 0) {
Expand Down
2 changes: 0 additions & 2 deletions conda-recipes/iqsharp/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ if ($IsWindows) {
$RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "../..");
$ArtifactRoot = Join-Path $RepoRoot "drops";
$SelfContainedDirectory = Join-Path $ArtifactRoot (Join-Path "selfcontained" $RuntimeID)
$NugetsDirectory = Join-Path $ArtifactRoot "nugets"
$NugetConfig = Resolve-Path (Join-Path $PSScriptRoot "NuGet.config");

$TargetDirectory = (Join-Path (Join-Path $Env:PREFIX "opt") "iqsharp");

Expand Down
14 changes: 13 additions & 1 deletion conda-recipes/iqsharp/test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ $failed = $false;

$Env:IQSHARP_PACKAGE_SOURCE = "$Env:NUGET_OUTDIR"

# Add the prerelease NuGet feed if this isn't a release build.
if ("$Env:BUILD_RELEASETYPE" -ne "release") {
$NuGetDirectory = Resolve-Path ~
Write-Host "## Writing prerelease NuGet config to $NuGetDirectory ##"
"<?xml version=""1.0"" encoding=""utf-8""?>
<configuration>
<packageSources>
<add key=""qdk-alpha"" value=""https://pkgs.dev.azure.com/ms-quantum-public/Microsoft Quantum (public)/_packaging/alpha/nuget/v3/index.json"" protocolVersion=""3"" />
</packageSources>
</configuration>" | Out-File -FilePath $NuGetDirectory/NuGet.Config -Encoding utf8
}

# Check that iqsharp is installed as a Jupyter kernel.
$kernels = jupyter kernelspec list --json | ConvertFrom-Json;
if ($null -eq $kernels.kernelspecs.iqsharp) {
Expand All @@ -13,7 +25,7 @@ if ($null -eq $kernels.kernelspecs.iqsharp) {
jupyter kernelspec list
}


# Run the kernel unit tests.
Push-Location $PSScriptRoot
python test.py
if ($LastExitCode -ne 0) {
Expand Down
14 changes: 14 additions & 0 deletions iqsharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tool", "src\Tool\Tool.cspro
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "src\Web\Web.csproj", "{6431E92B-12AA-432C-8D53-C9A7A54BA21B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureClient", "src\AzureClient\AzureClient.csproj", "{E7B60C94-B666-4024-B53E-D12C142DE8DC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jupyter", "src\Jupyter\Jupyter.csproj", "{19A9E2AB-8842-47E2-8E6A-6DD292B49E97}"
EndProject
Global
Expand Down Expand Up @@ -85,6 +87,18 @@ Global
{6431E92B-12AA-432C-8D53-C9A7A54BA21B}.Release|x64.Build.0 = Release|Any CPU
{6431E92B-12AA-432C-8D53-C9A7A54BA21B}.Release|x86.ActiveCfg = Release|Any CPU
{6431E92B-12AA-432C-8D53-C9A7A54BA21B}.Release|x86.Build.0 = Release|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Debug|x64.ActiveCfg = Debug|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Debug|x64.Build.0 = Debug|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Debug|x86.ActiveCfg = Debug|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Debug|x86.Build.0 = Debug|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Release|Any CPU.Build.0 = Release|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Release|x64.ActiveCfg = Release|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Release|x64.Build.0 = Release|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Release|x86.ActiveCfg = Release|Any CPU
{E7B60C94-B666-4024-B53E-D12C142DE8DC}.Release|x86.Build.0 = Release|Any CPU
{19A9E2AB-8842-47E2-8E6A-6DD292B49E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19A9E2AB-8842-47E2-8E6A-6DD292B49E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19A9E2AB-8842-47E2-8E6A-6DD292B49E97}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down
Loading