Change to QIR folder in preparation for QIR controller project

README.md

@@ -28,7 +28,7 @@ You may also visit our [Quantum](https://github.com/microsoft/quantum) repositor
 
 Note that when building from source, this repository is configured so that .NET Core will automatically look at the [Quantum Development Kit prerelease feed](https://dev.azure.com/ms-quantum-public/Microsoft%20Quantum%20(public)/_packaging?_a=feed&feed=alpha) in addition to any other feeds you may have configured.
 
-Building **QIR Runtime** isn't enabled by default yet. Please see [its readme](./src/QirRuntime/README.md) for details.
+Building **QIR Runtime** isn't enabled by default yet. Please see [its readme](./src/Qir/Runtime/README.md) for details.
 
 ### Windows ###
 

build/build.ps1

@@ -46,7 +46,7 @@ Build-One 'publish' '../src/Simulation/CSharpGeneration.App'
 Build-One 'build' '../Simulation.sln'
 
 if ($Env:ENABLE_QIRRUNTIME -ne "false") {
-    $qirRuntime = (Join-Path $PSScriptRoot "../src/QirRuntime")
+    $qirRuntime = (Join-Path $PSScriptRoot "../src/Qir/Runtime")
     & "$qirRuntime/build-qir-runtime.ps1"
     if ($LastExitCode -ne 0) {
         $script:all_ok = $False

build/prerequisites.ps1

@@ -21,6 +21,6 @@ if ($Env:ENABLE_NATIVE -ne "false") {
     Write-Host "Skipping installing prerequisites for native simulator because ENABLE_NATIVE variable set to: $Env:ENABLE_NATIVE"
 }
 
-Push-Location (Join-Path $PSScriptRoot "../src/QirRuntime")
+Push-Location (Join-Path $PSScriptRoot "../src/Qir/Runtime")
     .\prerequisites.ps1
 Pop-Location

build/test.ps1

@@ -38,7 +38,7 @@ function Test-One {
 Test-One '../Simulation.sln'
 
 if ($Env:ENABLE_QIRRUNTIME -ne "false") {
-    $qirRuntime = (Join-Path $PSScriptRoot "../src/QirRuntime")
+    $qirRuntime = (Join-Path $PSScriptRoot "../src/Qir/Runtime")
     & "$qirRuntime/test-qir-runtime.ps1"
     if ($LastExitCode -ne 0) {
         $script:all_ok = $False

src/QirRuntime/build-qir-runtime.ps1 → src/Qir/Runtime/build-qir-runtime.ps1

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-& (Join-Path $PSScriptRoot .. .. build set-env.ps1)
+& (Join-Path $PSScriptRoot .. .. .. build set-env.ps1)
 
 function Build-QirProject {
     param (

src/QirRuntime/cmake/unit_test_include.cmake → src/Qir/Runtime/cmake/unit_test_include.cmake

@@ -11,7 +11,7 @@ macro(add_unit_test target)
     if(DEFINED ENV{NATIVE_SIMULATOR})
         set(TEST_DEPS1 $ENV{NATIVE_SIMULATOR})
     else()
-        set(TEST_DEPS1 "${PROJECT_SOURCE_DIR}/../Simulation/native/build/${CMAKE_BUILD_TYPE}")
+        set(TEST_DEPS1 "${PROJECT_SOURCE_DIR}/../../Simulation/native/build/${CMAKE_BUILD_TYPE}")
     endif()
 
     set(TEST_DEPS2 "${CMAKE_BINARY_DIR}/bin")

src/QirRuntime/samples/StandaloneInputReference/CMakeLists.txt → src/Qir/Runtime/samples/StandaloneInputReference/CMakeLists.txt

@@ -39,7 +39,7 @@ add_test(
 if(DEFINED ENV{NATIVE_SIMULATOR})
     set(TEST_DEPS1 $ENV{NATIVE_SIMULATOR})
 else()
-    set(TEST_DEPS1 "${PROJECT_SOURCE_DIR}/../Simulation/native/build/${CMAKE_BUILD_TYPE}")
+    set(TEST_DEPS1 "${PROJECT_SOURCE_DIR}/../../Simulation/native/build/${CMAKE_BUILD_TYPE}")
 endif()
 
 set(TEST_DEPS2 "${CMAKE_BINARY_DIR}/bin")

src/QirRuntime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj → src/Qir/Runtime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Simulation\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" /> 
+    <ProjectReference Include="..\..\..\..\..\Simulation\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" /> 
   </ItemGroup>
 
 </Project>

src/QirRuntime/test-qir-runtime.ps1 → src/Qir/Runtime/test-qir-runtime.ps1

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-& (Join-Path $PSScriptRoot .. .. build set-env.ps1)
+& (Join-Path $PSScriptRoot .. .. .. build set-env.ps1)
 $all_ok = $true
 
 Write-Host "##[info]Test QIR Runtime"

src/QirRuntime/test/FullstateSimulator/qsharp/qir-test-simulator.csproj → src/Qir/Runtime/test/FullstateSimulator/qsharp/qir-test-simulator.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Simulation\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" /> 
+    <ProjectReference Include="..\..\..\..\..\Simulation\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" /> 
   </ItemGroup>
 
 </Project>

src/QirRuntime/test/QIR-dynamic/qsharp/qir-test-random.csproj → src/Qir/Runtime/test/QIR-dynamic/qsharp/qir-test-random.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Simulation\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" /> 
+    <ProjectReference Include="..\..\..\..\..\Simulation\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" /> 
   </ItemGroup>
 
 </Project>

src/QirRuntime/test/QIR-static/qsharp/qir-gen.csproj → src/Qir/Runtime/test/QIR-static/qsharp/qir-gen.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Simulation\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" /> 
+    <ProjectReference Include="..\..\..\..\..\Simulation\QSharpCore\Microsoft.Quantum.QSharp.Core.csproj" /> 
   </ItemGroup>
 
 </Project>