From 8d9df0a6154fe72aea65fb20da8b2383ba9b987b Mon Sep 17 00:00:00 2001 From: David Mak Date: Tue, 18 Jun 2024 13:59:39 +0800 Subject: [PATCH] artiq: Fix ndarray class ID We want the class ID of the ndarray class, not its corresponding typing class. --- nac3artiq/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nac3artiq/src/lib.rs b/nac3artiq/src/lib.rs index 973ab9cc..7e3825a4 100644 --- a/nac3artiq/src/lib.rs +++ b/nac3artiq/src/lib.rs @@ -899,7 +899,6 @@ impl Nac3 { let builtins_mod = PyModule::import(py, "builtins").unwrap(); let id_fn = builtins_mod.getattr("id").unwrap(); let numpy_mod = PyModule::import(py, "numpy").unwrap(); - let numpy_typing_mod = PyModule::import(py, "numpy.typing").unwrap(); let typing_mod = PyModule::import(py, "typing").unwrap(); let types_mod = PyModule::import(py, "types").unwrap(); @@ -930,7 +929,7 @@ impl Nac3 { float: get_attr_id(builtins_mod, "float"), float64: get_attr_id(numpy_mod, "float64"), list: get_attr_id(builtins_mod, "list"), - ndarray: get_attr_id(numpy_typing_mod, "NDArray"), + ndarray: get_attr_id(numpy_mod, "ndarray"), tuple: get_attr_id(builtins_mod, "tuple"), exception: get_attr_id(builtins_mod, "Exception"), option: get_id(artiq_builtins.get_item("Option").ok().flatten().unwrap()),