Skip to content

Move ParameterVector to Rust #16228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakelishman wants to merge 1 commit into
base: main
Choose a base branch
from
+656 −734
Open

Move ParameterVector to Rust #16228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/cext/src/param.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub unsafe extern "C" fn qk_param_new_symbol(name: *const c_char) -> *mut Param
// Per documentation, the name cannot be empty.
panic!("Invalid empty name.");
} else {
let symbol = Symbol::new(name, None, None);
let symbol = Symbol::standalone(name.to_owned(), None);
let expr = ParameterExpression::from_symbol(symbol);
let param = Param::ParameterExpression(Arc::new(expr));
Box::into_raw(Box::new(param))
Expand Down
18 changes: 9 additions & 9 deletions crates/cext/src/transpiler/passes/unitary_synthesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,15 @@ mod tests {
)
.unwrap();
let params = Some(Parameters::Params(smallvec![
Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(Symbol::new(
"ϴ", None, None,
)))),
Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(Symbol::new(
"φ", None, None,
)))),
Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(Symbol::new(
"λ", None, None,
)))),
Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(
Symbol::standalone("ϴ".to_owned(), None)
))),
Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(
Symbol::standalone("φ".to_owned(), None)
))),
Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(
Symbol::standalone("λ".to_owned(), None)
))),
]));
target
.add_instruction(
Expand Down
2 changes: 1 addition & 1 deletion crates/cext/src/transpiler/target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ impl TargetEntry {
.map(|i| {
let op_name = operation.name();
Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(
Symbol::new(format!("{op_name}_param_{i}").as_str(), None, None),
Symbol::standalone(format!("{op_name}_param_{i}"), None),
)))
})
.collect(),
Expand Down
15 changes: 8 additions & 7 deletions crates/circuit/src/circuit_drawer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2082,7 +2082,7 @@ c2: 2/══════════
let mut circuit = basic_circuit();
circuit
.set_global_phase_param(Param::ParameterExpression(Arc::new(
ParameterExpression::from_symbol(Symbol::new("ϕ", None, None)),
ParameterExpression::from_symbol(Symbol::standalone("ϕ".to_owned(), None)),
)))
.unwrap();
let result = draw_circuit(&circuit, true, false, Some(80)).unwrap();
Expand Down Expand Up @@ -2112,7 +2112,7 @@ c2: 2/══════════
];
let mut circuit = CircuitData::new(Some(qubits), None, Param::Float(0.0)).unwrap();
let param = Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(
Symbol::new("a", None, None),
Symbol::standalone("a".to_owned(), None),
)));
circuit
.push_standard_gate(StandardGate::RXX, &[param], &[Qubit(0), Qubit(1)])
Expand Down Expand Up @@ -2276,7 +2276,7 @@ c_3: ═════════════════════════
];
let mut circuit = CircuitData::new(Some(qubits), None, Param::Float(0.0)).unwrap();
let param = Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(
Symbol::new("ϕ", None, None),
Symbol::standalone("ϕ".to_owned(), None),
)));
circuit
.push_standard_gate(StandardGate::RXX, &[param], &[Qubit(0), Qubit(1)])
Expand Down Expand Up @@ -2311,7 +2311,7 @@ q_1: ┤1 ├┤1 ├┤1 ├
];
let mut circuit = CircuitData::new(Some(qubits), None, Param::Float(0.0)).unwrap();
let param = Param::ParameterExpression(Arc::new(ParameterExpression::from_symbol(
Symbol::new("🎩", None, None),
Symbol::standalone("🎩".to_owned(), None),
)));
circuit
.push_standard_gate(StandardGate::RY, std::slice::from_ref(&param), &[Qubit(1)])
Expand Down Expand Up @@ -2360,7 +2360,7 @@ q_1: ┤ Ry(🎩) ├┤1 ├─┤ 💶🔉(🎩) ├─┤1
.push_standard_gate(StandardGate::RX, &[Param::Float(123.4567)], &[Qubit(0)])
.unwrap();

let expr = ParameterExpression::from_symbol(Symbol::new("ϕ", None, None))
let expr = ParameterExpression::from_symbol(Symbol::standalone("ϕ".to_owned(), None))
.mul(&ParameterExpression::from_f64(1.23456))
.unwrap();
let param = Param::ParameterExpression(Arc::new(expr));
Expand Down Expand Up @@ -2493,8 +2493,9 @@ q_1: ┤ Rz(1.2346e8) ├┤ Rx(0.12346) ├┤ Rx(1.2346e-5) ├┤ Rx(2π/3)
)
.unwrap();

let theta = Arc::new(ParameterExpression::from_symbol(Symbol::new(
"θ", None, None,
let theta = Arc::new(ParameterExpression::from_symbol(Symbol::standalone(
"θ".to_owned(),
None,
)));

circuit
Expand Down
1 change: 1 addition & 0 deletions crates/circuit/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ pub fn circuit(m: &Bound<PyModule>) -> PyResult<()> {
m.add_class::<parameter::parameter_expression::PyParameterExpression>()?;
m.add_class::<parameter::parameter_expression::PyParameter>()?;
m.add_class::<parameter::parameter_expression::PyParameterVectorElement>()?;
m.add_class::<parameter::parameter_expression::PyParameterVector>()?;
m.add_class::<parameter::parameter_expression::OpCode>()?;
m.add_class::<parameter::parameter_expression::OPReplay>()?;
let classical_mod = PyModule::new(m.py(), "classical")?;
Expand Down
6 changes: 1 addition & 5 deletions crates/circuit/src/operations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,7 @@ impl Param {
.getattr(parameters_attr)?
.try_iter()?
.map(|elem| {
let elem = elem?;
let py_param_bound = elem.cast::<PyParameter>()?;
let py_param = py_param_bound.borrow();
let symbol = py_param.symbol();
Ok(symbol.clone())
Ok(Symbol::clone(&elem?.cast_into::<PyParameter>()?.borrow().0))
})
.collect::<PyResult<_>>()?;
Ok(Box::new(collected.into_iter()))
Expand Down
Loading
Loading