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

Commit bb1cdd1

Browse files
cesarzcfilipwScottCarda-MSbamarshabettinaheim
authored
Merge latest changes from main into feature branch (#1258)
* added MSBuild_Logs to gitignore (#1171) * Command Line Support for Project File Input (#1192) * Change --inputs to --input (#1210) * Deprecate new array expression (#956) * Removing temporary project (#1225) * Formatter Updates Deprecated Boolean Operator Syntax (#1214) * Update the documentation found in the Q# Formatter Project (#1203) * Formatter Updates Deprecated Specialization Declaration Parameters (#1226) * Adding Sdk integration, and formatting support + code action for syntax updates to the language server (#1207) * QAT v. 0.1 (#1230) * Sdk changes to support Qir targets (#1238) * Quantum Development Kit Telemetry Library (#1199) Co-authored-by: Sarah Marshall <[email protected]> Co-authored-by: Scott Carda <[email protected]> * Allowing to use the LLVM intrinsic readcyclecounter from Q# (#1248) * Do case-insensitive comparisons for targets names (#1241) During the build stage of a Q# job submission via the CLI or the stand-alone executable, there is a case sensitive enforcement of target names. Since this limitation does not exist in the service or in other clients, we're aligning by making the corresponding comparison case insensitive. * Refactor language server code for extracting symbols from Q# fragments (#1220) * Start adding SymbolOccurrence module * Replace SymbolInformation implementation * Add C# interop for SymbolOccurrence * Rename SymbolInformation.cs to match class name * Mark SymbolInformation as obsolete * Add SymbolOccurrence.fsi * Add doc comments * Fix nullable errors with .NET Core 3.1 * Use as instead of is * Take in fragment instead of file in SymbolOccurrence * Update todo comments * Return NS in open directive as UsedVariable * Use TryGet for SymbolOccurrence C# API * Statement Kinds Support (#1212) * Addressing last comments - QAT v0.1 (#1240) * Type renaming * Removing redudant setModulePassManager * Fixing recursion * Refactoring filenames * Renaming directory * Updating names and files * Formatting * Fixing include * Updates for QIR validation (#1250) * Type renaming * Removing redudant setModulePassManager * Fixing recursion * Refactoring filenames * Renaming directory * Updating names and files * Formatting * Changing default to interop friendly * Updating base profile * Styling * Updating logger * Fixing style * Removing comment * Moving testing to run before linting * Updating CMake * Attempting to solve tests issue * Updating according to PR comments * Complete NamespaceItem in qsfmt (#1239) Co-authored-by: Filip W <[email protected]> Co-authored-by: Scott Carda <[email protected]> Co-authored-by: Sarah Marshall <[email protected]> Co-authored-by: bettinaheim <[email protected]> Co-authored-by: Jintao YU <[email protected]> Co-authored-by: Troels F. Rønnow <[email protected]> Co-authored-by: XField <[email protected]> Co-authored-by: Ricardo Espinoza <[email protected]>
2 parents 55642ef + 701e12a commit bb1cdd1

File tree

244 files changed

+31945
-729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+31945
-729
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,9 @@ paket-files/
306306
__pycache__/
307307
*.pyc
308308

309+
# Python Virtual environments
310+
*__venv/
311+
309312
# Cake - Uncomment if you are using it
310313
# tools/**
311314
# !tools/packages.config
@@ -365,6 +368,8 @@ src/ProjectTemplates/Quantum.Test1/.template.config/template.json
365368
src/QsCompiler/QirGeneration/QirGeneration.nuspec
366369
/examples/QIR/Development/qir/*
367370
/examples/QIR/Development/build
371+
src/Telemetry/Tests/coverage.json
372+
src/Telemetry/.vscode/settings.json
368373

369374
# MSBuild logs
370375
MSBuild_Logs/

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "src/Passes/vendors/googletest"]
2+
path = src/Passes/vendors/googletest
3+
url = https://github.com/google/googletest.git
4+
shallow = true

build/build.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ $all_ok = $True
142142
Build-One '../QsCompiler.sln'
143143
Build-One '../examples/QIR/QIR.sln'
144144
Build-One '../src/QuantumSdk/Tools/Tools.sln'
145+
Build-One '../src/Telemetry/Telemetry.sln'
145146
Build-One '../QsFmt.sln'
146147

147148
if ($Env:ENABLE_VSIX -ne "false") {

build/ci.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,27 @@ schedules:
2626
- main
2727
always: true
2828

29-
pool:
30-
vmImage: windows-latest
3129

3230
jobs:
3331
- job: Build
3432
steps:
3533
- template: init.yml
3634
- template: steps.yml
3735
- template: wrap-up.yml
36+
pool:
37+
vmImage: windows-latest
38+
39+
- job: LinuxBuild
40+
steps:
41+
- template: passes-linux.yml
42+
pool:
43+
vmImage: ubuntu-20.04
44+
45+
- job: MacOSBuild
46+
steps:
47+
- template: passes-mac.yml
48+
pool:
49+
vmImage: macOS-latest
3850

3951
- job: Style
4052
steps:
@@ -43,3 +55,5 @@ jobs:
4355

4456
- script: dotnet tool run fantomas -- --check --recurse .
4557
displayName: Fantomas
58+
pool:
59+
vmImage: windows-latest

build/init.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ steps:
3131
inputs:
3232
command: 'custom'
3333
customCommand: 'install -g npm@latest'
34+

build/passes-linux.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
2+
steps:
3+
- script: |
4+
export DEBIAN_FRONTEND=noninteractive
5+
sudo apt-get update -y
6+
sudo apt-get install -y
7+
sudo apt-get remove -y llvm-12
8+
sudo apt-get install -y curl pkg-config findutils wget
9+
sudo apt install -y clang-11 cmake clang-format-11 clang-tidy-11
10+
sudo apt-get install -y llvm-11 lldb-11 llvm-11-dev libllvm11 llvm-11-runtime
11+
sudo apt install -y python3 python3-pip
12+
sudo apt-get remove -y llvm-10
13+
sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 0
14+
git submodule update --init --recursive
15+
cd src/Passes/
16+
pip install -r requirements.txt
17+
chmod +x manage
18+
export PYTHONUNBUFFERED=1
19+
export PYTHON_BIN_PATH=/usr/bin/python3
20+
export CC=clang-11
21+
export CXX=clang++-11
22+
./manage runci
23+
24+
displayName: Linux build and CI for passes

build/passes-mac.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
steps:
3+
- script: |
4+
rm '/usr/local/bin/2to3'
5+
brew install llvm@11
6+
brew install cmake
7+
brew install [email protected]
8+
brew unlink [email protected]
9+
10+
11+
# Updating paths
12+
export PATH="/usr/local/opt/python/libexec/bin:$PATH"
13+
export PATH="/usr/local/opt/llvm@11/bin:$PATH"
14+
export LDFLAGS="${LDFLAGS} -L/usr/local/opt/llvm@11/lib"
15+
export CPPFLAGS="${CPPFLAGS} -I/usr/local/opt/llvm@11/include"
16+
17+
git submodule update --init --recursive
18+
cd src/Passes/
19+
pip3 install --user -r requirements.txt
20+
chmod +x manage
21+
./manage --loglevel info runci
22+

build/set-env.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ $ErrorActionPreference = 'Stop'
55

66
Write-Host "Setting up build environment variables"
77

8+
# Enable the QDK Telemetry Library to throw exceptions
9+
# This is useful to capture unexpected unhandled exceptions as we
10+
# test telemetry-related code
11+
$env:ENABLE_QDK_TELEMETRY_EXCEPTIONS = "1"
12+
813
If ($Env:BUILD_CONFIGURATION -eq $null) { $Env:BUILD_CONFIGURATION ="Debug" }
914
If ($Env:BUILD_VERBOSITY -eq $null) { $Env:BUILD_VERBOSITY ="m" }
1015
If ($Env:ASSEMBLY_VERSION -eq $null) { $Env:ASSEMBLY_VERSION ="0.0.1.0" }

build/steps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
steps:
2+
23
- pwsh: ./build.ps1
34
displayName: "Build all"
45
workingDirectory: $(System.DefaultWorkingDirectory)/build

build/test.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ function Test-One {
3838
}
3939
}
4040

41+
4142
Test-One '../QsCompiler.sln'
43+
Test-One '../src/Telemetry/Telemetry.sln'
4244
Test-One '../QsFmt.sln'
4345

4446
if (-not $all_ok) {

0 commit comments

Comments
 (0)