Merge pull request #979 from microsoft/main

Catch continuous-time rotation feature up to main.

Author: Cassandra Granade

.devcontainer/Dockerfile

@@ -4,21 +4,11 @@ FROM mcr.microsoft.com/vscode/devcontainers/universal:1-linux
 
 USER root
 
-RUN apt update \
-    && apt-get install -y --no-install-recommends \
-    ninja-build \
-    clang-11 \
-    clang-tidy-11 \
-    build-essential \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/
-
 # Install CMake 3.20 (required since apt-get uses 3.16 and repo requires 3.20)
 RUN curl -SsL https://github.com/Kitware/CMake/releases/download/v3.20.5/cmake-3.20.5-linux-x86_64.sh -o cmakeinstall.sh \
     && echo "f582e02696ceee81818dc3378531804b2213ed41c2a8bc566253d16d894cefab cmakeinstall.sh" | sha256sum -c --strict - \
     && chmod +x cmakeinstall.sh \
     && ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir \
     && rm cmakeinstall.sh
 
-   
 USER codespace

.gitignore

@@ -232,7 +232,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -328,7 +328,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -337,7 +337,7 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/
 
 /src/Simulation/Simulators.Tests/TestProjects/QSharpExe/built
@@ -357,6 +357,13 @@ xplat
 src/Simulation/Native/win10/Microsoft.Quantum.Simulator.Runtime.dll
 src/Simulation/Native/linux/libMicrosoft.Quantum.Simulator.Runtime.so
 src/Simulation/Native/osx/libMicrosoft.Quantum.Simulator.Runtime.dylib
+src/Simulation/Native/win10/Microsoft.Quantum.SparseSimulator.Runtime.dll
+src/Simulation/Native/linux/libMicrosoft.Quantum.SparseSimulator.Runtime.so
+src/Simulation/Native/osx/libMicrosoft.Quantum.SparseSimulator.Runtime.dylib
 src/Simulation/Native/win10/Microsoft.Quantum.Experimental.Simulators.Runtime.dll
 src/Simulation/Native/linux/Microsoft.Quantum.Experimental.Simulators.Runtime.dll
 src/Simulation/Native/osx/Microsoft.Quantum.Experimental.Simulators.Runtime.dll
+
+# Temporary Rust files/dirs. 
+Cargo.lock
+target/

AdvantageBenchmark/privateBuild/host.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IncludeQSharpCorePackages>false</IncludeQSharpCorePackages> <!-- otherwise the standard library is included by the Sdk -->
   </PropertyGroup>
 

AdvantageBenchmark/privateBuild/runTest.ps1

@@ -3,7 +3,7 @@ for ($tst=1; $tst -le 2; $tst++) {
         for ($span=4; $span -ge 0; $span--) {
             $env:OMP_NUM_THREADS = $thrd
             $env:QDK_SIM_FUSESPAN = $span
-            .\bin\Release\netcoreapp3.1\host.exe $tst $tst 5
+            .\bin\Release\net6.0\host.exe $tst $tst 5
         }
     }
 }

AdvantageBenchmark/privateBuild/runTest.sh

@@ -8,7 +8,7 @@ do
         do
             export OMP_NUM_THREADS=$thrd
             export QDK_SIM_FUSESPAN=$span
-            ./bin/Release/netcoreapp3.1/host $tst $tst 5
+            ./bin/Release/net6.0/host $tst $tst 5
         done
     done
 done

AdvantageBenchmark/readme.md

@@ -6,7 +6,7 @@ This benchmark is intended to provide an easy way to verify the performance char
 
 ## Executing the benchmark
 
-To execute the benchmark, compile each version of advantage.sln using `dotnet build .\advantage.sln -c Release` from their respective folders. Then the executable to run will be either `bin\Release\netcoreapp3.1\host.exe` in the privateBuild folder or `host\bin\Release\netcoreapp3.1\host.exe` in the releaseBuild folder. This executable takes parameters describing which test circuits to execute and how many loops to perform as integer arguments, such that `host.exe 1 1 5` will run 5 loops of test 1 and `host.exe 0 3 100` will run 100 loops of tests 0 through 3. Check the contents of `privateBuild\Program.cs` to see the tests that correspond to each identifier; for most machines, test 1 aka advantage 4x4 circuit is the best choice for benchmarking.
+To execute the benchmark, compile each version of advantage.sln using `dotnet build .\advantage.sln -c Release` from their respective folders. Then the executable to run will be either `bin\Release\net6.0\host.exe` in the privateBuild folder or `host\bin\Release\net6.0\host.exe` in the releaseBuild folder. This executable takes parameters describing which test circuits to execute and how many loops to perform as integer arguments, such that `host.exe 1 1 5` will run 5 loops of test 1 and `host.exe 0 3 100` will run 100 loops of tests 0 through 3. Check the contents of `privateBuild\Program.cs` to see the tests that correspond to each identifier; for most machines, test 1 aka advantage 4x4 circuit is the best choice for benchmarking.
 
 The benchmark can also be run via runTest.ps1 or runTest.sh, which performs a sweep across configured environment variables that adjust the number of threads used and gates fused in simulating the circuit. See the definition of the script used on your platform to understand how it configures the `OMP_NUM_THREADS` and `QDK_SIM_FUSESPAN` environment variables.
 

