Merge 'origin/main' into 'lm/emptycommit'

Author: acl-cqc

.github/change-filters.yml

@@ -24,6 +24,7 @@ rust: &rust
   - "hugr-cli/**"
   - "hugr-core/**"
   - "hugr-passes/**"
+  - "hugr-persistent/**"
   - "specification/schema/**"
 
 std-extensions:

.github/workflows/ci-rs.yml

@@ -19,6 +19,7 @@ env:
   CI: true # insta snapshots behave differently on ci
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
+  HUGR_TEST_SCHEMA: "1"
   # different strings for install action and feature name
   # adapted from https://github.com/TheDan64/inkwell/blob/master/.github/workflows/test.yml
   LLVM_VERSION: "14.0"

.github/workflows/release-please.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - main
+      - release/*
 
 permissions:
   contents: write
@@ -21,3 +22,4 @@ jobs:
             # Using a personal access token so releases created by this workflow can trigger the deployment workflow
             token: ${{ secrets.HUGRBOT_PAT }}
             config-file: release-please-config.json
+            target-branch: ${{ github.ref_name }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    "hugr-py": "0.12.2"
+    "hugr-py": "0.12.4"
 }

hugr-core/src/envelope/package_json.rs

@@ -56,6 +56,20 @@ pub(super) fn to_json_writer<'h>(
         modules: hugrs.into_iter().map(HugrSer).collect(),
         extensions: extensions.iter().map(std::convert::AsRef::as_ref).collect(),
     };
+
+    // Validate the hugr serializations against the schema.
+    //
+    // NOTE: The schema definition is currently broken, so this check always succeeds.
+    // See <https://github.com/CQCL/hugr/issues/2401>
+    #[cfg(all(test, not(miri)))]
+    if std::env::var("HUGR_TEST_SCHEMA").is_ok_and(|x| !x.is_empty()) {
+        use crate::hugr::serialize::test::check_hugr_serialization_schema;
+
+        for hugr in &pkg_ser.modules {
+            check_hugr_serialization_schema(hugr.0);
+        }
+    }
+
     serde_json::to_writer(writer, &pkg_ser)?;
     Ok(())
 }

hugr-core/src/hugr/serialize/test.rs

@@ -175,6 +175,21 @@ fn ser_roundtrip_check_schema<TSer: Serialize, TDeser: serde::de::DeserializeOwn
     serde_json::from_value(val).unwrap()
 }
 
+/// Serialize a Hugr and check that it is valid against the schema.
+///
+/// NOTE: The schema definition is currently broken, so this check always succeeds.
+/// See <https://github.com/CQCL/hugr/issues/2401>
+///
+/// # Panics
+///
+/// Panics if the serialization fails or if the schema validation fails.
+pub(crate) fn check_hugr_serialization_schema(hugr: &Hugr) {
+    let schemas = get_schemas(true);
+    let hugr_ser = HugrSer(hugr);
+    let val = serde_json::to_value(hugr_ser).unwrap();
+    NamedSchema::check_schemas(&val, schemas);
+}
+
 /// Serialize and deserialize a HUGR, and check that the result is the same as the original.
 ///
 /// If `check_schema` is true, checks the serialized json against the in-tree schema.

hugr-core/src/std_extensions.rs

@@ -21,6 +21,7 @@ pub fn std_reg() -> ExtensionRegistry {
         arithmetic::float_types::EXTENSION.to_owned(),
         collections::array::EXTENSION.to_owned(),
         collections::list::EXTENSION.to_owned(),
+        collections::borrow_array::EXTENSION.to_owned(),
         collections::static_array::EXTENSION.to_owned(),
         collections::value_array::EXTENSION.to_owned(),
         logic::EXTENSION.to_owned(),

hugr-core/src/std_extensions/collections.rs

@@ -1,6 +1,7 @@
 //! List type and operations.
 
 pub mod array;
+pub mod borrow_array;
 pub mod list;
 pub mod static_array;
 pub mod value_array;

hugr-core/src/std_extensions/collections/array.rs

@@ -223,7 +223,7 @@ pub trait ArrayOpBuilder: GenericArrayOpBuilder {
         self.add_generic_array_unpack::<Array>(elem_ty, size, input)
     }
     /// Adds an array clone operation to the dataflow graph and return the wires
-    /// representing the originala and cloned array.
+    /// representing the original and cloned array.
     ///
     /// # Arguments
     ///

hugr-core/src/std_extensions/collections/array/array_clone.rs

@@ -194,6 +194,7 @@ mod tests {
 
     use crate::extension::prelude::bool_t;
     use crate::std_extensions::collections::array::Array;
+    use crate::std_extensions::collections::borrow_array::BorrowArray;
     use crate::{
         extension::prelude::qb_t,
         ops::{OpTrait, OpType},
@@ -203,6 +204,7 @@ mod tests {
 
     #[rstest]
     #[case(Array)]
+    #[case(BorrowArray)]
     fn test_clone_def<AK: ArrayKind>(#[case] _kind: AK) {
         let op = GenericArrayClone::<AK>::new(bool_t(), 2).unwrap();
         let optype: OpType = op.clone().into();
@@ -217,6 +219,7 @@ mod tests {
 
     #[rstest]
     #[case(Array)]
+    #[case(BorrowArray)]
     fn test_clone<AK: ArrayKind>(#[case] _kind: AK) {
         let size = 2;
         let element_ty = bool_t();