Address comments

pyrs/Cargo.toml

@@ -18,3 +18,4 @@ tket-json-rs = { git = "https://github.com/CQCL/tket-json-rs", rev="619db15d3",
 quantinuum-hugr = { workspace = true }
 portgraph = { workspace = true, features = ["pyo3"] }
 pyo3 = { workspace = true, features = ["extension-module"] }
+itertools.workspace = true

pyrs/src/lib.rs

@@ -1,11 +1,13 @@
 //! Python bindings for TKET2.
 #![warn(missing_docs)]
 use circuit::{add_circuit_module, try_with_hugr};
+use optimiser::add_optimiser_module;
 use pyo3::prelude::*;
-use tket2::{json::TKETDecode, optimiser::taso, passes::apply_greedy_commutation};
+use tket2::{json::TKETDecode, passes::apply_greedy_commutation};
 use tket_json_rs::circuit_json::SerialCircuit;
 
 mod circuit;
+mod optimiser;
 
 #[pyfunction]
 fn greedy_depth_reduce(py_c: PyObject) -> PyResult<(PyObject, u32)> {
@@ -55,11 +57,3 @@ fn add_pass_module(py: Python, parent: &PyModule) -> PyResult<()> {
     parent.add_submodule(m)?;
     Ok(())
 }
-
-/// circuit optimisation module
-fn add_optimiser_module(py: Python, parent: &PyModule) -> PyResult<()> {
-    let m = PyModule::new(py, "optimiser")?;
-    m.add_class::<taso::pyo3::PyDefaultTasoOptimiser>()?;
-
-    parent.add_submodule(m)
-}

src/optimiser.rs

@@ -6,4 +6,4 @@ pub mod taso;
 
 #[cfg(feature = "portmatching")]
 pub use taso::DefaultTasoOptimiser;
-pub use taso::TasoOptimiser;
+pub use taso::{TasoLogger, TasoOptimiser};

src/optimiser/taso.rs

@@ -16,13 +16,12 @@ mod hugr_hash_set;
 mod hugr_pchannel;
 mod hugr_pqueue;
 pub mod log;
-#[cfg(all(feature = "pyo3", feature = "portmatching"))]
-pub mod pyo3;
 mod qtz_circuit;
 mod worker;
 
 use crossbeam_channel::select;
 pub use eq_circ_class::{load_eccs_json_file, EqCircClass};
+pub use log::TasoLogger;
 
 use std::num::NonZeroUsize;
 use std::time::{Duration, Instant};
@@ -37,8 +36,6 @@ use crate::optimiser::taso::worker::TasoWorker;
 use crate::rewrite::strategy::RewriteStrategy;
 use crate::rewrite::Rewriter;
 
-use self::log::TasoLogger;
-
 /// The TASO optimiser.
 ///
 /// Adapted from [Quartz][], and originally [TASO][].

src/portmatching/pyo3.rs

@@ -4,15 +4,16 @@ use std::fmt;
 
 use derive_more::{From, Into};
 use hugr::hugr::views::sibling_subgraph::PyInvalidReplacementError;
-use hugr::Port;
+use hugr::{Hugr, Port};
 use itertools::Itertools;
 use portmatching::{HashMap, PatternID};
 use pyo3::{prelude::*, types::PyIterator};
+use tket_json_rs::circuit_json::SerialCircuit;
 
 use super::{CircuitPattern, PatternMatch, PatternMatcher};
 use crate::circuit::Circuit;
+use crate::json::TKETDecode;
 use crate::rewrite::CircuitRewrite;
-use crate::utils::pyobj_as_hugr;
 
 #[pymethods]
 impl CircuitPattern {
@@ -195,3 +196,9 @@ impl Node {
         format!("{:?}", self)
     }
 }
+
+fn pyobj_as_hugr(circ: PyObject) -> PyResult<Hugr> {
+    let ser_c = SerialCircuit::_from_tket1(circ);
+    let hugr: Hugr = ser_c.decode()?;
+    Ok(hugr)
+}

src/utils.rs

@@ -13,24 +13,6 @@ pub(crate) fn type_is_linear(typ: &Type) -> bool {
     !TypeBound::Copyable.contains(typ.least_upper_bound())
 }
 
-// Convert a pytket object to HUGR
-#[cfg(feature = "pyo3")]
-mod pyo3 {
-    use hugr::Hugr;
-    use pyo3::prelude::*;
-    use tket_json_rs::circuit_json::SerialCircuit;
-
-    use crate::json::TKETDecode;
-
-    pub(crate) fn pyobj_as_hugr(circ: PyObject) -> PyResult<Hugr> {
-        let ser_c = SerialCircuit::_from_tket1(circ);
-        let hugr: Hugr = ser_c.decode()?;
-        Ok(hugr)
-    }
-}
-#[cfg(feature = "pyo3")]
-pub(crate) use self::pyo3::pyobj_as_hugr;
-
 // utility for building simple qubit-only circuits.
 #[allow(unused)]
 pub(crate) fn build_simple_circuit(