Removed extension sets from hugr-core and hugr-py.

Author: zrho

.github/workflows/ci-rs.yml

@@ -6,7 +6,7 @@ on:
       - main
   pull_request:
     branches:
-      - '**'
+      - "**"
   merge_group:
     types: [checks_requested]
   workflow_dispatch: {}
@@ -25,7 +25,6 @@ env:
   LLVM_VERSION: "14.0"
   LLVM_FEATURE_NAME: "14-0"
 
-
 jobs:
   # Check if changes were made to the relevant files.
   # Always returns true if running on the default branch, to ensure all changes are thoroughly checked.
@@ -43,25 +42,25 @@ jobs:
       model: ${{ steps.filter.outputs.model == 'true' || steps.override.outputs.out == 'true' }}
       llvm: ${{ steps.filter.outputs.llvm == 'true' || steps.override.outputs.out == 'true' }}
     steps:
-    - uses: actions/checkout@v4
-    - name: Override label
-      id: override
-      run: |
-        echo "Label contains run-ci-checks: $OVERRIDE_LABEL"
-        if [ "$OVERRIDE_LABEL" == "true" ]; then
-          echo "Overriding due to label 'run-ci-checks'"
-          echo "out=true" >> $GITHUB_OUTPUT
-        elif [ "$DEFAULT_BRANCH" == "true" ]; then
-          echo "Overriding due to running on the default branch"
-          echo "out=true" >> $GITHUB_OUTPUT
-        fi
-      env:
-        OVERRIDE_LABEL: ${{ github.event_name == 'pull_request' && contains( github.event.pull_request.labels.*.name, 'run-ci-checks') }}
-        DEFAULT_BRANCH: ${{ github.ref_name == github.event.repository.default_branch }}
-    - uses: dorny/paths-filter@v3
-      id: filter
-      with:
-        filters: .github/change-filters.yml
+      - uses: actions/checkout@v4
+      - name: Override label
+        id: override
+        run: |
+          echo "Label contains run-ci-checks: $OVERRIDE_LABEL"
+          if [ "$OVERRIDE_LABEL" == "true" ]; then
+            echo "Overriding due to label 'run-ci-checks'"
+            echo "out=true" >> $GITHUB_OUTPUT
+          elif [ "$DEFAULT_BRANCH" == "true" ]; then
+            echo "Overriding due to running on the default branch"
+            echo "out=true" >> $GITHUB_OUTPUT
+          fi
+        env:
+          OVERRIDE_LABEL: ${{ github.event_name == 'pull_request' && contains( github.event.pull_request.labels.*.name, 'run-ci-checks') }}
+          DEFAULT_BRANCH: ${{ github.ref_name == github.event.repository.default_branch }}
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: .github/change-filters.yml
 
   check:
     needs: changes
@@ -109,7 +108,7 @@ jobs:
       - name: Override criterion with the CodSpeed harness
         run: cargo add --dev codspeed-criterion-compat --rename criterion --package hugr
       - name: Build benchmarks
-        run: cargo codspeed build --profile bench --features extension_inference,declarative,model_unstable,llvm,llvm-test
+        run: cargo codspeed build --profile bench --features declarative,model_unstable,llvm,llvm-test
       - name: Run benchmarks
         uses: CodSpeedHQ/action@v3
         with:

.pre-commit-config.yaml

@@ -79,7 +79,7 @@ repos:
           # built into a binary build (without using `maturin`)
           #
           # This feature list should be kept in sync with the `hugr-py/pyproject.toml`
-        entry: cargo test --workspace --exclude 'hugr-py' --features 'hugr/extension_inference hugr/declarative hugr/model_unstable hugr/llvm hugr/llvm-test hugr/zstd'
+        entry: cargo test --workspace --exclude 'hugr-py' --features 'hugr/declarative hugr/model_unstable hugr/llvm hugr/llvm-test hugr/zstd'
         language: system
         files: \.rs$
         pass_filenames: false
@@ -100,10 +100,7 @@ repos:
       - id: py-test
         name: pytest
         description: Run python tests
-        # We need to rebuild `hugr-cli` without the `extension_inference` feature
-        # to avoid test errors.
-        # TODO: Remove this once the issue is fixed.
-        entry: sh -c "cargo build -p hugr-cli && uv run pytest"
+        entry: sh -c "uv run pytest"
         language: system
         files: \.py$
         pass_filenames: false

