Merge branch 'main' into port-hls-to-rust

Author: alexanderivrii

.github/workflows/tests.yml

@@ -13,19 +13,15 @@ concurrency:
 jobs:
   tests:
     if: github.repository_owner == 'Qiskit'
-    name: macOS-arm64-tests-Python-${{ matrix.python-version }}
-    runs-on: macOS-14
+    name: ${{ matrix.os }}-arm64-tests-Python-${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        # Normally we test min and max version but we can't run python
-        # 3.9 on arm64 until actions/setup-python#808 is resolved
-        python-version: ["3.10", "3.13"]
+        python-version: ["3.9", "3.13"]
+        os: ["macOS-14", "ubuntu-24.04-arm"]
     steps:
       - uses: actions/checkout@v4
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@1.70
-        if: matrix.python-version == '3.10'
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
@@ -36,7 +32,7 @@ jobs:
           python -m pip install -U -r requirements.txt -c constraints.txt
           python -m pip install -U -r requirements-dev.txt -c constraints.txt
           python -m pip install -c constraints.txt -e .
-        if: matrix.python-version == '3.10'
+        if: matrix.python-version == '3.9'
         env:
           QISKIT_NO_CACHE_GATES: 1
       - name: 'Install dependencies'
@@ -49,6 +45,6 @@ jobs:
         run: |
           python -m pip install -r requirements-optional.txt -c constraints.txt
           python tools/report_numpy_state.py
-        if: matrix.python-version == '3.10'
+        if: matrix.python-version == '3.9'
       - name: 'Run tests'
         run: stestr run

.github/workflows/wheels-build.yml

@@ -43,14 +43,6 @@ on:
         default: "default"
         required: false
 
-      wheels-linux-aarch64:
-        description: >-
-          The action to take for Linux AArch64 wheels.
-          Choose from 'default', 'build' or 'skip'.
-        type: string
-        default: "default"
-        required: false
-
       artifact-prefix:
         description: "A prefix to give all artifacts uploaded with 'actions/upload-artifact'."
         type: string
@@ -85,12 +77,12 @@ jobs:
           # Used for the ARM builds.
           - macos-14
           - windows-latest
+          - ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ inputs.python-version }}
-          architecture: ${{ matrix.os == 'macos-14' && 'arm64' || 'x64' }}
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: llvm-tools-preview
@@ -108,12 +100,19 @@ jobs:
         run: |
           set -e
           mkdir -p "$PGO_WORK_DIR"
-
+          if [[ `uname -m` == "aarch64" ]] ; then
+              INSTALL_RUST_PATH=tools/install_rust_msrv.sh
+              RUST_TOOLCHAIN=1.79
+          else
+              INSTALL_RUST_PATH=tools/install_rust.sh
+              RUST_TOOLCHAIN=stable
+          fi
           cat >>"$GITHUB_ENV" <<EOF
+          CIBW_BEFORE_ALL_LINUX=yum install -y wget && {package}/$INSTALL_RUST_PATH
           CIBW_BEFORE_BUILD=bash ./tools/build_pgo.sh $PGO_WORK_DIR $PGO_OUT_PATH
           CIBW_ENVIRONMENT=RUSTUP_TOOLCHAIN=stable RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function'
           CIBW_ENVIRONMENT_MACOS=MACOSX_DEPLOYMENT_TARGET='10.12' RUSTUP_TOOLCHAIN=stable RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function'
-          CIBW_ENVIRONMENT_LINUX=RUSTUP_TOOLCHAIN=stable RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function' PATH="\$PATH:\$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true"
+          CIBW_ENVIRONMENT_LINUX=RUSTUP_TOOLCHAIN=$RUST_TOOLCHAIN RUSTFLAGS='-Cprofile-use=$PGO_OUT_PATH -Cllvm-args=-pgo-warn-missing-function' PATH="\$PATH:\$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true"
           EOF
         env:
           PGO_WORK_DIR: ${{ github.workspace }}/pgo-data
