⬆️ Update munich-quantum-toolkit/core (#681)

This pull request updates the
[munich-quantum-toolkit/core](https://github.com/munich-quantum-toolkit/core)
dependency from
munich-quantum-toolkit/core@0425f88
(version v3.2.1) to
munich-quantum-toolkit/core@a354ba3
(version v3.3.0).

**Full Changelog**:
munich-quantum-toolkit/core@0425f88...a354ba3

---------

Signed-off-by: Daniel Haag <121057143+denialhaag@users.noreply.github.com>
Co-authored-by: mqt-app[bot] <219534693+mqt-app[bot]@users.noreply.github.com>
Co-authored-by: Daniel Haag <121057143+denialhaag@users.noreply.github.com>
Co-authored-by: Lukas Burgholzer <burgholzer@me.com>

Author: 3 people

CHANGELOG.md

@@ -11,8 +11,13 @@ This project adheres to [Semantic Versioning], with the exception that minor rel
 
 ### Added
 
+- ✨ Add support for Qiskit's `IfElse` operations ([#681]) ([**@denialhaag**])
 - 👷 Enable testing on Python 3.14 ([#674]) ([**@denialhaag**])
 
+### Changed
+
+- ⬆️ Bump minimum required `mqt-core` version to `3.3.1` ([#681]) ([**@denialhaag**])
+
 ### Removed
 
 - 🔥 Drop support for Python 3.9 ([#645]) ([**@denialhaag**])
@@ -28,26 +33,26 @@ _If you are upgrading: please see [`UPGRADING.md`](UPGRADING.md#200)._
 
 ### Changed
 
-- **Breaking**: ♻️ Streamline names of Python modules and classes ([#614]) ([**@denialhaag**])
-- **Breaking**: ⬆️ Bump minimum required `mqt-core` version to `3.2.1` ([#610]) ([**@denialhaag**])
-- **Breaking**: ⬆️ Require C++20 ([#610]) ([**@denialhaag**])
-- **Breaking**: ✨ Expose enums to Python via `pybind11`'s new (`enum.Enum`-compatible) `py::native_enum` ([#607]) ([**@denialhaag**])
-- **Breaking**: ⬆️ Bump minimum required `mqt-core` version to `3.1.0` ([#591]) ([**@denialhaag**])
-- **Breaking**: ⬆️ Bump minimum required `pybind11` version to `3.0.0` ([#591]) ([**@denialhaag**])
+- ♻️ Streamline names of Python modules and classes ([#614]) ([**@denialhaag**])
+- ⬆️ Bump minimum required `mqt-core` version to `3.2.1` ([#610]) ([**@denialhaag**])
+- ⬆️ Require C++20 ([#610]) ([**@denialhaag**])
+- ✨ Expose enums to Python via `pybind11`'s new (`enum.Enum`-compatible) `py::native_enum` ([#607]) ([**@denialhaag**])
+- ⬆️ Bump minimum required `mqt-core` version to `3.1.0` ([#591]) ([**@denialhaag**])
+- ⬆️ Bump minimum required `pybind11` version to `3.0.0` ([#591]) ([**@denialhaag**])
 - ♻️ Move the C++ code for the Python bindings to the top-level `bindings` directory ([#567]) ([**@denialhaag**])
 - ♻️ Move all Python code (no tests) to the top-level `python` directory ([#567]) ([**@denialhaag**])
-- **Breaking**: ⬆️ Support Qiskit 2.0 ([#571]) ([**@denialhaag**])
-- **Breaking**: 🚚 Move MQT DDSIM to the [munich-quantum-toolkit] GitHub organization
-- **Breaking**: ♻️ Use the `mqt-core` Python package for handling circuits ([#336]) ([**@burgholzer**])
-- **Breaking**: ⬆️ Bump minimum required CMake version to `3.24.0` ([#538]) ([**@burgholzer**])
+- ⬆️ Support Qiskit 2.0 ([#571]) ([**@denialhaag**])
+- 🚚 Move MQT DDSIM to the [munich-quantum-toolkit] GitHub organization
+- ♻️ Use the `mqt-core` Python package for handling circuits ([#336]) ([**@burgholzer**])
+- ⬆️ Bump minimum required CMake version to `3.24.0` ([#538]) ([**@burgholzer**])
 - 📝 Rework existing project documentation ([#556]) ([**@burgholzer**])
 
 ### Removed
 
-- **Breaking**: 🔥 Remove methods for querying maximum node count ([#591]) ([**@denialhaag**])
-- **Breaking**: 🔥 Remove the TN flow from the path simulator ([#336]) ([**@burgholzer**])
-- **Breaking**: 🔥 Remove some superfluous C++ executables ([#336]) ([**@burgholzer**])
-- **Breaking**: 🔥 Remove support for `.real`, `.qc`, `.tfc`, and `GRCS` files ([#538]) ([**@burgholzer**])
+- 🔥 Remove methods for querying maximum node count ([#591]) ([**@denialhaag**])
+- 🔥 Remove the TN flow from the path simulator ([#336]) ([**@burgholzer**])
+- 🔥 Remove some superfluous C++ executables ([#336]) ([**@burgholzer**])
+- 🔥 Remove support for `.real`, `.qc`, `.tfc`, and `GRCS` files ([#538]) ([**@burgholzer**])
 
 ### Fixed
 
@@ -65,6 +70,7 @@ _📚 Refer to the [GitHub Release Notes] for previous changelogs._
 
 <!-- PR links -->
 
+[#681]: https://github.com/munich-quantum-toolkit/ddsim/pull/681
 [#674]: https://github.com/munich-quantum-toolkit/ddsim/pull/674
 [#645]: https://github.com/munich-quantum-toolkit/ddsim/pull/645
 [#640]: https://github.com/munich-quantum-toolkit/ddsim/pull/640

cmake/ExternalDependencies.cmake

@@ -41,11 +41,11 @@ if(BUILD_MQT_DDSIM_BINDINGS)
 endif()
 
 # cmake-format: off
-set(MQT_CORE_MINIMUM_VERSION 3.2.1
+set(MQT_CORE_MINIMUM_VERSION 3.3.1
     CACHE STRING "MQT Core minimum version")
-set(MQT_CORE_VERSION 3.2.1
+set(MQT_CORE_VERSION 3.3.1
     CACHE STRING "MQT Core version")
-set(MQT_CORE_REV "0425f88169f573e4505b49703c4cadf3699ccbcd"
+set(MQT_CORE_REV "1392d1b70f7331ea1ebb3247587c62cb8fd1d078"
     CACHE STRING "MQT Core identifier (tag, branch or commit hash)")
 set(MQT_CORE_REPO_OWNER "munich-quantum-toolkit"
     CACHE STRING "MQT Core repository owner (change when using a fork)")

pyproject.toml

@@ -11,7 +11,7 @@ requires = [
     "scikit-build-core>=0.11.2",
     "setuptools-scm>=8.3.1",
     "pybind11>=3.0.0",
-    "mqt.core~=3.2.1",
+    "mqt.core~=3.3.1",
 ]
 build-backend = "scikit_build_core.build"
 
@@ -47,7 +47,7 @@ classifiers = [
 ]
 requires-python = ">=3.10"
 dependencies = [
-    "mqt.core[qiskit]~=3.2.1",
+    "mqt.core[qiskit]~=3.3.1",
     "qiskit>=1.1",
 ]
 dynamic = ["version"]
@@ -286,10 +286,10 @@ test-skip = [
 environment = { DEPLOY = "ON" }
 # The SOVERSION needs to be updated when the shared libraries are updated.
 repair-wheel-command = """auditwheel repair -w {dest_dir} {wheel} \
---exclude libmqt-core-ir.so.3.2 \
---exclude libmqt-core-qasm.so.3.2 \
---exclude libmqt-core-circuit-optimizer.so.3.2 \
---exclude libmqt-core-dd.so.3.2"""
+--exclude libmqt-core-ir.so.3.3 \
+--exclude libmqt-core-qasm.so.3.3 \
+--exclude libmqt-core-circuit-optimizer.so.3.3 \
+--exclude libmqt-core-dd.so.3.3"""
 
 [tool.cibuildwheel.macos]
 environment = { MACOSX_DEPLOYMENT_TARGET = "11.0" }
@@ -318,7 +318,7 @@ build = [
   "pybind11>=3.0.0",
   "scikit-build-core>=0.11.2",
   "setuptools-scm>=8.3.1",
-  "mqt.core~=3.2.1",
+  "mqt.core~=3.3.1",
 ]
 docs = [
   "furo>=2024.8.6",

src/CircuitSimulator.cpp

@@ -15,7 +15,8 @@
 #include "dd/Node.hpp"
 #include "dd/Operations.hpp"
 #include "dd/StateGeneration.hpp"
-#include "ir/operations/ClassicControlledOperation.hpp"
+#include "ir/Definitions.hpp"
+#include "ir/operations/IfElseOperation.hpp"
 #include "ir/operations/NonUnitaryOperation.hpp"
 #include "ir/operations/OpType.hpp"
 
@@ -85,7 +86,7 @@ auto CircuitSimulator::analyseCircuit() -> CircuitAnalysis {
   auto analysis = CircuitAnalysis{};
 
   for (auto& op : *qc) {
-    if (op->isClassicControlledOperation() || op->getType() == qc::Reset) {
+    if (op->isIfElseOperation() || op->getType() == qc::Reset) {
       analysis.isDynamic = true;
     }
     if (const auto* measure = dynamic_cast<qc::NonUnitaryOperation*>(op.get());
@@ -156,7 +157,7 @@ CircuitSimulator::singleShot(const bool ignoreNonUnitaries) {
                 (static_cast<double>(approximationInfo.stepNumber + 1))));
 
   for (auto& op : *qc) {
-    if (op->isNonUnitaryOperation()) {
+    if (op->isNonUnitaryOperation() && !op->isIfElseOperation()) {
       if (ignoreNonUnitaries) {
         continue;
       }
@@ -186,32 +187,61 @@ CircuitSimulator::singleShot(const bool ignoreNonUnitaries) {
       }
       dd->garbageCollect();
     } else {
-      if (op->isClassicControlledOperation()) {
-        if (auto* classicallyControlledOp =
-                dynamic_cast<qc::ClassicControlledOperation*>(op.get())) {
-          const auto startIndex = static_cast<std::uint16_t>(
-              classicallyControlledOp->getParameter().at(0));
-          const auto length = static_cast<std::uint16_t>(
-              classicallyControlledOp->getParameter().at(1));
-          const auto expectedValue =
-              classicallyControlledOp->getExpectedValue();
-          unsigned int actualValue = 0;
+      if (op->isIfElseOperation()) {
+        if (auto* ifElseOp = dynamic_cast<qc::IfElseOperation*>(op.get())) {
+          const auto& comparisonKind = ifElseOp->getComparisonKind();
+
+          std::size_t startIndex = 0;
+          std::size_t length = 0;
+          std::uint64_t expectedValue = 0;
+          if (ifElseOp->getControlBit().has_value()) {
+            startIndex = ifElseOp->getControlBit().value();
+            length = 1;
+            expectedValue = ifElseOp->getExpectedValueBit() ? 1U : 0U;
+          } else {
+            startIndex = ifElseOp->getControlRegister()->getStartIndex();
+            length = ifElseOp->getControlRegister()->getSize();
+            expectedValue = ifElseOp->getExpectedValueRegister();
+          }
+
+          std::uint64_t actualValue = 0;
           for (std::size_t i = 0; i < length; i++) {
             actualValue |= (classicValues[startIndex + i] ? 1U : 0U) << i;
           }
 
-          // std::clog << "expected " << expected_value << " and actual value
-          // was " << actual_value << "\n";
-
-          if (actualValue != expectedValue) {
+          const auto control = [actualValue, expectedValue, comparisonKind]() {
+            switch (comparisonKind) {
+            case qc::ComparisonKind::Eq:
+              return actualValue == expectedValue;
+            case qc::ComparisonKind::Neq:
+              return actualValue != expectedValue;
+            case qc::ComparisonKind::Lt:
+              return actualValue < expectedValue;
+            case qc::ComparisonKind::Leq:
+              return actualValue <= expectedValue;
+            case qc::ComparisonKind::Gt:
+              return actualValue > expectedValue;
+            case qc::ComparisonKind::Geq:
+              return actualValue >= expectedValue;
+            }
+            qc::unreachable();
+          }();
+
+          if (control) {
+            auto thenOp = ifElseOp->getThenOp()->clone();
+            applyOperationToState(thenOp);
+          } else if (ifElseOp->getElseOp() != nullptr) {
+            auto elseOp = ifElseOp->getElseOp()->clone();
+            applyOperationToState(elseOp);
+          } else {
             continue;
           }
         } else {
-          throw std::runtime_error(
-              "Dynamic cast to ClassicControlledOperation failed.");
+          throw std::runtime_error("Dynamic cast to IfElseOperation failed.");
         }
+      } else {
+        applyOperationToState(op);
       }
-      applyOperationToState(op);
 
       if (approximationInfo.stepNumber > 0 &&
           approximationInfo.stepFidelity < 1.0) {

src/StochasticNoiseSimulator.cpp

@@ -17,7 +17,7 @@
 #include "dd/Package.hpp"
 #include "dd/StateGeneration.hpp"
 #include "ir/Definitions.hpp"
-#include "ir/operations/ClassicControlledOperation.hpp"
+#include "ir/operations/IfElseOperation.hpp"
 #include "ir/operations/NonUnitaryOperation.hpp"
 #include "ir/operations/OpType.hpp"
 
@@ -107,12 +107,11 @@ void StochasticNoiseSimulator::runStochSimulationForId(
         continue;
       }
       dd::mEdge operation;
-      if (op->isClassicControlledOperation()) {
+      if (op->isIfElseOperation()) {
         // Check if the operation is controlled by a classical register
-        const auto& classicOp =
-            dynamic_cast<const qc::ClassicControlledOperation&>(*op);
-        localRootEdge = applyClassicControlledOperation(
-            classicOp, localRootEdge, *localDD, classicValues);
+        const auto& classicOp = dynamic_cast<const qc::IfElseOperation&>(*op);
+        localRootEdge = applyIfElseOperation(classicOp, localRootEdge, *localDD,
+                                             classicValues);
         continue;
       }
       const auto& targets = op->getTargets();