hugr-core/Cargo.toml

@@ -17,7 +17,6 @@ categories = ["compilers"]
 workspace = true
 
 [features]
-extension_inference = []
 declarative = ["serde_yaml"]
 model_unstable = ["hugr-model"]
 zstd = ["dep:zstd"]

hugr-core/README.md

@@ -1,7 +1,6 @@
 ![](/hugr/assets/hugr_logo.svg)
 
-hugr-core
-===============
+# hugr-core
 
 [![build_status][]](https://github.com/CQCL/hugr/actions)
 [![crates][]](https://crates.io/crates/hugr-core)
@@ -15,10 +14,6 @@ Please read the [API documentation here][].
 
 ## Experimental Features
 
-- `extension_inference`:
-  Experimental feature which allows automatic inference of which extra extensions
-  are required at runtime by a HUGR when validating it.
-  Not enabled by default.
 - `declarative`:
   Experimental support for declaring extensions in YAML files, support is limited.
 - `model_unstable`
@@ -38,10 +33,10 @@ See [DEVELOPMENT.md](https://github.com/CQCL/hugr/blob/main/DEVELOPMENT.md) for
 
 This project is licensed under Apache License, Version 2.0 ([LICENSE][] or http://www.apache.org/licenses/LICENSE-2.0).
 
-  [API documentation here]: https://docs.rs/hugr-core/
-  [build_status]: https://github.com/CQCL/hugr/actions/workflows/ci-rs.yml/badge.svg?branch=main
-  [msrv]: https://img.shields.io/badge/rust-1.75.0%2B-blue.svg
-  [crates]: https://img.shields.io/crates/v/hugr-core
-  [codecov]: https://img.shields.io/codecov/c/gh/CQCL/hugr?logo=codecov
-  [LICENSE]: https://github.com/CQCL/hugr/blob/main/LICENCE
-  [CHANGELOG]: https://github.com/CQCL/hugr/blob/main/hugr-core/CHANGELOG.md
+[API documentation here]: https://docs.rs/hugr-core/
+[build_status]: https://github.com/CQCL/hugr/actions/workflows/ci-rs.yml/badge.svg?branch=main
+[msrv]: https://img.shields.io/badge/rust-1.75.0%2B-blue.svg
+[crates]: https://img.shields.io/crates/v/hugr-core
+[codecov]: https://img.shields.io/codecov/c/gh/CQCL/hugr?logo=codecov
+[LICENSE]: https://github.com/CQCL/hugr/blob/main/LICENCE
+[CHANGELOG]: https://github.com/CQCL/hugr/blob/main/hugr-core/CHANGELOG.md

hugr-core/src/builder.rs

@@ -42,7 +42,7 @@
 //!     let _dfg_handle = {
 //!         let mut dfg = module_builder.define_function(
 //!             "main",
-//!             Signature::new_endo(bool_t()).with_extension_delta(logic::EXTENSION_ID),
+//!             Signature::new_endo(bool_t()),
 //!         )?;
 //!
 //!         // Get the wires from the function inputs.
@@ -59,8 +59,7 @@
 //!     let _circuit_handle = {
 //!         let mut dfg = module_builder.define_function(
 //!             "circuit",
-//!             Signature::new_endo(vec![bool_t(), bool_t()])
-//!                 .with_extension_delta(logic::EXTENSION_ID),
+//!             Signature::new_endo(vec![bool_t(), bool_t()]),
 //!         )?;
 //!         let mut circuit = dfg.as_circuit(dfg.input_wires());
 //!
@@ -89,7 +88,7 @@
 use thiserror::Error;
 
 use crate::extension::simple_op::OpLoadError;
-use crate::extension::{SignatureError, TO_BE_INFERRED};
+use crate::extension::SignatureError;
 use crate::hugr::ValidationError;
 use crate::ops::handle::{BasicBlockID, CfgID, ConditionalID, DfgID, FuncID, TailLoopID};
 use crate::ops::{NamedOp, OpType};
@@ -123,16 +122,14 @@ pub use conditional::{CaseBuilder, ConditionalBuilder};
 mod circuit;
 pub use circuit::{CircuitBuildError, CircuitBuilder};
 
-/// Return a FunctionType with the same input and output types (specified)
-/// whose extension delta, when used in a non-FuncDefn container, will be inferred.
+/// Return a FunctionType with the same input and output types (specified).
 pub fn endo_sig(types: impl Into<TypeRow>) -> Signature {
-    Signature::new_endo(types).with_extension_delta(TO_BE_INFERRED)
+    Signature::new_endo(types)
 }
 
-/// Return a FunctionType with the specified input and output types
-/// whose extension delta, when used in a non-FuncDefn container, will be inferred.
+/// Return a FunctionType with the specified input and output types.
 pub fn inout_sig(inputs: impl Into<TypeRow>, outputs: impl Into<TypeRow>) -> Signature {
-    Signature::new(inputs, outputs).with_extension_delta(TO_BE_INFERRED)
+    Signature::new(inputs, outputs)
 }
 
 #[derive(Debug, Clone, PartialEq, Error)]

hugr-core/src/builder/build_traits.rs

@@ -20,7 +20,7 @@ use crate::{
     types::EdgeKind,
 };
 
-use crate::extension::{ExtensionRegistry, ExtensionSet, TO_BE_INFERRED};
+use crate::extension::ExtensionRegistry;
 use crate::types::{PolyFuncType, Signature, Type, TypeArg, TypeRow};
 
 use itertools::Itertools;
@@ -319,18 +319,14 @@ pub trait Dataflow: Container {
         inputs: impl IntoIterator<Item = (Type, Wire)>,
     ) -> Result<DFGBuilder<&mut Hugr>, BuildError> {
         let (types, input_wires): (Vec<Type>, Vec<Wire>) = inputs.into_iter().unzip();
-        self.dfg_builder(
-            Signature::new_endo(types).with_extension_delta(TO_BE_INFERRED),
-            input_wires,
-        )
+        self.dfg_builder(Signature::new_endo(types), input_wires)
     }
 
     /// Return a builder for a [`crate::ops::CFG`] node,
     /// i.e. a nested controlflow subgraph.
     /// The `inputs` must be an iterable over pairs of the type of the input and
     /// the corresponding wire.
     /// The `output_types` are the types of the outputs.
-    /// The Extension delta will be inferred.
     ///
     /// # Errors
     ///
@@ -340,27 +336,6 @@ pub trait Dataflow: Container {
         &mut self,
         inputs: impl IntoIterator<Item = (Type, Wire)>,
         output_types: TypeRow,
-    ) -> Result<CFGBuilder<&mut Hugr>, BuildError> {
-        self.cfg_builder_exts(inputs, output_types, TO_BE_INFERRED)
-    }
-
-    /// Return a builder for a [`crate::ops::CFG`] node,
-    /// i.e. a nested controlflow subgraph.
-    /// The `inputs` must be an iterable over pairs of the type of the input and
-    /// the corresponding wire.
-    /// The `output_types` are the types of the outputs.
-    /// `extension_delta` is explicitly specified. Alternatively
-    /// [cfg_builder](Self::cfg_builder) may be used to infer it.
-    ///
-    /// # Errors
-    ///
-    /// This function will return an error if there is an error when building
-    /// the CFG node.
-    fn cfg_builder_exts(
-        &mut self,
-        inputs: impl IntoIterator<Item = (Type, Wire)>,
-        output_types: TypeRow,
-        extension_delta: impl Into<ExtensionSet>,
     ) -> Result<CFGBuilder<&mut Hugr>, BuildError> {
         let (input_types, input_wires): (Vec<Type>, Vec<Wire>) = inputs.into_iter().unzip();
 
@@ -369,8 +344,7 @@ pub trait Dataflow: Container {
         let (cfg_node, _) = add_node_with_wires(
             self,
             ops::CFG {
-                signature: Signature::new(inputs.clone(), output_types.clone())
-                    .with_extension_delta(extension_delta),
+                signature: Signature::new(inputs.clone(), output_types.clone()),
             },
             input_wires,
         )?;
@@ -449,7 +423,6 @@ pub trait Dataflow: Container {
     /// The `inputs` must be an iterable over pairs of the type of the input and
     /// the corresponding wire.
     /// The `output_types` are the types of the outputs.
-    /// The extension delta will be inferred.
     ///
     /// # Errors
     ///
@@ -461,27 +434,6 @@ pub trait Dataflow: Container {
         just_inputs: impl IntoIterator<Item = (Type, Wire)>,
         inputs_outputs: impl IntoIterator<Item = (Type, Wire)>,
         just_out_types: TypeRow,
-    ) -> Result<TailLoopBuilder<&mut Hugr>, BuildError> {
-        self.tail_loop_builder_exts(just_inputs, inputs_outputs, just_out_types, TO_BE_INFERRED)
-    }
-
-    /// Return a builder for a [`crate::ops::TailLoop`] node.
-    /// The `inputs` must be an iterable over pairs of the type of the input and
-    /// the corresponding wire.
-    /// The `output_types` are the types of the outputs.
-    /// `extension_delta` explicitly specified. Alternatively
-    /// [tail_loop_builder](Self::tail_loop_builder) may be used to infer it.
-    ///
-    /// # Errors
-    ///
-    /// This function will return an error if there is an error when building
-    /// the [`ops::TailLoop`] node.
-    fn tail_loop_builder_exts(
-        &mut self,
-        just_inputs: impl IntoIterator<Item = (Type, Wire)>,
-        inputs_outputs: impl IntoIterator<Item = (Type, Wire)>,
-        just_out_types: TypeRow,
-        extension_delta: impl Into<ExtensionSet>,
     ) -> Result<TailLoopBuilder<&mut Hugr>, BuildError> {
         let (input_types, mut input_wires): (Vec<Type>, Vec<Wire>) =
             just_inputs.into_iter().unzip();
@@ -493,7 +445,6 @@ pub trait Dataflow: Container {
             just_inputs: input_types.into(),
             just_outputs: just_out_types,
             rest: rest_types.into(),
-            extension_delta: extension_delta.into(),
         };
         // TODO: Make input extensions a parameter
         let (loop_node, _) = add_node_with_wires(self, tail_loop.clone(), input_wires)?;
@@ -507,41 +458,17 @@ pub trait Dataflow: Container {
     ///
     /// The `other_inputs` must be an iterable over pairs of the type of the input and
     /// the corresponding wire.
-    /// The `output_types` are the types of the outputs. Extension delta will be inferred.
-    ///
-    /// # Errors
-    ///
-    /// This function will return an error if there is an error when building
-    /// the Conditional node.
-    fn conditional_builder(
-        &mut self,
-        sum_input: (impl IntoIterator<Item = TypeRow>, Wire),
-        other_inputs: impl IntoIterator<Item = (Type, Wire)>,
-        output_types: TypeRow,
-    ) -> Result<ConditionalBuilder<&mut Hugr>, BuildError> {
-        self.conditional_builder_exts(sum_input, other_inputs, output_types, TO_BE_INFERRED)
-    }
-
-    /// Return a builder for a [`crate::ops::Conditional`] node.
-    /// `sum_rows` and `sum_wire` define the type of the Sum
-    /// variants and the wire carrying the Sum respectively.
-    ///
-    /// The `other_inputs` must be an iterable over pairs of the type of the input and
-    /// the corresponding wire.
     /// The `output_types` are the types of the outputs.
-    /// `extension_delta` is explicitly specified. Alternatively
-    /// [conditional_builder](Self::conditional_builder) may be used to infer it.
     ///
     /// # Errors
     ///
     /// This function will return an error if there is an error when building
     /// the Conditional node.
-    fn conditional_builder_exts(
+    fn conditional_builder(
         &mut self,
         (sum_rows, sum_wire): (impl IntoIterator<Item = TypeRow>, Wire),
         other_inputs: impl IntoIterator<Item = (Type, Wire)>,
         output_types: TypeRow,
-        extension_delta: impl Into<ExtensionSet>,
     ) -> Result<ConditionalBuilder<&mut Hugr>, BuildError> {
         let mut input_wires = vec![sum_wire];
         let (input_types, rest_input_wires): (Vec<Type>, Vec<Wire>) =
@@ -558,7 +485,6 @@ pub trait Dataflow: Container {
                 sum_rows,
                 other_inputs: inputs,
                 outputs: output_types,
-                extension_delta: extension_delta.into(),
             },
             input_wires,
         )?;