@@ -123,7 +122,6 @@ jobs:
         with:
           path: ./wheelhouse/*.whl
           name: ${{ inputs.artifact-prefix }}wheels-tier-1-${{ matrix.os }}
-
   wheels-linux-s390x:
     name: "Wheels / Linux s390x"
     if: (inputs.wheels-linux-s390x == 'default' && inputs.default-action || inputs.wheels-linux-s390x) == 'build'
@@ -170,22 +168,6 @@ jobs:
           path: ./wheelhouse/*.whl
           name: ${{ inputs.artifact-prefix }}wheels-linux-ppc64le
 
-  wheels-linux-aarch64:
-    name: "Wheels / Linux AArch64"
-    if: (inputs.wheels-linux-aarch64 == 'default' && inputs.default-action || inputs.wheels-linux-aarch64) == 'build'
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ inputs.python-version }}
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: pypa/cibuildwheel@v2.22.0
-      - uses: actions/upload-artifact@v4
-        with:
-          path: ./wheelhouse/*.whl
-          name: ${{ inputs.artifact-prefix }}wheels-linux-aarch64
-
   sdist:
     name: "sdist"
     if: (inputs.sdist == 'default' && inputs.default-action || inputs.sdist) == 'build'

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 version = "2.0.0"
 edition = "2021"
-rust-version = "1.79"  # Keep in sync with README.md and rust-toolchain.toml.
+rust-version = "1.79"  # Keep in sync with README.md, rust-toolchain.toml, and tools/install_rust_msrv.sh
 license = "Apache-2.0"
 
 # Shared dependencies that can be inherited.  This just helps a little with

crates/accelerate/src/barrier_before_final_measurement.rs

@@ -14,7 +14,6 @@ use pyo3::prelude::*;
 use rayon::prelude::*;
 use rustworkx_core::petgraph::stable_graph::NodeIndex;
 
-use qiskit_circuit::circuit_instruction::ExtraInstructionAttributes;
 use qiskit_circuit::dag_circuit::{DAGCircuit, NodeType};
 use qiskit_circuit::operations::{OperationRef, StandardInstruction};
 use qiskit_circuit::packed_instruction::{PackedInstruction, PackedOperation};
@@ -150,7 +149,7 @@ pub fn barrier_before_final_measurements(
         qargs.as_slice(),
         &[],
         None,
-        ExtraInstructionAttributes::new(label, None, None, None),
+        label,
         #[cfg(feature = "cache_pygates")]
         None,
     )?;

crates/accelerate/src/basis/basis_translator/compose_transforms.rs

@@ -75,7 +75,7 @@ pub(super) fn compose_transforms<'a>(
             } else {
                 Some(gate_obj.params)
             },
-            gate_obj.extra_attrs,
+            gate_obj.label.map(|x| *x),
             #[cfg(feature = "cache_pygates")]
             Some(gate.into()),
         )?;
@@ -121,7 +121,7 @@ pub(super) fn compose_transforms<'a>(
                         op_node.bind(py),
                         &replace_dag,
                         None,
-                        true,
+                        None,
                     )?;
                 }
             }

crates/accelerate/src/basis/basis_translator/mod.rs

@@ -522,7 +522,7 @@ fn apply_translation(
                     } else {
                         Some(new_op.params)
                     },
-                    new_op.extra_attrs,
+                    new_op.label.map(|x| *x),
                     #[cfg(feature = "cache_pygates")]
                     None,
                 )?;
@@ -543,7 +543,7 @@ fn apply_translation(
                                 .collect(),
                         )
                     },
-                    node_obj.extra_attrs.clone(),
+                    node_obj.label.as_ref().map(|x| x.as_ref().clone()),
                     #[cfg(feature = "cache_pygates")]
                     None,
                 )?;
@@ -571,7 +571,7 @@ fn apply_translation(
                             .collect(),
                     )
                 },
-                node_obj.extra_attrs.clone(),
+                node_obj.label.as_ref().map(|x| x.as_ref().clone()),
                 #[cfg(feature = "cache_pygates")]
                 None,
             )?;
@@ -595,7 +595,7 @@ fn apply_translation(
                             .collect(),
                     )
                 },
-                node_obj.extra_attrs.clone(),
+                node_obj.label.as_ref().map(|x| x.as_ref().clone()),
                 #[cfg(feature = "cache_pygates")]
                 None,
             )?;
@@ -667,27 +667,12 @@ fn replace_node(
             } else {
                 inner_node.op.clone()
             };
-            if node.condition().is_some() {
-                match new_op.view() {
-                    OperationRef::Gate(gate) => {
-                        gate.gate.setattr(py, "condition", node.condition())?
-                    }
-                    OperationRef::Instruction(inst) => {
-                        inst.instruction
-                            .setattr(py, "condition", node.condition())?
-                    }
-                    OperationRef::Operation(oper) => {
-                        oper.operation.setattr(py, "condition", node.condition())?
-                    }
-                    _ => (),
-                }
-            }
             let new_params: SmallVec<[Param; 3]> = inner_node
                 .params_view()
                 .iter()
                 .map(|param| param.clone_ref(py))
                 .collect();
-            let new_extra_props = node.extra_attrs.clone();
+            let new_extra_props = node.label.as_ref().map(|x| x.as_ref().clone());
             dag.apply_operation_back(
                 py,
                 new_op,
@@ -802,7 +787,7 @@ fn replace_node(
                 } else {
                     Some(new_params)
                 },
-                inner_node.extra_attrs.clone(),
+                inner_node.label.as_ref().map(|x| x.as_ref().clone()),
                 #[cfg(feature = "cache_pygates")]
                 None,
             )?;

crates/accelerate/src/commutation_analysis.rs

@@ -95,12 +95,10 @@ pub(crate) fn analyze_commutations_inner(
                             py,
                             &op1,
                             params1,
-                            &packed_inst0.extra_attrs,
                             qargs1,
                             cargs1,
                             &op2,
                             params2,
-                            &packed_inst1.extra_attrs,
                             qargs2,
                             cargs2,
                             MAX_NUM_QUBITS,

crates/accelerate/src/commutation_checker.rs

@@ -25,7 +25,7 @@ use pyo3::types::{PyBool, PyDict, PySequence, PyTuple};
 use pyo3::BoundObject;
 
 use qiskit_circuit::bit_data::BitData;
-use qiskit_circuit::circuit_instruction::{ExtraInstructionAttributes, OperationFromPython};
+use qiskit_circuit::circuit_instruction::OperationFromPython;
 use qiskit_circuit::dag_node::DAGOpNode;
 use qiskit_circuit::imports::QI_OPERATOR;
 use qiskit_circuit::operations::OperationRef::{Gate as PyGateType, Operation as PyOperationType};
@@ -178,12 +178,10 @@ impl CommutationChecker {
             py,
             &op1.instruction.operation.view(),
             &op1.instruction.params,
-            &op1.instruction.extra_attrs,
             &qargs1,
             &cargs1,
             &op2.instruction.operation.view(),
             &op2.instruction.params,
-            &op2.instruction.extra_attrs,
             &qargs2,
             &cargs2,
             max_num_qubits,
@@ -215,12 +213,10 @@ impl CommutationChecker {
             py,
             &op1.operation.view(),
             &op1.params,
-            &op1.extra_attrs,
             &qargs1,
             &cargs1,
             &op2.operation.view(),
             &op2.params,
-            &op2.extra_attrs,
             &qargs2,
             &cargs2,
             max_num_qubits,
@@ -285,12 +281,10 @@ impl CommutationChecker {
         py: Python,
         op1: &OperationRef,
         params1: &[Param],
-        attrs1: &ExtraInstructionAttributes,
         qargs1: &[Qubit],
         cargs1: &[Clbit],
         op2: &OperationRef,
         params2: &[Param],
-        attrs2: &ExtraInstructionAttributes,
         qargs2: &[Qubit],
         cargs2: &[Clbit],
         max_num_qubits: u32,
@@ -321,12 +315,10 @@ impl CommutationChecker {
         let commutation: Option<bool> = commutation_precheck(
             op1,
             params1,
-            attrs1,
             qargs1,
             cargs1,
             op2,
             params2,
-            attrs2,
             qargs2,
             cargs2,
             max_num_qubits,
@@ -576,21 +568,15 @@ impl CommutationChecker {
 fn commutation_precheck(
     op1: &OperationRef,
     params1: &[Param],
-    attrs1: &ExtraInstructionAttributes,
     qargs1: &[Qubit],
     cargs1: &[Clbit],
     op2: &OperationRef,
     params2: &[Param],
-    attrs2: &ExtraInstructionAttributes,
     qargs2: &[Qubit],
     cargs2: &[Clbit],
     max_num_qubits: u32,
 ) -> Option<bool> {
-    if op1.control_flow()
-        || op2.control_flow()
-        || attrs1.condition().is_some()
-        || attrs2.condition().is_some()
-    {
+    if op1.control_flow() || op2.control_flow() {
         return Some(false);
     }
 

crates/accelerate/src/consolidate_blocks.rs

@@ -21,7 +21,6 @@ use rustworkx_core::petgraph::stable_graph::NodeIndex;
 use smallvec::smallvec;
 
 use qiskit_circuit::circuit_data::CircuitData;
-use qiskit_circuit::circuit_instruction::ExtraInstructionAttributes;
 use qiskit_circuit::dag_circuit::DAGCircuit;
 use qiskit_circuit::gate_matrix::{ONE_QUBIT_IDENTITY, TWO_QUBIT_IDENTITY};
 use qiskit_circuit::imports::{QI_OPERATOR, QUANTUM_CIRCUIT};
@@ -125,7 +124,7 @@ pub(crate) fn consolidate_blocks(
                     inst_node,
                     PackedOperation::from_unitary(Box::new(unitary_gate)),
                     smallvec![],
-                    ExtraInstructionAttributes::default(),
+                    None,
                 )?;
                 continue;
             }
@@ -199,7 +198,7 @@ pub(crate) fn consolidate_blocks(
                     &block,
                     PackedOperation::from_unitary(Box::new(unitary_gate)),
                     smallvec![],
-                    ExtraInstructionAttributes::default(),
+                    None,
                     false,
                     &block_index_map,
                     &clbit_pos_map,
@@ -238,7 +237,7 @@ pub(crate) fn consolidate_blocks(
                             &block,
                             PackedOperation::from_unitary(Box::new(unitary_gate)),
                             smallvec![],
-                            ExtraInstructionAttributes::default(),
+                            None,
                             false,
                             &qubit_pos_map,
                             &clbit_pos_map,
@@ -276,7 +275,7 @@ pub(crate) fn consolidate_blocks(
                     first_inst_node,
                     PackedOperation::from_unitary(Box::new(unitary_gate)),
                     smallvec![],
-                    ExtraInstructionAttributes::default(),
+                    None,
                 )?;
                 continue;
             }
@@ -320,7 +319,7 @@ pub(crate) fn consolidate_blocks(
                     &run,
                     PackedOperation::from_unitary(Box::new(unitary_gate)),
                     smallvec![],
-                    ExtraInstructionAttributes::default(),
+                    None,
                     false,
                     &block_index_map,
                     &clbit_pos_map,