From a167e8a1eeab4b54993cd9f20547f4cc554746c2 Mon Sep 17 00:00:00 2001 From: Seyon Sivarajah Date: Thu, 5 Sep 2024 16:32:00 +0100 Subject: [PATCH] use angle op building --- tket2-hseries/src/extension/hseries/lower.rs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/tket2-hseries/src/extension/hseries/lower.rs b/tket2-hseries/src/extension/hseries/lower.rs index 4fd0ba48..8d4988ee 100644 --- a/tket2-hseries/src/extension/hseries/lower.rs +++ b/tket2-hseries/src/extension/hseries/lower.rs @@ -8,7 +8,7 @@ use hugr::{ }; use itertools::Either; use thiserror::Error; -use tket2::{extension::angle::AngleOp, Tk2Op}; +use tket2::{extension::angle::AngleOpBuilder, Tk2Op}; use crate::extension::hseries::{HSeriesOp, HSeriesOpBuilder}; @@ -22,15 +22,6 @@ fn const_f64(builder: &mut impl Dataflow, value: f64) -> Wire { builder.add_load_const(ops::Const::new(ConstF64::new(value).into())) } -fn atorad(builder: &mut impl Dataflow, angle: Wire) -> Wire { - builder - .add_dataflow_op(AngleOp::atorad, [angle]) - .unwrap() - .outputs() - .next() - .unwrap() -} - /// Errors produced by the [`op_to_hugr`] function. #[derive(Debug, Error)] #[error(transparent)] @@ -62,19 +53,19 @@ fn op_to_hugr(op: Tk2Op) -> Result { (Tk2Op::CY, [c, t]) => b.build_cy(*c, *t)?.into(), (Tk2Op::CZ, [c, t]) => b.build_cz(*c, *t)?.into(), (Tk2Op::Rx, [q, angle]) => { - let float = atorad(&mut b, *angle); + let float = b.add_atorad(*angle)?; vec![b.build_rx(*q, float)?] } (Tk2Op::Ry, [q, angle]) => { - let float = atorad(&mut b, *angle); + let float = b.add_atorad(*angle)?; vec![b.build_ry(*q, float)?] } (Tk2Op::Rz, [q, angle]) => { - let float = atorad(&mut b, *angle); + let float = b.add_atorad(*angle)?; vec![b.add_rz(*q, float)?] } (Tk2Op::CRz, [c, t, angle]) => { - let float = atorad(&mut b, *angle); + let float = b.add_atorad(*angle)?; b.build_crz(*c, *t, float)?.into() } (Tk2Op::Toffoli, [a, b_, c]) => b.build_toffoli(*a, *b_, *c)?.into(),