diff --git a/README.md b/README.md index 2f3c4a10b6b..7554ea9ab78 100644 --- a/README.md +++ b/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 ### diff --git a/Simulation.sln b/Simulation.sln index 352761e1cfa..da0f6964563 100644 --- a/Simulation.sln +++ b/Simulation.sln @@ -85,33 +85,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Quantum.Type3.Cor EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.Microsoft.Quantum.Simulators.Type3", "src\Simulation\Simulators.Type3.Tests\Tests.Microsoft.Quantum.Simulators.Type3.csproj", "{7F80466B-A6B5-4EF1-A9E9-22ABAE3C20C1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A6394A39-9862-4D5C-8FA1-81B61B424EE6}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "qir", "qir", "{C637C9DF-14AA-48CB-95F3-73CE0AC5F9B1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QirRuntime", "QirRuntime", "{223F1FAE-5551-4237-AE8A-73502B007003}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runtime", "runtime", "{4C0C5775-4562-453F-A395-FAD259AE40C0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E9FC86D7-DBE1-44B8-BF7F-61109E1AFE86}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{92FA1569-DA5F-41C5-8CC7-E5CA36419B61}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QIR-static", "QIR-static", "{9BED35A6-3FBF-4A55-8424-C801BEB64D68}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3FFDEA49-C6E8-45BB-BCA5-BBC5378F704F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "qir-gen", "src\QirRuntime\test\QIR-static\qsharp\qir-gen.csproj", "{DC69B7C8-7B25-4C12-878A-DF59722C306E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "qir-standalone-input-reference", "src\Qir\Runtime\samples\StandaloneInputReference\qsharp\qir-standalone-input-reference.csproj", "{C66A582B-B1D8-48AC-AA95-5B25E10B59B3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FullstateSimulator", "FullstateSimulator", "{932E88FC-AB51-449D-937E-BB3050DF37C9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "qir-test-simulator", "src\Qir\Runtime\test\FullstateSimulator\qsharp\qir-test-simulator.csproj", "{8E9D8C26-DBE5-49BE-9D35-3AC95C435072}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "qir-test-simulator", "src\QirRuntime\test\FullstateSimulator\qsharp\qir-test-simulator.csproj", "{D529DE2B-C65B-4B89-82F3-FF712BC832BC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "qir-test-random", "src\Qir\Runtime\test\QIR-dynamic\qsharp\qir-test-random.csproj", "{9DF6FEB7-3111-4244-B4EE-A69C64043967}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QIR-dynamic", "QIR-dynamic", "{E0DE8EF7-A587-4D02-8813-B344365E5CF8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "qir-gen", "src\Qir\Runtime\test\QIR-static\qsharp\qir-gen.csproj", "{241693D7-4AA6-47C9-9F27-78F2A1EE0904}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "qir-test-random", "src\QirRuntime\test\QIR-dynamic\qsharp\qir-test-random.csproj", "{9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QIR-tracer", "QIR-tracer", "{99C04F12-B449-4832-BFD6-FE5E91BAE393}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tracer-qir", "src\QirRuntime\test\QIR-tracer\qsharp\tracer-qir.csproj", "{390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{306E9DC4-15F6-4D98-8846-34EBBBC45CB0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StandaloneInputReference", "StandaloneInputReference", "{700A1D87-D0DE-4621-A6CD-3DC0AA47D492}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "qir-standalone-input-reference", "src\QirRuntime\samples\StandaloneInputReference\qsharp\qir-standalone-input-reference.csproj", "{91DF2E6D-65C1-478E-A276-337A40ADB1FB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tracer-qir", "src\Qir\Runtime\test\QIR-tracer\qsharp\tracer-qir.csproj", "{5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -669,86 +659,86 @@ Global {7F80466B-A6B5-4EF1-A9E9-22ABAE3C20C1}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU {7F80466B-A6B5-4EF1-A9E9-22ABAE3C20C1}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU {7F80466B-A6B5-4EF1-A9E9-22ABAE3C20C1}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.Debug|x64.ActiveCfg = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.Debug|x64.Build.0 = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.Release|Any CPU.Build.0 = Release|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.Release|x64.ActiveCfg = Release|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.Release|x64.Build.0 = Release|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU - {DC69B7C8-7B25-4C12-878A-DF59722C306E}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.Debug|x64.ActiveCfg = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.Debug|x64.Build.0 = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.Release|Any CPU.Build.0 = Release|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.Release|x64.ActiveCfg = Release|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.Release|x64.Build.0 = Release|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU - {D529DE2B-C65B-4B89-82F3-FF712BC832BC}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.Debug|x64.ActiveCfg = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.Debug|x64.Build.0 = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.Release|Any CPU.Build.0 = Release|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.Release|x64.ActiveCfg = Release|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.Release|x64.Build.0 = Release|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.Debug|x64.ActiveCfg = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.Debug|x64.Build.0 = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.Release|Any CPU.Build.0 = Release|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.Release|x64.ActiveCfg = Release|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.Release|x64.Build.0 = Release|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.Debug|x64.ActiveCfg = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.Debug|x64.Build.0 = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.Release|Any CPU.Build.0 = Release|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.Release|x64.ActiveCfg = Release|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.Release|x64.Build.0 = Release|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU - {91DF2E6D-65C1-478E-A276-337A40ADB1FB}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.Debug|x64.ActiveCfg = Debug|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.Debug|x64.Build.0 = Debug|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.Release|Any CPU.Build.0 = Release|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.Release|x64.ActiveCfg = Release|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.Release|x64.Build.0 = Release|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.Debug|x64.ActiveCfg = Debug|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.Debug|x64.Build.0 = Debug|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.Release|Any CPU.Build.0 = Release|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.Release|x64.ActiveCfg = Release|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.Release|x64.Build.0 = Release|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.Debug|x64.ActiveCfg = Debug|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.Debug|x64.Build.0 = Debug|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.Release|Any CPU.Build.0 = Release|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.Release|x64.ActiveCfg = Release|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.Release|x64.Build.0 = Release|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {9DF6FEB7-3111-4244-B4EE-A69C64043967}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.Debug|Any CPU.Build.0 = Debug|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.Debug|x64.ActiveCfg = Debug|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.Debug|x64.Build.0 = Debug|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.Release|Any CPU.ActiveCfg = Release|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.Release|Any CPU.Build.0 = Release|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.Release|x64.ActiveCfg = Release|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.Release|x64.Build.0 = Release|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {241693D7-4AA6-47C9-9F27-78F2A1EE0904}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.Debug|x64.ActiveCfg = Debug|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.Debug|x64.Build.0 = Debug|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.Release|Any CPU.Build.0 = Release|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.Release|x64.ActiveCfg = Release|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.Release|x64.Build.0 = Release|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7}.RelWithDebInfo|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -789,19 +779,14 @@ Global {789C86D9-CE77-40DA-BDDD-979436952512} = {93409CC3-8DF9-45FA-AE21-16A19FDEF650} {7E24885B-D86D-477E-A840-06FA53C33FE1} = {34D419E9-CCF1-4E48-9FA4-3AD4B86BEEB4} {7F80466B-A6B5-4EF1-A9E9-22ABAE3C20C1} = {34D419E9-CCF1-4E48-9FA4-3AD4B86BEEB4} - {223F1FAE-5551-4237-AE8A-73502B007003} = {A6394A39-9862-4D5C-8FA1-81B61B424EE6} - {E9FC86D7-DBE1-44B8-BF7F-61109E1AFE86} = {223F1FAE-5551-4237-AE8A-73502B007003} - {9BED35A6-3FBF-4A55-8424-C801BEB64D68} = {E9FC86D7-DBE1-44B8-BF7F-61109E1AFE86} - {DC69B7C8-7B25-4C12-878A-DF59722C306E} = {9BED35A6-3FBF-4A55-8424-C801BEB64D68} - {932E88FC-AB51-449D-937E-BB3050DF37C9} = {E9FC86D7-DBE1-44B8-BF7F-61109E1AFE86} - {D529DE2B-C65B-4B89-82F3-FF712BC832BC} = {932E88FC-AB51-449D-937E-BB3050DF37C9} - {E0DE8EF7-A587-4D02-8813-B344365E5CF8} = {E9FC86D7-DBE1-44B8-BF7F-61109E1AFE86} - {9FCFB543-A126-41DF-80A3-40A6AFBA4F4F} = {E0DE8EF7-A587-4D02-8813-B344365E5CF8} - {99C04F12-B449-4832-BFD6-FE5E91BAE393} = {E9FC86D7-DBE1-44B8-BF7F-61109E1AFE86} - {390608C0-35C4-4E81-8BF8-91F9EA9C1CDA} = {99C04F12-B449-4832-BFD6-FE5E91BAE393} - {306E9DC4-15F6-4D98-8846-34EBBBC45CB0} = {223F1FAE-5551-4237-AE8A-73502B007003} - {700A1D87-D0DE-4621-A6CD-3DC0AA47D492} = {306E9DC4-15F6-4D98-8846-34EBBBC45CB0} - {91DF2E6D-65C1-478E-A276-337A40ADB1FB} = {700A1D87-D0DE-4621-A6CD-3DC0AA47D492} + {4C0C5775-4562-453F-A395-FAD259AE40C0} = {C637C9DF-14AA-48CB-95F3-73CE0AC5F9B1} + {92FA1569-DA5F-41C5-8CC7-E5CA36419B61} = {4C0C5775-4562-453F-A395-FAD259AE40C0} + {3FFDEA49-C6E8-45BB-BCA5-BBC5378F704F} = {4C0C5775-4562-453F-A395-FAD259AE40C0} + {C66A582B-B1D8-48AC-AA95-5B25E10B59B3} = {92FA1569-DA5F-41C5-8CC7-E5CA36419B61} + {8E9D8C26-DBE5-49BE-9D35-3AC95C435072} = {3FFDEA49-C6E8-45BB-BCA5-BBC5378F704F} + {9DF6FEB7-3111-4244-B4EE-A69C64043967} = {3FFDEA49-C6E8-45BB-BCA5-BBC5378F704F} + {241693D7-4AA6-47C9-9F27-78F2A1EE0904} = {3FFDEA49-C6E8-45BB-BCA5-BBC5378F704F} + {5917D4C5-0CD2-4BD1-A859-19B9B97FF8A7} = {3FFDEA49-C6E8-45BB-BCA5-BBC5378F704F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {929C0464-86D8-4F70-8835-0A5EAF930821} diff --git a/build/build.ps1 b/build/build.ps1 index d1afe280967..4a58b8b2d0d 100644 --- a/build/build.ps1 +++ b/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 diff --git a/build/prerequisites.ps1 b/build/prerequisites.ps1 index 32259ba09ce..c5176286e67 100644 --- a/build/prerequisites.ps1 +++ b/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 diff --git a/build/test.ps1 b/build/test.ps1 index 0de3665976e..b80d5ab936f 100644 --- a/build/test.ps1 +++ b/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 diff --git a/src/QirRuntime/.clang-format b/src/Qir/Runtime/.clang-format similarity index 100% rename from src/QirRuntime/.clang-format rename to src/Qir/Runtime/.clang-format diff --git a/src/QirRuntime/.clang-tidy b/src/Qir/Runtime/.clang-tidy similarity index 100% rename from src/QirRuntime/.clang-tidy rename to src/Qir/Runtime/.clang-tidy diff --git a/src/QirRuntime/.gitignore b/src/Qir/Runtime/.gitignore similarity index 100% rename from src/QirRuntime/.gitignore rename to src/Qir/Runtime/.gitignore diff --git a/src/QirRuntime/CMakeLists.txt b/src/Qir/Runtime/CMakeLists.txt similarity index 100% rename from src/QirRuntime/CMakeLists.txt rename to src/Qir/Runtime/CMakeLists.txt diff --git a/src/QirRuntime/README.md b/src/Qir/Runtime/README.md similarity index 100% rename from src/QirRuntime/README.md rename to src/Qir/Runtime/README.md diff --git a/src/QirRuntime/build-qir-runtime.ps1 b/src/Qir/Runtime/build-qir-runtime.ps1 similarity index 98% rename from src/QirRuntime/build-qir-runtime.ps1 rename to src/Qir/Runtime/build-qir-runtime.ps1 index c9ef084f33b..b65cd80901f 100644 --- a/src/QirRuntime/build-qir-runtime.ps1 +++ b/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 ( diff --git a/src/QirRuntime/cmake/qir_cmake_include.cmake b/src/Qir/Runtime/cmake/qir_cmake_include.cmake similarity index 100% rename from src/QirRuntime/cmake/qir_cmake_include.cmake rename to src/Qir/Runtime/cmake/qir_cmake_include.cmake diff --git a/src/QirRuntime/cmake/unit_test_include.cmake b/src/Qir/Runtime/cmake/unit_test_include.cmake similarity index 88% rename from src/QirRuntime/cmake/unit_test_include.cmake rename to src/Qir/Runtime/cmake/unit_test_include.cmake index b4ac9de981e..483c15c17bd 100644 --- a/src/QirRuntime/cmake/unit_test_include.cmake +++ b/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") diff --git a/src/QirRuntime/externals/CLI11/CLI11.hpp b/src/Qir/Runtime/externals/CLI11/CLI11.hpp similarity index 100% rename from src/QirRuntime/externals/CLI11/CLI11.hpp rename to src/Qir/Runtime/externals/CLI11/CLI11.hpp diff --git a/src/QirRuntime/externals/catch2/catch.hpp b/src/Qir/Runtime/externals/catch2/catch.hpp similarity index 100% rename from src/QirRuntime/externals/catch2/catch.hpp rename to src/Qir/Runtime/externals/catch2/catch.hpp diff --git a/src/QirRuntime/externals/cgmanifest.json b/src/Qir/Runtime/externals/cgmanifest.json similarity index 100% rename from src/QirRuntime/externals/cgmanifest.json rename to src/Qir/Runtime/externals/cgmanifest.json diff --git a/src/QirRuntime/externals/readme.md b/src/Qir/Runtime/externals/readme.md similarity index 100% rename from src/QirRuntime/externals/readme.md rename to src/Qir/Runtime/externals/readme.md diff --git a/src/QirRuntime/lib/CMakeLists.txt b/src/Qir/Runtime/lib/CMakeLists.txt similarity index 100% rename from src/QirRuntime/lib/CMakeLists.txt rename to src/Qir/Runtime/lib/CMakeLists.txt diff --git a/src/QirRuntime/lib/QIR/.clang-tidy b/src/Qir/Runtime/lib/QIR/.clang-tidy similarity index 100% rename from src/QirRuntime/lib/QIR/.clang-tidy rename to src/Qir/Runtime/lib/QIR/.clang-tidy diff --git a/src/QirRuntime/lib/QIR/CMakeLists.txt b/src/Qir/Runtime/lib/QIR/CMakeLists.txt similarity index 100% rename from src/QirRuntime/lib/QIR/CMakeLists.txt rename to src/Qir/Runtime/lib/QIR/CMakeLists.txt diff --git a/src/QirRuntime/lib/QIR/allocationsTracker.cpp b/src/Qir/Runtime/lib/QIR/allocationsTracker.cpp similarity index 100% rename from src/QirRuntime/lib/QIR/allocationsTracker.cpp rename to src/Qir/Runtime/lib/QIR/allocationsTracker.cpp diff --git a/src/QirRuntime/lib/QIR/allocationsTracker.hpp b/src/Qir/Runtime/lib/QIR/allocationsTracker.hpp similarity index 100% rename from src/QirRuntime/lib/QIR/allocationsTracker.hpp rename to src/Qir/Runtime/lib/QIR/allocationsTracker.hpp diff --git a/src/QirRuntime/lib/QIR/arrays.cpp b/src/Qir/Runtime/lib/QIR/arrays.cpp similarity index 100% rename from src/QirRuntime/lib/QIR/arrays.cpp rename to src/Qir/Runtime/lib/QIR/arrays.cpp diff --git a/src/QirRuntime/lib/QIR/bridge-rt.ll b/src/Qir/Runtime/lib/QIR/bridge-rt.ll similarity index 100% rename from src/QirRuntime/lib/QIR/bridge-rt.ll rename to src/Qir/Runtime/lib/QIR/bridge-rt.ll diff --git a/src/QirRuntime/lib/QIR/callables.cpp b/src/Qir/Runtime/lib/QIR/callables.cpp similarity index 100% rename from src/QirRuntime/lib/QIR/callables.cpp rename to src/Qir/Runtime/lib/QIR/callables.cpp diff --git a/src/QirRuntime/lib/QIR/context.cpp b/src/Qir/Runtime/lib/QIR/context.cpp similarity index 100% rename from src/QirRuntime/lib/QIR/context.cpp rename to src/Qir/Runtime/lib/QIR/context.cpp diff --git a/src/QirRuntime/lib/QIR/delegated.cpp b/src/Qir/Runtime/lib/QIR/delegated.cpp similarity index 100% rename from src/QirRuntime/lib/QIR/delegated.cpp rename to src/Qir/Runtime/lib/QIR/delegated.cpp diff --git a/src/QirRuntime/lib/QIR/rtOut.cpp b/src/Qir/Runtime/lib/QIR/rtOut.cpp similarity index 100% rename from src/QirRuntime/lib/QIR/rtOut.cpp rename to src/Qir/Runtime/lib/QIR/rtOut.cpp diff --git a/src/QirRuntime/lib/QIR/strings.cpp b/src/Qir/Runtime/lib/QIR/strings.cpp similarity index 100% rename from src/QirRuntime/lib/QIR/strings.cpp rename to src/Qir/Runtime/lib/QIR/strings.cpp diff --git a/src/QirRuntime/lib/QIR/utils.cpp b/src/Qir/Runtime/lib/QIR/utils.cpp similarity index 100% rename from src/QirRuntime/lib/QIR/utils.cpp rename to src/Qir/Runtime/lib/QIR/utils.cpp diff --git a/src/QirRuntime/lib/QSharpCore/.clang-tidy b/src/Qir/Runtime/lib/QSharpCore/.clang-tidy similarity index 100% rename from src/QirRuntime/lib/QSharpCore/.clang-tidy rename to src/Qir/Runtime/lib/QSharpCore/.clang-tidy diff --git a/src/QirRuntime/lib/QSharpCore/CMakeLists.txt b/src/Qir/Runtime/lib/QSharpCore/CMakeLists.txt similarity index 100% rename from src/QirRuntime/lib/QSharpCore/CMakeLists.txt rename to src/Qir/Runtime/lib/QSharpCore/CMakeLists.txt diff --git a/src/QirRuntime/lib/QSharpCore/intrinsics.cpp b/src/Qir/Runtime/lib/QSharpCore/intrinsics.cpp similarity index 100% rename from src/QirRuntime/lib/QSharpCore/intrinsics.cpp rename to src/Qir/Runtime/lib/QSharpCore/intrinsics.cpp diff --git a/src/QirRuntime/lib/QSharpCore/qsharp-core-qis.ll b/src/Qir/Runtime/lib/QSharpCore/qsharp-core-qis.ll similarity index 100% rename from src/QirRuntime/lib/QSharpCore/qsharp-core-qis.ll rename to src/Qir/Runtime/lib/QSharpCore/qsharp-core-qis.ll diff --git a/src/QirRuntime/lib/QSharpCore/qsharp__core__qis.hpp b/src/Qir/Runtime/lib/QSharpCore/qsharp__core__qis.hpp similarity index 100% rename from src/QirRuntime/lib/QSharpCore/qsharp__core__qis.hpp rename to src/Qir/Runtime/lib/QSharpCore/qsharp__core__qis.hpp diff --git a/src/QirRuntime/lib/QSharpFoundation/CMakeLists.txt b/src/Qir/Runtime/lib/QSharpFoundation/CMakeLists.txt similarity index 100% rename from src/QirRuntime/lib/QSharpFoundation/CMakeLists.txt rename to src/Qir/Runtime/lib/QSharpFoundation/CMakeLists.txt diff --git a/src/QirRuntime/lib/QSharpFoundation/conditionals.cpp b/src/Qir/Runtime/lib/QSharpFoundation/conditionals.cpp similarity index 100% rename from src/QirRuntime/lib/QSharpFoundation/conditionals.cpp rename to src/Qir/Runtime/lib/QSharpFoundation/conditionals.cpp diff --git a/src/QirRuntime/lib/QSharpFoundation/intrinsicsMath.cpp b/src/Qir/Runtime/lib/QSharpFoundation/intrinsicsMath.cpp similarity index 100% rename from src/QirRuntime/lib/QSharpFoundation/intrinsicsMath.cpp rename to src/Qir/Runtime/lib/QSharpFoundation/intrinsicsMath.cpp diff --git a/src/QirRuntime/lib/QSharpFoundation/qsharp-foundation-qis.ll b/src/Qir/Runtime/lib/QSharpFoundation/qsharp-foundation-qis.ll similarity index 100% rename from src/QirRuntime/lib/QSharpFoundation/qsharp-foundation-qis.ll rename to src/Qir/Runtime/lib/QSharpFoundation/qsharp-foundation-qis.ll diff --git a/src/QirRuntime/lib/QSharpFoundation/qsharp__foundation__qis.hpp b/src/Qir/Runtime/lib/QSharpFoundation/qsharp__foundation__qis.hpp similarity index 100% rename from src/QirRuntime/lib/QSharpFoundation/qsharp__foundation__qis.hpp rename to src/Qir/Runtime/lib/QSharpFoundation/qsharp__foundation__qis.hpp diff --git a/src/QirRuntime/lib/QSharpFoundation/qsharp__foundation_internal.hpp b/src/Qir/Runtime/lib/QSharpFoundation/qsharp__foundation_internal.hpp similarity index 100% rename from src/QirRuntime/lib/QSharpFoundation/qsharp__foundation_internal.hpp rename to src/Qir/Runtime/lib/QSharpFoundation/qsharp__foundation_internal.hpp diff --git a/src/QirRuntime/lib/Simulators/CMakeLists.txt b/src/Qir/Runtime/lib/Simulators/CMakeLists.txt similarity index 100% rename from src/QirRuntime/lib/Simulators/CMakeLists.txt rename to src/Qir/Runtime/lib/Simulators/CMakeLists.txt diff --git a/src/QirRuntime/lib/Simulators/FullstateSimulator.cpp b/src/Qir/Runtime/lib/Simulators/FullstateSimulator.cpp similarity index 100% rename from src/QirRuntime/lib/Simulators/FullstateSimulator.cpp rename to src/Qir/Runtime/lib/Simulators/FullstateSimulator.cpp diff --git a/src/QirRuntime/lib/Simulators/ToffoliSimulator.cpp b/src/Qir/Runtime/lib/Simulators/ToffoliSimulator.cpp similarity index 100% rename from src/QirRuntime/lib/Simulators/ToffoliSimulator.cpp rename to src/Qir/Runtime/lib/Simulators/ToffoliSimulator.cpp diff --git a/src/QirRuntime/lib/Simulators/setup.cpp b/src/Qir/Runtime/lib/Simulators/setup.cpp similarity index 100% rename from src/QirRuntime/lib/Simulators/setup.cpp rename to src/Qir/Runtime/lib/Simulators/setup.cpp diff --git a/src/QirRuntime/lib/Tracer/CMakeLists.txt b/src/Qir/Runtime/lib/Tracer/CMakeLists.txt similarity index 100% rename from src/QirRuntime/lib/Tracer/CMakeLists.txt rename to src/Qir/Runtime/lib/Tracer/CMakeLists.txt diff --git a/src/QirRuntime/lib/Tracer/README.md b/src/Qir/Runtime/lib/Tracer/README.md similarity index 100% rename from src/QirRuntime/lib/Tracer/README.md rename to src/Qir/Runtime/lib/Tracer/README.md diff --git a/src/QirRuntime/lib/Tracer/layering_example.png b/src/Qir/Runtime/lib/Tracer/layering_example.png similarity index 100% rename from src/QirRuntime/lib/Tracer/layering_example.png rename to src/Qir/Runtime/lib/Tracer/layering_example.png diff --git a/src/QirRuntime/lib/Tracer/tracer-bridge.ll b/src/Qir/Runtime/lib/Tracer/tracer-bridge.ll similarity index 100% rename from src/QirRuntime/lib/Tracer/tracer-bridge.ll rename to src/Qir/Runtime/lib/Tracer/tracer-bridge.ll diff --git a/src/QirRuntime/lib/Tracer/tracer-qis.cpp b/src/Qir/Runtime/lib/Tracer/tracer-qis.cpp similarity index 100% rename from src/QirRuntime/lib/Tracer/tracer-qis.cpp rename to src/Qir/Runtime/lib/Tracer/tracer-qis.cpp diff --git a/src/QirRuntime/lib/Tracer/tracer.cpp b/src/Qir/Runtime/lib/Tracer/tracer.cpp similarity index 100% rename from src/QirRuntime/lib/Tracer/tracer.cpp rename to src/Qir/Runtime/lib/Tracer/tracer.cpp diff --git a/src/QirRuntime/lib/Tracer/tracer.hpp b/src/Qir/Runtime/lib/Tracer/tracer.hpp similarity index 100% rename from src/QirRuntime/lib/Tracer/tracer.hpp rename to src/Qir/Runtime/lib/Tracer/tracer.hpp diff --git a/src/QirRuntime/prerequisites.ps1 b/src/Qir/Runtime/prerequisites.ps1 similarity index 100% rename from src/QirRuntime/prerequisites.ps1 rename to src/Qir/Runtime/prerequisites.ps1 diff --git a/src/QirRuntime/public/CoreTypes.hpp b/src/Qir/Runtime/public/CoreTypes.hpp similarity index 100% rename from src/QirRuntime/public/CoreTypes.hpp rename to src/Qir/Runtime/public/CoreTypes.hpp diff --git a/src/QirRuntime/public/QSharpSimApi_I.hpp b/src/Qir/Runtime/public/QSharpSimApi_I.hpp similarity index 100% rename from src/QirRuntime/public/QSharpSimApi_I.hpp rename to src/Qir/Runtime/public/QSharpSimApi_I.hpp diff --git a/src/QirRuntime/public/QirContext.hpp b/src/Qir/Runtime/public/QirContext.hpp similarity index 100% rename from src/QirRuntime/public/QirContext.hpp rename to src/Qir/Runtime/public/QirContext.hpp diff --git a/src/QirRuntime/public/QirRuntime.hpp b/src/Qir/Runtime/public/QirRuntime.hpp similarity index 100% rename from src/QirRuntime/public/QirRuntime.hpp rename to src/Qir/Runtime/public/QirRuntime.hpp diff --git a/src/QirRuntime/public/QirRuntimeApi_I.hpp b/src/Qir/Runtime/public/QirRuntimeApi_I.hpp similarity index 100% rename from src/QirRuntime/public/QirRuntimeApi_I.hpp rename to src/Qir/Runtime/public/QirRuntimeApi_I.hpp diff --git a/src/QirRuntime/public/QirTypes.hpp b/src/Qir/Runtime/public/QirTypes.hpp similarity index 100% rename from src/QirRuntime/public/QirTypes.hpp rename to src/Qir/Runtime/public/QirTypes.hpp diff --git a/src/QirRuntime/public/SimFactory.hpp b/src/Qir/Runtime/public/SimFactory.hpp similarity index 100% rename from src/QirRuntime/public/SimFactory.hpp rename to src/Qir/Runtime/public/SimFactory.hpp diff --git a/src/QirRuntime/public/TracerTypes.hpp b/src/Qir/Runtime/public/TracerTypes.hpp similarity index 100% rename from src/QirRuntime/public/TracerTypes.hpp rename to src/Qir/Runtime/public/TracerTypes.hpp diff --git a/src/QirRuntime/qir.png b/src/Qir/Runtime/qir.png similarity index 100% rename from src/QirRuntime/qir.png rename to src/Qir/Runtime/qir.png diff --git a/src/QirRuntime/samples/CMakeLists.txt b/src/Qir/Runtime/samples/CMakeLists.txt similarity index 100% rename from src/QirRuntime/samples/CMakeLists.txt rename to src/Qir/Runtime/samples/CMakeLists.txt diff --git a/src/QirRuntime/samples/StandaloneInputReference/.clang-tidy b/src/Qir/Runtime/samples/StandaloneInputReference/.clang-tidy similarity index 100% rename from src/QirRuntime/samples/StandaloneInputReference/.clang-tidy rename to src/Qir/Runtime/samples/StandaloneInputReference/.clang-tidy diff --git a/src/QirRuntime/samples/StandaloneInputReference/CMakeLists.txt b/src/Qir/Runtime/samples/StandaloneInputReference/CMakeLists.txt similarity index 95% rename from src/QirRuntime/samples/StandaloneInputReference/CMakeLists.txt rename to src/Qir/Runtime/samples/StandaloneInputReference/CMakeLists.txt index 4d1dd20a3bf..293d1fb433f 100644 --- a/src/QirRuntime/samples/StandaloneInputReference/CMakeLists.txt +++ b/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") diff --git a/src/QirRuntime/samples/StandaloneInputReference/qir-driver.cpp b/src/Qir/Runtime/samples/StandaloneInputReference/qir-driver.cpp similarity index 100% rename from src/QirRuntime/samples/StandaloneInputReference/qir-driver.cpp rename to src/Qir/Runtime/samples/StandaloneInputReference/qir-driver.cpp diff --git a/src/QirRuntime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj b/src/Qir/Runtime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj similarity index 70% rename from src/QirRuntime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj rename to src/Qir/Runtime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj index cb77ce14d52..d016002f5fd 100644 --- a/src/QirRuntime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj +++ b/src/Qir/Runtime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/QirRuntime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.qs b/src/Qir/Runtime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.qs similarity index 100% rename from src/QirRuntime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.qs rename to src/Qir/Runtime/samples/StandaloneInputReference/qsharp/qir-standalone-input-reference.qs diff --git a/src/QirRuntime/samples/StandaloneInputReference/readme.md b/src/Qir/Runtime/samples/StandaloneInputReference/readme.md similarity index 100% rename from src/QirRuntime/samples/StandaloneInputReference/readme.md rename to src/Qir/Runtime/samples/StandaloneInputReference/readme.md diff --git a/src/QirRuntime/test-qir-runtime.ps1 b/src/Qir/Runtime/test-qir-runtime.ps1 similarity index 93% rename from src/QirRuntime/test-qir-runtime.ps1 rename to src/Qir/Runtime/test-qir-runtime.ps1 index 5a96cbb7843..bddb09b4230 100644 --- a/src/QirRuntime/test-qir-runtime.ps1 +++ b/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" diff --git a/src/QirRuntime/test/CMakeLists.txt b/src/Qir/Runtime/test/CMakeLists.txt similarity index 100% rename from src/QirRuntime/test/CMakeLists.txt rename to src/Qir/Runtime/test/CMakeLists.txt diff --git a/src/QirRuntime/test/FullstateSimulator/CMakeLists.txt b/src/Qir/Runtime/test/FullstateSimulator/CMakeLists.txt similarity index 100% rename from src/QirRuntime/test/FullstateSimulator/CMakeLists.txt rename to src/Qir/Runtime/test/FullstateSimulator/CMakeLists.txt diff --git a/src/QirRuntime/test/FullstateSimulator/FullstateSimulatorTests.cpp b/src/Qir/Runtime/test/FullstateSimulator/FullstateSimulatorTests.cpp similarity index 100% rename from src/QirRuntime/test/FullstateSimulator/FullstateSimulatorTests.cpp rename to src/Qir/Runtime/test/FullstateSimulator/FullstateSimulatorTests.cpp diff --git a/src/QirRuntime/test/FullstateSimulator/qsharp/qir-test-simulator.csproj b/src/Qir/Runtime/test/FullstateSimulator/qsharp/qir-test-simulator.csproj similarity index 75% rename from src/QirRuntime/test/FullstateSimulator/qsharp/qir-test-simulator.csproj rename to src/Qir/Runtime/test/FullstateSimulator/qsharp/qir-test-simulator.csproj index 7e736af46ba..c5081e012d5 100644 --- a/src/QirRuntime/test/FullstateSimulator/qsharp/qir-test-simulator.csproj +++ b/src/Qir/Runtime/test/FullstateSimulator/qsharp/qir-test-simulator.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/QirRuntime/test/FullstateSimulator/qsharp/qir-test-simulator.qs b/src/Qir/Runtime/test/FullstateSimulator/qsharp/qir-test-simulator.qs similarity index 100% rename from src/QirRuntime/test/FullstateSimulator/qsharp/qir-test-simulator.qs rename to src/Qir/Runtime/test/FullstateSimulator/qsharp/qir-test-simulator.qs diff --git a/src/QirRuntime/test/QIR-dynamic/CMakeLists.txt b/src/Qir/Runtime/test/QIR-dynamic/CMakeLists.txt similarity index 100% rename from src/QirRuntime/test/QIR-dynamic/CMakeLists.txt rename to src/Qir/Runtime/test/QIR-dynamic/CMakeLists.txt diff --git a/src/QirRuntime/test/QIR-dynamic/qir-driver.cpp b/src/Qir/Runtime/test/QIR-dynamic/qir-driver.cpp similarity index 100% rename from src/QirRuntime/test/QIR-dynamic/qir-driver.cpp rename to src/Qir/Runtime/test/QIR-dynamic/qir-driver.cpp diff --git a/src/QirRuntime/test/QIR-dynamic/qsharp/qir-test-random.csproj b/src/Qir/Runtime/test/QIR-dynamic/qsharp/qir-test-random.csproj similarity index 75% rename from src/QirRuntime/test/QIR-dynamic/qsharp/qir-test-random.csproj rename to src/Qir/Runtime/test/QIR-dynamic/qsharp/qir-test-random.csproj index 7e736af46ba..c5081e012d5 100644 --- a/src/QirRuntime/test/QIR-dynamic/qsharp/qir-test-random.csproj +++ b/src/Qir/Runtime/test/QIR-dynamic/qsharp/qir-test-random.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/QirRuntime/test/QIR-dynamic/qsharp/qir-test-random.qs b/src/Qir/Runtime/test/QIR-dynamic/qsharp/qir-test-random.qs similarity index 100% rename from src/QirRuntime/test/QIR-dynamic/qsharp/qir-test-random.qs rename to src/Qir/Runtime/test/QIR-dynamic/qsharp/qir-test-random.qs diff --git a/src/QirRuntime/test/QIR-static/CMakeLists.txt b/src/Qir/Runtime/test/QIR-static/CMakeLists.txt similarity index 100% rename from src/QirRuntime/test/QIR-static/CMakeLists.txt rename to src/Qir/Runtime/test/QIR-static/CMakeLists.txt diff --git a/src/QirRuntime/test/QIR-static/qir-driver.cpp b/src/Qir/Runtime/test/QIR-static/qir-driver.cpp similarity index 100% rename from src/QirRuntime/test/QIR-static/qir-driver.cpp rename to src/Qir/Runtime/test/QIR-static/qir-driver.cpp diff --git a/src/QirRuntime/test/QIR-static/qir-test-conditionals.cpp b/src/Qir/Runtime/test/QIR-static/qir-test-conditionals.cpp similarity index 100% rename from src/QirRuntime/test/QIR-static/qir-test-conditionals.cpp rename to src/Qir/Runtime/test/QIR-static/qir-test-conditionals.cpp diff --git a/src/QirRuntime/test/QIR-static/qir-test-math.cpp b/src/Qir/Runtime/test/QIR-static/qir-test-math.cpp similarity index 100% rename from src/QirRuntime/test/QIR-static/qir-test-math.cpp rename to src/Qir/Runtime/test/QIR-static/qir-test-math.cpp diff --git a/src/QirRuntime/test/QIR-static/qir-test-noqsharp.ll b/src/Qir/Runtime/test/QIR-static/qir-test-noqsharp.ll similarity index 100% rename from src/QirRuntime/test/QIR-static/qir-test-noqsharp.ll rename to src/Qir/Runtime/test/QIR-static/qir-test-noqsharp.ll diff --git a/src/QirRuntime/test/QIR-static/qir-test-other.cpp b/src/Qir/Runtime/test/QIR-static/qir-test-other.cpp similarity index 100% rename from src/QirRuntime/test/QIR-static/qir-test-other.cpp rename to src/Qir/Runtime/test/QIR-static/qir-test-other.cpp diff --git a/src/QirRuntime/test/QIR-static/qir-test-ouput.cpp b/src/Qir/Runtime/test/QIR-static/qir-test-ouput.cpp similarity index 100% rename from src/QirRuntime/test/QIR-static/qir-test-ouput.cpp rename to src/Qir/Runtime/test/QIR-static/qir-test-ouput.cpp diff --git a/src/QirRuntime/test/QIR-static/qir-test-strings.cpp b/src/Qir/Runtime/test/QIR-static/qir-test-strings.cpp similarity index 100% rename from src/QirRuntime/test/QIR-static/qir-test-strings.cpp rename to src/Qir/Runtime/test/QIR-static/qir-test-strings.cpp diff --git a/src/QirRuntime/test/QIR-static/qsharp/Math.qs b/src/Qir/Runtime/test/QIR-static/qsharp/Math.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/Math.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/Math.qs diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-gen.csproj b/src/Qir/Runtime/test/QIR-static/qsharp/qir-gen.csproj similarity index 72% rename from src/QirRuntime/test/QIR-static/qsharp/qir-gen.csproj rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-gen.csproj index 66b17c8a08d..8c5dd882d26 100644 --- a/src/QirRuntime/test/QIR-static/qsharp/qir-gen.csproj +++ b/src/Qir/Runtime/test/QIR-static/qsharp/qir-gen.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-test-arrays.qs b/src/Qir/Runtime/test/QIR-static/qsharp/qir-test-arrays.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/qir-test-arrays.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-test-arrays.qs diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-test-conditionals.qs b/src/Qir/Runtime/test/QIR-static/qsharp/qir-test-conditionals.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/qir-test-conditionals.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-test-conditionals.qs diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-test-functors.qs b/src/Qir/Runtime/test/QIR-static/qsharp/qir-test-functors.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/qir-test-functors.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-test-functors.qs diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-test-math.qs b/src/Qir/Runtime/test/QIR-static/qsharp/qir-test-math.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/qir-test-math.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-test-math.qs diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-test-other.qs b/src/Qir/Runtime/test/QIR-static/qsharp/qir-test-other.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/qir-test-other.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-test-other.qs diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-test-output.qs b/src/Qir/Runtime/test/QIR-static/qsharp/qir-test-output.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/qir-test-output.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-test-output.qs diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-test-partials.qs b/src/Qir/Runtime/test/QIR-static/qsharp/qir-test-partials.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/qir-test-partials.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-test-partials.qs diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-test-qubits-results.qs b/src/Qir/Runtime/test/QIR-static/qsharp/qir-test-qubits-results.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/qir-test-qubits-results.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-test-qubits-results.qs diff --git a/src/QirRuntime/test/QIR-static/qsharp/qir-test-strings.qs b/src/Qir/Runtime/test/QIR-static/qsharp/qir-test-strings.qs similarity index 100% rename from src/QirRuntime/test/QIR-static/qsharp/qir-test-strings.qs rename to src/Qir/Runtime/test/QIR-static/qsharp/qir-test-strings.qs diff --git a/src/QirRuntime/test/QIR-tracer/CMakeLists.txt b/src/Qir/Runtime/test/QIR-tracer/CMakeLists.txt similarity index 100% rename from src/QirRuntime/test/QIR-tracer/CMakeLists.txt rename to src/Qir/Runtime/test/QIR-tracer/CMakeLists.txt diff --git a/src/QirRuntime/test/QIR-tracer/generate.py b/src/Qir/Runtime/test/QIR-tracer/generate.py similarity index 100% rename from src/QirRuntime/test/QIR-tracer/generate.py rename to src/Qir/Runtime/test/QIR-tracer/generate.py diff --git a/src/QirRuntime/test/QIR-tracer/qir-tracer-driver.cpp b/src/Qir/Runtime/test/QIR-tracer/qir-tracer-driver.cpp similarity index 100% rename from src/QirRuntime/test/QIR-tracer/qir-tracer-driver.cpp rename to src/Qir/Runtime/test/QIR-tracer/qir-tracer-driver.cpp diff --git a/src/QirRuntime/test/QIR-tracer/qsharp/tracer-conditionals.qs b/src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-conditionals.qs similarity index 100% rename from src/QirRuntime/test/QIR-tracer/qsharp/tracer-conditionals.qs rename to src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-conditionals.qs diff --git a/src/QirRuntime/test/QIR-tracer/qsharp/tracer-core.qs b/src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-core.qs similarity index 100% rename from src/QirRuntime/test/QIR-tracer/qsharp/tracer-core.qs rename to src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-core.qs diff --git a/src/QirRuntime/test/QIR-tracer/qsharp/tracer-intrinsics.qs b/src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-intrinsics.qs similarity index 100% rename from src/QirRuntime/test/QIR-tracer/qsharp/tracer-intrinsics.qs rename to src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-intrinsics.qs diff --git a/src/QirRuntime/test/QIR-tracer/qsharp/tracer-qir.csproj b/src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-qir.csproj similarity index 100% rename from src/QirRuntime/test/QIR-tracer/qsharp/tracer-qir.csproj rename to src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-qir.csproj diff --git a/src/QirRuntime/test/QIR-tracer/qsharp/tracer-target.qs b/src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-target.qs similarity index 100% rename from src/QirRuntime/test/QIR-tracer/qsharp/tracer-target.qs rename to src/Qir/Runtime/test/QIR-tracer/qsharp/tracer-target.qs diff --git a/src/QirRuntime/test/QIR-tracer/tracer-config.cpp b/src/Qir/Runtime/test/QIR-tracer/tracer-config.cpp similarity index 100% rename from src/QirRuntime/test/QIR-tracer/tracer-config.cpp rename to src/Qir/Runtime/test/QIR-tracer/tracer-config.cpp diff --git a/src/QirRuntime/test/QIR-tracer/tracer-config.hpp b/src/Qir/Runtime/test/QIR-tracer/tracer-config.hpp similarity index 100% rename from src/QirRuntime/test/QIR-tracer/tracer-config.hpp rename to src/Qir/Runtime/test/QIR-tracer/tracer-config.hpp diff --git a/src/QirRuntime/test/SimulatorStub.hpp b/src/Qir/Runtime/test/SimulatorStub.hpp similarity index 100% rename from src/QirRuntime/test/SimulatorStub.hpp rename to src/Qir/Runtime/test/SimulatorStub.hpp diff --git a/src/QirRuntime/test/unittests/CMakeLists.txt b/src/Qir/Runtime/test/unittests/CMakeLists.txt similarity index 100% rename from src/QirRuntime/test/unittests/CMakeLists.txt rename to src/Qir/Runtime/test/unittests/CMakeLists.txt diff --git a/src/QirRuntime/test/unittests/QirRuntimeTests.cpp b/src/Qir/Runtime/test/unittests/QirRuntimeTests.cpp similarity index 100% rename from src/QirRuntime/test/unittests/QirRuntimeTests.cpp rename to src/Qir/Runtime/test/unittests/QirRuntimeTests.cpp diff --git a/src/QirRuntime/test/unittests/ToffoliTests.cpp b/src/Qir/Runtime/test/unittests/ToffoliTests.cpp similarity index 100% rename from src/QirRuntime/test/unittests/ToffoliTests.cpp rename to src/Qir/Runtime/test/unittests/ToffoliTests.cpp diff --git a/src/QirRuntime/test/unittests/TracerTests.cpp b/src/Qir/Runtime/test/unittests/TracerTests.cpp similarity index 100% rename from src/QirRuntime/test/unittests/TracerTests.cpp rename to src/Qir/Runtime/test/unittests/TracerTests.cpp diff --git a/src/QirRuntime/test/unittests/driver.cpp b/src/Qir/Runtime/test/unittests/driver.cpp similarity index 100% rename from src/QirRuntime/test/unittests/driver.cpp rename to src/Qir/Runtime/test/unittests/driver.cpp