From c2319c64fde53812409f5f22d9ed829ae68930f0 Mon Sep 17 00:00:00 2001 From: burgholzer Date: Wed, 14 Aug 2024 13:34:31 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20update=20mqt-core=20to?= =?UTF-8?q?=20its=20latest=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: burgholzer --- cmake/ExternalDependencies.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/ExternalDependencies.cmake b/cmake/ExternalDependencies.cmake index 9d608a64e..418273717 100644 --- a/cmake/ExternalDependencies.cmake +++ b/cmake/ExternalDependencies.cmake @@ -27,9 +27,9 @@ if(BUILD_MQT_QMAP_BINDINGS) endif() # cmake-format: off -set(MQT_CORE_VERSION 2.6.0 +set(MQT_CORE_VERSION 2.6.1 CACHE STRING "MQT Core version") -set(MQT_CORE_REV "2a7a92951fb67d0c4e795afbd17449063aa42d20" +set(MQT_CORE_REV "89f18fb322ff2ce86e33558e3a2b42a08e655174" CACHE STRING "MQT Core identifier (tag, branch or commit hash)") set(MQT_CORE_REPO_OWNER "cda-tum" CACHE STRING "MQT Core repository owner (change when using a fork)") From 07b34d7374f0dc081476b6f06a8894a0834e45a6 Mon Sep 17 00:00:00 2001 From: burgholzer Date: Wed, 14 Aug 2024 14:01:57 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=91=BD=20adjust=20to=20mqt-core=20cha?= =?UTF-8?q?nges?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: burgholzer --- include/Architecture.hpp | 2 +- include/DataLogger.hpp | 4 ++-- include/Mapper.hpp | 4 ++-- include/cliffordsynthesis/CliffordSynthesizer.hpp | 2 +- include/cliffordsynthesis/Results.hpp | 4 ++-- include/cliffordsynthesis/Tableau.hpp | 4 ++-- include/cliffordsynthesis/encoding/GateEncoder.hpp | 4 ++-- .../cliffordsynthesis/encoding/ObjectiveEncoder.hpp | 2 +- include/cliffordsynthesis/encoding/TableauEncoder.hpp | 2 +- include/hybridmap/HardwareQubits.hpp | 4 ++-- include/hybridmap/HybridAnimation.hpp | 2 +- include/hybridmap/HybridNeutralAtomMapper.hpp | 4 ++-- include/hybridmap/Mapping.hpp | 4 ++-- include/hybridmap/MoveToAodConverter.hpp | 6 +++--- include/hybridmap/NeutralAtomArchitecture.hpp | 4 ++-- include/hybridmap/NeutralAtomScheduler.hpp | 2 +- include/hybridmap/NeutralAtomUtils.hpp | 2 +- include/na/NAMapper.hpp | 4 ++-- include/utils.hpp | 2 +- src/CMakeLists.txt | 6 ++++-- src/DataLogger.cpp | 4 ++-- src/Mapper.cpp | 6 +++--- src/cliffordsynthesis/CliffordSynthesizer.cpp | 8 ++++---- src/cliffordsynthesis/Tableau.cpp | 8 ++++---- src/cliffordsynthesis/encoding/GateEncoder.cpp | 6 +++--- src/cliffordsynthesis/encoding/MultiGateEncoder.cpp | 2 +- src/cliffordsynthesis/encoding/ObjectiveEncoder.cpp | 2 +- src/cliffordsynthesis/encoding/SingleGateEncoder.cpp | 2 +- src/cliffordsynthesis/encoding/TableauEncoder.cpp | 2 +- src/exact/ExactMapper.cpp | 2 +- src/heuristic/HeuristicMapper.cpp | 6 +++--- src/hybridmap/HybridAnimation.cpp | 4 ++-- src/hybridmap/HybridNeutralAtomMapper.cpp | 8 ++++---- src/hybridmap/MoveToAodConverter.cpp | 6 +++--- src/hybridmap/NeutralAtomArchitecture.cpp | 6 +++--- src/hybridmap/NeutralAtomLayer.cpp | 4 ++-- src/hybridmap/NeutralAtomScheduler.cpp | 6 +++--- src/na/Architecture.cpp | 2 +- src/na/CMakeLists.txt | 2 +- src/na/NAMapper.cpp | 8 ++++---- test/cliffordsynthesis/test_synthesis.cpp | 4 ++-- test/hybridmap/test_hybridmap.cpp | 2 +- test/na/test_architecture.cpp | 4 ++-- test/na/test_nagraphalgorithms.cpp | 4 ++-- test/na/test_namapper.cpp | 8 ++++---- test/test_architecture.cpp | 2 +- test/test_encodings.cpp | 4 ++-- test/test_exact.cpp | 6 +++--- test/test_heuristic.cpp | 6 +++--- test/test_tableau.cpp | 10 +++++----- 50 files changed, 107 insertions(+), 105 deletions(-) diff --git a/include/Architecture.hpp b/include/Architecture.hpp index eff102167..b7a3b3b3a 100644 --- a/include/Architecture.hpp +++ b/include/Architecture.hpp @@ -6,7 +6,7 @@ #pragma once #include "configuration/AvailableArchitecture.hpp" -#include "operations/OpType.hpp" +#include "ir/operations/OpType.hpp" #include "utils.hpp" #include diff --git a/include/DataLogger.hpp b/include/DataLogger.hpp index 25969ca86..feaf41142 100644 --- a/include/DataLogger.hpp +++ b/include/DataLogger.hpp @@ -8,8 +8,8 @@ #include "Architecture.hpp" #include "Definitions.hpp" #include "MappingResults.hpp" -#include "QuantumComputation.hpp" -#include "operations/CompoundOperation.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/CompoundOperation.hpp" #include "utils.hpp" #include diff --git a/include/Mapper.hpp b/include/Mapper.hpp index 4e7442443..fc4ad3c99 100644 --- a/include/Mapper.hpp +++ b/include/Mapper.hpp @@ -8,9 +8,9 @@ #include "Architecture.hpp" #include "Definitions.hpp" #include "MappingResults.hpp" -#include "QuantumComputation.hpp" #include "configuration/Configuration.hpp" -#include "operations/Operation.hpp" +#include "ir//QuantumComputation.hpp" +#include "ir/operations/Operation.hpp" #include "utils.hpp" #include diff --git a/include/cliffordsynthesis/CliffordSynthesizer.hpp b/include/cliffordsynthesis/CliffordSynthesizer.hpp index cbd28baeb..73ec26eef 100644 --- a/include/cliffordsynthesis/CliffordSynthesizer.hpp +++ b/include/cliffordsynthesis/CliffordSynthesizer.hpp @@ -6,12 +6,12 @@ #pragma once #include "Definitions.hpp" -#include "QuantumComputation.hpp" #include "cliffordsynthesis/Configuration.hpp" #include "cliffordsynthesis/Results.hpp" #include "cliffordsynthesis/Tableau.hpp" #include "cliffordsynthesis/TargetMetric.hpp" #include "cliffordsynthesis/encoding/SATEncoder.hpp" +#include "ir/QuantumComputation.hpp" #include #include diff --git a/include/cliffordsynthesis/Results.hpp b/include/cliffordsynthesis/Results.hpp index a32c4d940..78809ea07 100644 --- a/include/cliffordsynthesis/Results.hpp +++ b/include/cliffordsynthesis/Results.hpp @@ -5,9 +5,9 @@ #pragma once -#include "CircuitOptimizer.hpp" -#include "QuantumComputation.hpp" +#include "circuit_optimizer/CircuitOptimizer.hpp" #include "cliffordsynthesis/Tableau.hpp" +#include "ir/QuantumComputation.hpp" #include "logicblocks/Logic.hpp" #include diff --git a/include/cliffordsynthesis/Tableau.hpp b/include/cliffordsynthesis/Tableau.hpp index c25cdf99a..77f014a02 100644 --- a/include/cliffordsynthesis/Tableau.hpp +++ b/include/cliffordsynthesis/Tableau.hpp @@ -5,8 +5,8 @@ #pragma once -#include "QuantumComputation.hpp" -#include "operations/Operation.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/Operation.hpp" #include #include diff --git a/include/cliffordsynthesis/encoding/GateEncoder.hpp b/include/cliffordsynthesis/encoding/GateEncoder.hpp index bb6b97b3b..923b2c96f 100644 --- a/include/cliffordsynthesis/encoding/GateEncoder.hpp +++ b/include/cliffordsynthesis/encoding/GateEncoder.hpp @@ -5,13 +5,13 @@ #pragma once -#include "QuantumComputation.hpp" #include "cliffordsynthesis/Results.hpp" #include "cliffordsynthesis/encoding/TableauEncoder.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/OpType.hpp" #include "logicblocks/Logic.hpp" #include "logicblocks/LogicBlock.hpp" #include "logicblocks/LogicTerm.hpp" -#include "operations/OpType.hpp" #include #include diff --git a/include/cliffordsynthesis/encoding/ObjectiveEncoder.hpp b/include/cliffordsynthesis/encoding/ObjectiveEncoder.hpp index 85ee4253e..3e4160437 100644 --- a/include/cliffordsynthesis/encoding/ObjectiveEncoder.hpp +++ b/include/cliffordsynthesis/encoding/ObjectiveEncoder.hpp @@ -7,9 +7,9 @@ #include "cliffordsynthesis/TargetMetric.hpp" #include "cliffordsynthesis/encoding/GateEncoder.hpp" +#include "ir/operations/OpType.hpp" #include "logicblocks/LogicBlock.hpp" #include "logicblocks/LogicTerm.hpp" -#include "operations/OpType.hpp" #include #include diff --git a/include/cliffordsynthesis/encoding/TableauEncoder.hpp b/include/cliffordsynthesis/encoding/TableauEncoder.hpp index 6791d1fd9..60c8e947e 100644 --- a/include/cliffordsynthesis/encoding/TableauEncoder.hpp +++ b/include/cliffordsynthesis/encoding/TableauEncoder.hpp @@ -7,9 +7,9 @@ #include "cliffordsynthesis/Results.hpp" #include "cliffordsynthesis/Tableau.hpp" +#include "ir/operations/OpType.hpp" #include "logicblocks/Logic.hpp" #include "logicblocks/LogicBlock.hpp" -#include "operations/OpType.hpp" #include #include diff --git a/include/hybridmap/HardwareQubits.hpp b/include/hybridmap/HardwareQubits.hpp index 7b75f4295..27ff91160 100644 --- a/include/hybridmap/HardwareQubits.hpp +++ b/include/hybridmap/HardwareQubits.hpp @@ -6,12 +6,12 @@ #pragma once #include "Definitions.hpp" -#include "Permutation.hpp" #include "datastructures/SymmetricMatrix.hpp" #include "hybridmap/NeutralAtomArchitecture.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" #include "hybridmap/NeutralAtomUtils.hpp" -#include "operations/Operation.hpp" +#include "ir/Permutation.hpp" +#include "ir/operations/Operation.hpp" #include #include diff --git a/include/hybridmap/HybridAnimation.hpp b/include/hybridmap/HybridAnimation.hpp index cff81a64d..a6c869907 100644 --- a/include/hybridmap/HybridAnimation.hpp +++ b/include/hybridmap/HybridAnimation.hpp @@ -8,7 +8,7 @@ #include "Definitions.hpp" #include "NeutralAtomArchitecture.hpp" #include "NeutralAtomDefinitions.hpp" -#include "operations/Operation.hpp" +#include "ir/operations/Operation.hpp" #include #include diff --git a/include/hybridmap/HybridNeutralAtomMapper.hpp b/include/hybridmap/HybridNeutralAtomMapper.hpp index ca5ec695c..329f0d161 100644 --- a/include/hybridmap/HybridNeutralAtomMapper.hpp +++ b/include/hybridmap/HybridNeutralAtomMapper.hpp @@ -7,14 +7,14 @@ #include "Definitions.hpp" #include "NeutralAtomLayer.hpp" -#include "QuantumComputation.hpp" #include "hybridmap/HardwareQubits.hpp" #include "hybridmap/Mapping.hpp" #include "hybridmap/NeutralAtomArchitecture.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" #include "hybridmap/NeutralAtomScheduler.hpp" #include "hybridmap/NeutralAtomUtils.hpp" -#include "operations/Operation.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/Operation.hpp" #include #include diff --git a/include/hybridmap/Mapping.hpp b/include/hybridmap/Mapping.hpp index fb5469342..5d2ca76e3 100644 --- a/include/hybridmap/Mapping.hpp +++ b/include/hybridmap/Mapping.hpp @@ -6,10 +6,10 @@ #pragma once #include "Definitions.hpp" -#include "Permutation.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" #include "hybridmap/NeutralAtomUtils.hpp" -#include "operations/Operation.hpp" +#include "ir/Permutation.hpp" +#include "ir/operations/Operation.hpp" #include #include diff --git a/include/hybridmap/MoveToAodConverter.hpp b/include/hybridmap/MoveToAodConverter.hpp index dbbba7a86..5bc0862bd 100644 --- a/include/hybridmap/MoveToAodConverter.hpp +++ b/include/hybridmap/MoveToAodConverter.hpp @@ -6,13 +6,13 @@ #pragma once #include "Definitions.hpp" -#include "QuantumComputation.hpp" #include "hybridmap/NeutralAtomArchitecture.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" #include "hybridmap/NeutralAtomUtils.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/AodOperation.hpp" +#include "ir/operations/OpType.hpp" #include "na/NADefinitions.hpp" -#include "operations/AodOperation.hpp" -#include "operations/OpType.hpp" #include #include diff --git a/include/hybridmap/NeutralAtomArchitecture.hpp b/include/hybridmap/NeutralAtomArchitecture.hpp index 52cb10017..f026f8fa0 100644 --- a/include/hybridmap/NeutralAtomArchitecture.hpp +++ b/include/hybridmap/NeutralAtomArchitecture.hpp @@ -9,9 +9,9 @@ #include "datastructures/SymmetricMatrix.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" #include "hybridmap/NeutralAtomUtils.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/Operation.hpp" #include "na/NADefinitions.hpp" -#include "operations/OpType.hpp" -#include "operations/Operation.hpp" #include #include diff --git a/include/hybridmap/NeutralAtomScheduler.hpp b/include/hybridmap/NeutralAtomScheduler.hpp index c61635057..715bdc2ba 100644 --- a/include/hybridmap/NeutralAtomScheduler.hpp +++ b/include/hybridmap/NeutralAtomScheduler.hpp @@ -6,9 +6,9 @@ #pragma once #include "Definitions.hpp" -#include "QuantumComputation.hpp" #include "hybridmap/NeutralAtomArchitecture.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" +#include "ir/QuantumComputation.hpp" #include #include diff --git a/include/hybridmap/NeutralAtomUtils.hpp b/include/hybridmap/NeutralAtomUtils.hpp index 2e16b4626..270c7a361 100644 --- a/include/hybridmap/NeutralAtomUtils.hpp +++ b/include/hybridmap/NeutralAtomUtils.hpp @@ -7,7 +7,7 @@ #include "Definitions.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" -#include "operations/AodOperation.hpp" +#include "ir/operations/AodOperation.hpp" #include #include diff --git a/include/na/NAMapper.hpp b/include/na/NAMapper.hpp index 0a6e7f039..3274039b8 100644 --- a/include/na/NAMapper.hpp +++ b/include/na/NAMapper.hpp @@ -9,10 +9,10 @@ #include "Architecture.hpp" #include "Configuration.hpp" #include "Definitions.hpp" -#include "QuantumComputation.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/Operation.hpp" #include "na/NAComputation.hpp" #include "na/NADefinitions.hpp" -#include "operations/Operation.hpp" #include #include diff --git a/include/utils.hpp b/include/utils.hpp index afcd9f9cd..68adb25ad 100644 --- a/include/utils.hpp +++ b/include/utils.hpp @@ -5,7 +5,7 @@ #pragma once -#include "operations/OpType.hpp" +#include "ir/operations/OpType.hpp" #include #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e0a12bbe3..5c5f65389 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,8 +8,10 @@ macro(ADD_INTERNAL_LIBRARY libname) target_include_directories(${lib} PUBLIC $) # add MQT::qfr library - target_link_libraries(${lib} PUBLIC MQT::Core nlohmann_json::nlohmann_json) - target_link_libraries(${lib} PRIVATE MQT::ProjectOptions MQT::ProjectWarnings) + target_link_libraries( + ${lib} + PUBLIC MQT::CoreIR MQT::CoreCircuitOptimizer nlohmann_json::nlohmann_json + PRIVATE MQT::ProjectOptions MQT::ProjectWarnings) endmacro() # macro to add mapping libraries diff --git a/src/DataLogger.cpp b/src/DataLogger.cpp index 8d1faa94f..cb990cc0f 100644 --- a/src/DataLogger.cpp +++ b/src/DataLogger.cpp @@ -7,8 +7,8 @@ #include "Architecture.hpp" #include "MappingResults.hpp" -#include "operations/CompoundOperation.hpp" -#include "operations/OpType.hpp" +#include "ir/operations/CompoundOperation.hpp" +#include "ir/operations/OpType.hpp" #include "utils.hpp" #include diff --git a/src/Mapper.cpp b/src/Mapper.cpp index 542f9d6f3..aece4ae32 100644 --- a/src/Mapper.cpp +++ b/src/Mapper.cpp @@ -6,11 +6,11 @@ #include "Mapper.hpp" #include "Architecture.hpp" -#include "CircuitOptimizer.hpp" #include "Definitions.hpp" +#include "circuit_optimizer/CircuitOptimizer.hpp" #include "configuration/Layering.hpp" -#include "operations/CompoundOperation.hpp" -#include "operations/OpType.hpp" +#include "ir/operations/CompoundOperation.hpp" +#include "ir/operations/OpType.hpp" #include "utils.hpp" #include diff --git a/src/cliffordsynthesis/CliffordSynthesizer.cpp b/src/cliffordsynthesis/CliffordSynthesizer.cpp index fc80bbedf..cd9d7416d 100644 --- a/src/cliffordsynthesis/CliffordSynthesizer.cpp +++ b/src/cliffordsynthesis/CliffordSynthesizer.cpp @@ -5,13 +5,13 @@ #include "cliffordsynthesis/CliffordSynthesizer.hpp" -#include "QuantumComputation.hpp" #include "cliffordsynthesis/Configuration.hpp" #include "cliffordsynthesis/Tableau.hpp" #include "cliffordsynthesis/TargetMetric.hpp" #include "cliffordsynthesis/encoding/SATEncoder.hpp" -#include "operations/CompoundOperation.hpp" -#include "operations/Operation.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/CompoundOperation.hpp" +#include "ir/operations/Operation.hpp" #include #include @@ -498,7 +498,7 @@ void CliffordSynthesizer::depthHeuristicSynthesis() { optimalConfig.target = TargetMetric::Depth; optimalConfig.initialTimestepLimit = configuration.splitSize; - qc::CircuitOptimizer::reorderOperations(*initialCircuit); + initialCircuit->reorderOperations(); qc::QuantumComputation optCircuit{initialCircuit->getNqubits()}; const std::vector& layers = getLayers(*initialCircuit); diff --git a/src/cliffordsynthesis/Tableau.cpp b/src/cliffordsynthesis/Tableau.cpp index 4717e921e..e02415d95 100644 --- a/src/cliffordsynthesis/Tableau.cpp +++ b/src/cliffordsynthesis/Tableau.cpp @@ -5,10 +5,10 @@ #include "cliffordsynthesis/Tableau.hpp" -#include "QuantumComputation.hpp" -#include "operations/CompoundOperation.hpp" -#include "operations/OpType.hpp" -#include "operations/Operation.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/CompoundOperation.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/Operation.hpp" #include "utils.hpp" #include diff --git a/src/cliffordsynthesis/encoding/GateEncoder.cpp b/src/cliffordsynthesis/encoding/GateEncoder.cpp index 07ee446a0..958277e98 100644 --- a/src/cliffordsynthesis/encoding/GateEncoder.cpp +++ b/src/cliffordsynthesis/encoding/GateEncoder.cpp @@ -8,12 +8,12 @@ #include "Definitions.hpp" #include "Logic.hpp" #include "LogicTerm.hpp" -#include "QuantumComputation.hpp" #include "cliffordsynthesis/Results.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/StandardOperation.hpp" #include "logicblocks/Encodings.hpp" #include "logicblocks/Model.hpp" -#include "operations/OpType.hpp" -#include "operations/StandardOperation.hpp" #include #include diff --git a/src/cliffordsynthesis/encoding/MultiGateEncoder.cpp b/src/cliffordsynthesis/encoding/MultiGateEncoder.cpp index de87f9e90..b2d8d4f33 100644 --- a/src/cliffordsynthesis/encoding/MultiGateEncoder.cpp +++ b/src/cliffordsynthesis/encoding/MultiGateEncoder.cpp @@ -6,8 +6,8 @@ #include "cliffordsynthesis/encoding/MultiGateEncoder.hpp" #include "Logic.hpp" +#include "ir/operations/OpType.hpp" #include "logicblocks/LogicTerm.hpp" -#include "operations/OpType.hpp" #include #include diff --git a/src/cliffordsynthesis/encoding/ObjectiveEncoder.cpp b/src/cliffordsynthesis/encoding/ObjectiveEncoder.cpp index 0cf12bce4..cc34969e6 100644 --- a/src/cliffordsynthesis/encoding/ObjectiveEncoder.cpp +++ b/src/cliffordsynthesis/encoding/ObjectiveEncoder.cpp @@ -7,8 +7,8 @@ #include "cliffordsynthesis/TargetMetric.hpp" #include "cliffordsynthesis/encoding/GateEncoder.hpp" +#include "ir/operations/OpType.hpp" #include "logicblocks/LogicTerm.hpp" -#include "operations/OpType.hpp" #include #include diff --git a/src/cliffordsynthesis/encoding/SingleGateEncoder.cpp b/src/cliffordsynthesis/encoding/SingleGateEncoder.cpp index 879870231..f016108e8 100644 --- a/src/cliffordsynthesis/encoding/SingleGateEncoder.cpp +++ b/src/cliffordsynthesis/encoding/SingleGateEncoder.cpp @@ -6,7 +6,7 @@ #include "cliffordsynthesis/encoding/SingleGateEncoder.hpp" #include "Logic.hpp" -#include "operations/OpType.hpp" +#include "ir/operations/OpType.hpp" #include #include diff --git a/src/cliffordsynthesis/encoding/TableauEncoder.cpp b/src/cliffordsynthesis/encoding/TableauEncoder.cpp index 714dd3e81..fb8848bd7 100644 --- a/src/cliffordsynthesis/encoding/TableauEncoder.cpp +++ b/src/cliffordsynthesis/encoding/TableauEncoder.cpp @@ -8,8 +8,8 @@ #include "Logic.hpp" #include "cliffordsynthesis/Results.hpp" #include "cliffordsynthesis/Tableau.hpp" +#include "ir/operations/OpType.hpp" #include "logicblocks/Model.hpp" -#include "operations/OpType.hpp" #include #include diff --git a/src/exact/ExactMapper.cpp b/src/exact/ExactMapper.cpp index 1f2983634..9bb3408ec 100644 --- a/src/exact/ExactMapper.cpp +++ b/src/exact/ExactMapper.cpp @@ -13,11 +13,11 @@ #include "configuration/Configuration.hpp" #include "configuration/Encoding.hpp" #include "configuration/SwapReduction.hpp" +#include "ir/operations/StandardOperation.hpp" #include "logicblocks/Encodings.hpp" #include "logicblocks/LogicBlock.hpp" #include "logicblocks/Model.hpp" #include "logicblocks/util_logicblock.hpp" -#include "operations/StandardOperation.hpp" #include "utils.hpp" #include diff --git a/src/heuristic/HeuristicMapper.cpp b/src/heuristic/HeuristicMapper.cpp index 2edf68379..48cdb234a 100644 --- a/src/heuristic/HeuristicMapper.cpp +++ b/src/heuristic/HeuristicMapper.cpp @@ -15,9 +15,9 @@ #include "configuration/InitialLayout.hpp" #include "configuration/Layering.hpp" #include "configuration/LookaheadHeuristic.hpp" -#include "operations/CompoundOperation.hpp" -#include "operations/OpType.hpp" -#include "operations/StandardOperation.hpp" +#include "ir/operations/CompoundOperation.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/StandardOperation.hpp" #include "utils.hpp" #include diff --git a/src/hybridmap/HybridAnimation.cpp b/src/hybridmap/HybridAnimation.cpp index 103672df5..f6257a22d 100644 --- a/src/hybridmap/HybridAnimation.cpp +++ b/src/hybridmap/HybridAnimation.cpp @@ -8,8 +8,8 @@ #include "Definitions.hpp" #include "hybridmap/NeutralAtomArchitecture.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" -#include "operations/AodOperation.hpp" -#include "operations/OpType.hpp" +#include "ir/operations/AodOperation.hpp" +#include "ir/operations/OpType.hpp" #include "utils.hpp" #include diff --git a/src/hybridmap/HybridNeutralAtomMapper.cpp b/src/hybridmap/HybridNeutralAtomMapper.cpp index eb6bbd567..9c6026818 100644 --- a/src/hybridmap/HybridNeutralAtomMapper.cpp +++ b/src/hybridmap/HybridNeutralAtomMapper.cpp @@ -5,15 +5,15 @@ #include "hybridmap/HybridNeutralAtomMapper.hpp" -#include "CircuitOptimizer.hpp" #include "Definitions.hpp" -#include "QuantumComputation.hpp" +#include "circuit_optimizer/CircuitOptimizer.hpp" #include "hybridmap/MoveToAodConverter.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" #include "hybridmap/NeutralAtomLayer.hpp" #include "hybridmap/NeutralAtomUtils.hpp" -#include "operations/OpType.hpp" -#include "operations/Operation.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/Operation.hpp" #include "utils.hpp" #include diff --git a/src/hybridmap/MoveToAodConverter.cpp b/src/hybridmap/MoveToAodConverter.cpp index b7c62fb42..ffd00fb82 100644 --- a/src/hybridmap/MoveToAodConverter.cpp +++ b/src/hybridmap/MoveToAodConverter.cpp @@ -6,13 +6,13 @@ #include "hybridmap/MoveToAodConverter.hpp" #include "Definitions.hpp" -#include "QuantumComputation.hpp" #include "hybridmap/NeutralAtomArchitecture.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" #include "hybridmap/NeutralAtomUtils.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/AodOperation.hpp" +#include "ir/operations/OpType.hpp" #include "na/NADefinitions.hpp" -#include "operations/AodOperation.hpp" -#include "operations/OpType.hpp" #include "utils.hpp" #include diff --git a/src/hybridmap/NeutralAtomArchitecture.cpp b/src/hybridmap/NeutralAtomArchitecture.cpp index 80c270515..2db6b6464 100644 --- a/src/hybridmap/NeutralAtomArchitecture.cpp +++ b/src/hybridmap/NeutralAtomArchitecture.cpp @@ -8,10 +8,10 @@ #include "Definitions.hpp" #include "datastructures/SymmetricMatrix.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" +#include "ir/operations/AodOperation.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/Operation.hpp" #include "nlohmann/json.hpp" -#include "operations/AodOperation.hpp" -#include "operations/OpType.hpp" -#include "operations/Operation.hpp" #include #include diff --git a/src/hybridmap/NeutralAtomLayer.cpp b/src/hybridmap/NeutralAtomLayer.cpp index 800ac8572..cc11bbcd0 100644 --- a/src/hybridmap/NeutralAtomLayer.cpp +++ b/src/hybridmap/NeutralAtomLayer.cpp @@ -7,8 +7,8 @@ #include "Definitions.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" -#include "operations/OpType.hpp" -#include "operations/Operation.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/Operation.hpp" #include #include diff --git a/src/hybridmap/NeutralAtomScheduler.cpp b/src/hybridmap/NeutralAtomScheduler.cpp index b39d4424a..60d0664c9 100644 --- a/src/hybridmap/NeutralAtomScheduler.cpp +++ b/src/hybridmap/NeutralAtomScheduler.cpp @@ -6,11 +6,11 @@ #include "hybridmap/NeutralAtomScheduler.hpp" #include "Definitions.hpp" -#include "QuantumComputation.hpp" #include "hybridmap/HybridAnimation.hpp" #include "hybridmap/NeutralAtomDefinitions.hpp" -#include "operations/OpType.hpp" -#include "operations/Operation.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/Operation.hpp" #include #include diff --git a/src/na/Architecture.cpp b/src/na/Architecture.cpp index b5a493061..4f9b6222a 100644 --- a/src/na/Architecture.cpp +++ b/src/na/Architecture.cpp @@ -7,8 +7,8 @@ #include "Architecture.hpp" #include "Configuration.hpp" +#include "ir/operations/OpType.hpp" #include "na/NADefinitions.hpp" -#include "operations/OpType.hpp" #include #include diff --git a/src/na/CMakeLists.txt b/src/na/CMakeLists.txt index 58239d644..04e3fca59 100644 --- a/src/na/CMakeLists.txt +++ b/src/na/CMakeLists.txt @@ -15,7 +15,7 @@ if(NOT TARGET ${MQT_QMAP_NA_TARGET_NAME}) target_include_directories(${MQT_QMAP_NA_TARGET_NAME} PUBLIC $) - target_link_libraries(${MQT_QMAP_NA_TARGET_NAME} PUBLIC MQT::Core MQT::CoreNA + target_link_libraries(${MQT_QMAP_NA_TARGET_NAME} PUBLIC MQT::CoreIR MQT::CoreNA nlohmann_json::nlohmann_json) target_link_libraries(${MQT_QMAP_NA_TARGET_NAME} PRIVATE MQT::ProjectOptions MQT::ProjectWarnings) diff --git a/src/na/NAMapper.cpp b/src/na/NAMapper.cpp index 1b8a4f684..867bac27f 100644 --- a/src/na/NAMapper.cpp +++ b/src/na/NAMapper.cpp @@ -10,15 +10,15 @@ #include "Configuration.hpp" #include "Definitions.hpp" #include "NAGraphAlgorithms.hpp" -#include "QuantumComputation.hpp" #include "datastructures/Layer.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/CompoundOperation.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/Operation.hpp" #include "na/NADefinitions.hpp" #include "na/operations/NAGlobalOperation.hpp" #include "na/operations/NALocalOperation.hpp" #include "na/operations/NAShuttlingOperation.hpp" -#include "operations/CompoundOperation.hpp" -#include "operations/OpType.hpp" -#include "operations/Operation.hpp" #include #include diff --git a/test/cliffordsynthesis/test_synthesis.cpp b/test/cliffordsynthesis/test_synthesis.cpp index cb191632d..5449caa9d 100644 --- a/test/cliffordsynthesis/test_synthesis.cpp +++ b/test/cliffordsynthesis/test_synthesis.cpp @@ -4,11 +4,11 @@ // #include "Definitions.hpp" -#include "QuantumComputation.hpp" #include "cliffordsynthesis/CliffordSynthesizer.hpp" #include "cliffordsynthesis/Results.hpp" #include "cliffordsynthesis/TargetMetric.hpp" -#include "operations/Control.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/Control.hpp" #include #include diff --git a/test/hybridmap/test_hybridmap.cpp b/test/hybridmap/test_hybridmap.cpp index 4745be1fb..0cc42614b 100644 --- a/test/hybridmap/test_hybridmap.cpp +++ b/test/hybridmap/test_hybridmap.cpp @@ -4,10 +4,10 @@ // #include "Definitions.hpp" -#include "QuantumComputation.hpp" #include "hybridmap/HybridNeutralAtomMapper.hpp" #include "hybridmap/NeutralAtomArchitecture.hpp" #include "hybridmap/NeutralAtomUtils.hpp" +#include "ir/QuantumComputation.hpp" #include #include diff --git a/test/na/test_architecture.cpp b/test/na/test_architecture.cpp index 9824ff617..b679535fa 100644 --- a/test/na/test_architecture.cpp +++ b/test/na/test_architecture.cpp @@ -5,12 +5,12 @@ #include "Architecture.hpp" #include "Configuration.hpp" -#include "operations/OpType.hpp" +#include "ir/operations/OpType.hpp" -#include "gtest/gtest.h" #include #include #include +#include #include #include #include diff --git a/test/na/test_nagraphalgorithms.cpp b/test/na/test_nagraphalgorithms.cpp index f3c78f748..21e274b1a 100644 --- a/test/na/test_nagraphalgorithms.cpp +++ b/test/na/test_nagraphalgorithms.cpp @@ -5,9 +5,9 @@ #include "Definitions.hpp" #include "NAGraphAlgorithms.hpp" -#include "QuantumComputation.hpp" #include "datastructures/Layer.hpp" -#include "operations/OpType.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/OpType.hpp" #include "gtest/gtest.h" #include diff --git a/test/na/test_namapper.cpp b/test/na/test_namapper.cpp index fe2c2af1c..6c6f7e8a1 100644 --- a/test/na/test_namapper.cpp +++ b/test/na/test_namapper.cpp @@ -7,15 +7,15 @@ #include "Configuration.hpp" #include "Definitions.hpp" #include "NAMapper.hpp" -#include "QuantumComputation.hpp" #include "datastructures/Layer.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/CompoundOperation.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/StandardOperation.hpp" #include "na/NAComputation.hpp" #include "na/operations/NAGlobalOperation.hpp" #include "na/operations/NALocalOperation.hpp" #include "na/operations/NAShuttlingOperation.hpp" -#include "operations/CompoundOperation.hpp" -#include "operations/OpType.hpp" -#include "operations/StandardOperation.hpp" #include #include diff --git a/test/test_architecture.cpp b/test/test_architecture.cpp index 82af89856..82032670b 100644 --- a/test/test_architecture.cpp +++ b/test/test_architecture.cpp @@ -4,7 +4,7 @@ // #include "Architecture.hpp" -#include "operations/OpType.hpp" +#include "ir/operations/OpType.hpp" #include "utils.hpp" #include diff --git a/test/test_encodings.cpp b/test/test_encodings.cpp index 54cca58e8..8a156e740 100644 --- a/test/test_encodings.cpp +++ b/test/test_encodings.cpp @@ -4,14 +4,14 @@ // #include "Architecture.hpp" -#include "QuantumComputation.hpp" #include "configuration/AvailableArchitecture.hpp" #include "configuration/CommanderGrouping.hpp" #include "configuration/Configuration.hpp" #include "configuration/Encoding.hpp" #include "configuration/Method.hpp" #include "exact/ExactMapper.hpp" -#include "operations/Control.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/Control.hpp" #include #include diff --git a/test/test_exact.cpp b/test/test_exact.cpp index 49a61fa0e..9d1a08d97 100644 --- a/test/test_exact.cpp +++ b/test/test_exact.cpp @@ -5,7 +5,6 @@ #include "Architecture.hpp" #include "Definitions.hpp" -#include "QuantumComputation.hpp" #include "configuration/AvailableArchitecture.hpp" #include "configuration/CommanderGrouping.hpp" #include "configuration/Configuration.hpp" @@ -15,8 +14,9 @@ #include "configuration/Method.hpp" #include "configuration/SwapReduction.hpp" #include "exact/ExactMapper.hpp" -#include "operations/Control.hpp" -#include "operations/OpType.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/Control.hpp" +#include "ir/operations/OpType.hpp" #include "utils.hpp" #include diff --git a/test/test_heuristic.cpp b/test/test_heuristic.cpp index 05ee15500..c6565cc4b 100644 --- a/test/test_heuristic.cpp +++ b/test/test_heuristic.cpp @@ -14,9 +14,9 @@ #include "configuration/LookaheadHeuristic.hpp" #include "configuration/Method.hpp" #include "heuristic/HeuristicMapper.hpp" -#include "operations/CompoundOperation.hpp" -#include "operations/Control.hpp" -#include "operations/OpType.hpp" +#include "ir/operations/CompoundOperation.hpp" +#include "ir/operations/Control.hpp" +#include "ir/operations/OpType.hpp" #include "utils.hpp" #include diff --git a/test/test_tableau.cpp b/test/test_tableau.cpp index 35a21f251..b960593f2 100644 --- a/test/test_tableau.cpp +++ b/test/test_tableau.cpp @@ -3,12 +3,12 @@ // See README.md or go to https://github.com/cda-tum/qmap for more information. // -#include "QuantumComputation.hpp" #include "cliffordsynthesis/Tableau.hpp" -#include "operations/CompoundOperation.hpp" -#include "operations/Control.hpp" -#include "operations/OpType.hpp" -#include "operations/StandardOperation.hpp" +#include "ir/QuantumComputation.hpp" +#include "ir/operations/CompoundOperation.hpp" +#include "ir/operations/Control.hpp" +#include "ir/operations/OpType.hpp" +#include "ir/operations/StandardOperation.hpp" #include "utils.hpp" #include From a0e0e32d3fdaf61878fa2f4a9f230b7df3437fb5 Mon Sep 17 00:00:00 2001 From: burgholzer Date: Wed, 14 Aug 2024 14:02:10 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=A9=B9=20adjust=20intersphinx=20links?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: burgholzer --- docs/source/conf.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 4dfa616c3..a498150e2 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -72,14 +72,14 @@ intersphinx_mapping = { "python": ("https://docs.python.org/3", None), - "typing_extensions": ("https://typing-extensions.readthedocs.io/en/latest/", None), - "qiskit": ("https://docs.quantum.ibm.com/api/qiskit/", None), - "mqt": ("https://mqt.readthedocs.io/en/latest/", None), - "core": ("https://mqt.readthedocs.io/projects/core/en/latest/", None), - "ddsim": ("https://mqt.readthedocs.io/projects/ddsim/en/latest/", None), - "qcec": ("https://mqt.readthedocs.io/projects/qcec/en/latest/", None), - "qecc": ("https://mqt.readthedocs.io/projects/qecc/en/latest/", None), - "syrec": ("https://mqt.readthedocs.io/projects/syrec/en/latest/", None), + "typing_extensions": ("https://typing-extensions.readthedocs.io/en/latest", None), + "qiskit": ("https://docs.quantum.ibm.com/api/qiskit", None), + "mqt": ("https://mqt.readthedocs.io/en/latest", None), + "core": ("https://mqt.readthedocs.io/projects/core/en/latest", None), + "ddsim": ("https://mqt.readthedocs.io/projects/ddsim/en/latest", None), + "qcec": ("https://mqt.readthedocs.io/projects/qcec/en/latest", None), + "qecc": ("https://mqt.readthedocs.io/projects/qecc/en/latest", None), + "syrec": ("https://mqt.readthedocs.io/projects/syrec/en/latest", None), } nbsphinx_execute = "auto" From 51835538241746095a80a01fa3007df92884b2d7 Mon Sep 17 00:00:00 2001 From: burgholzer Date: Wed, 14 Aug 2024 14:02:23 +0200 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=A9=B9=20instruct=20uv=20to=20rebuild?= =?UTF-8?q?=20the=20local=20package=20to=20avoid=20caching=20issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: burgholzer --- noxfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index cbb41fcb2..c9d940a06 100644 --- a/noxfile.py +++ b/noxfile.py @@ -68,7 +68,7 @@ def _run_tests( session.install(*BUILD_REQUIREMENTS, *install_args, env=env) install_arg = f"-ve.[{','.join(_extras)}]" - session.install("--no-build-isolation", install_arg, *install_args, env=env) + session.install("--no-build-isolation", "--reinstall-package", "mqt.qmap", install_arg, *install_args, env=env) session.run("pytest", *run_args, *posargs, env=env) @@ -99,7 +99,7 @@ def docs(session: nox.Session) -> None: serve = args.builder == "html" and session.interactive extra_installs = ["sphinx-autobuild"] if serve else [] session.install(*BUILD_REQUIREMENTS, *extra_installs) - session.install("--no-build-isolation", "-ve.[docs]") + session.install("--no-build-isolation", "-ve.[docs]", "--reinstall-package", "mqt.qmap") session.chdir("docs") if args.builder == "linkcheck":