AdvantageBenchmark/releasedBuild/host/host.csproj

@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

Simulation.sln

@@ -855,7 +855,7 @@ Global
 		{EB6E3DBD-C884-4241-9BC4-8281191D1F53} = {34D419E9-CCF1-4E48-9FA4-3AD4B86BEEB4}
 		{E1A463D7-2E23-4134-BE04-1EFF7A546813} = {93409CC3-8DF9-45FA-AE21-16A19FDEF650}
 		{789C86D9-CE77-40DA-BDDD-979436952512} = {93409CC3-8DF9-45FA-AE21-16A19FDEF650}
-		{7E24885B-D86D-477E-A840-06FA53C33FE1} = {34D419E9-CCF1-4E48-9FA4-3AD4B86BEEB4}
+		{7E24885B-D86D-477E-A840-06FA53C33FE1} = {93409CC3-8DF9-45FA-AE21-16A19FDEF650}
 		{7F80466B-A6B5-4EF1-A9E9-22ABAE3C20C1} = {34D419E9-CCF1-4E48-9FA4-3AD4B86BEEB4}
 		{7F7BB60A-5DCB-469E-8546-1BE9E3CAC833} = {F6C2D4C0-12DC-40E3-9C86-FA5308D9B567}
 		{EAC5EAE7-D1B3-4726-AFDB-73000E62176A} = {7F7BB60A-5DCB-469E-8546-1BE9E3CAC833}

bootstrap.ps1

@@ -7,25 +7,22 @@ Push-Location (Join-Path $PSScriptRoot "build")
     .\prerequisites.ps1
 Pop-Location
 
+cargo install cargo-edit
 Push-Location (Join-Path $PSScriptRoot "./src/Simulation/qdk_sim_rs")
-    # We use dotnet-script to inject the version number into Cargo.toml,
-    # so we go on ahead here and restore any missing tools.
-    # Since that Cargo.toml is referenced by CMake lists in the QIR
-    # runtime, this injection has to be the first thing we do.
-    dotnet tool restore
-    dotnet script inject-version.csx -- `
-        --template Cargo.toml.template `
-        --out-path Cargo.toml `
-        --version $Env:NUGET_VERSION;
+    cargo set-version $Env:NUGET_VERSION;
 Pop-Location
 
 if (-not (Test-Path Env:/AGENT_OS)) {                                    # If not CI build, i.e. local build (if AGENT_OS envvar is not defined)
     if ($Env:ENABLE_NATIVE -ne "false") {
-        Write-Host "Build release flavor of the native simulator"
         $Env:BUILD_CONFIGURATION = "Release"
+        Write-Host "Build release flavor of the full state simulator"
         Push-Location (Join-Path $PSScriptRoot "src/Simulation/Native")
             .\build-native-simulator.ps1
         Pop-Location
+
+        Write-Host "Build release flavor of the Sparse Simulator"
+        Invoke-Expression (Join-Path $PSScriptRoot "src" "Simulation" "NativeSparseSimulator" "build.ps1")
+
         Push-Location (Join-Path $PSScriptRoot "src/Simulation/qdk_sim_rs")
             # Don't run the experimental simulator build if we're local
             # and prerequisites are missing.

build/build.ps1

@@ -22,6 +22,8 @@ if ($Env:ENABLE_NATIVE -ne "false") {
     if ($LastExitCode -ne 0) {
         $script:all_ok = $False
     }
+
+    ( & (Join-Path $PSScriptRoot .. src Simulation NativeSparseSimulator build.ps1) ) || ( $script:all_ok = $False )
 } else {
     Write-Host "Skipping build of native simulator because ENABLE_NATIVE variable is set to: $Env:ENABLE_NATIVE."
 }