fix: Fixes from integration tests - rotation codegen, array results, process environment management (#1)

* Add rotation codegen extension to selene-hugr-qis-compiler

* Coerce array results to lists (rather than tuples) for compatibility with HUGR result handling

* When spawning a selene process, append to the host environment paths rather than replacing it.

* Update guppy test to take into account new list format of parsed array results

* Further update guppy test to take into account new list format of parsed array results

* Remove unnecessary QIS prelude codegen clone when creating the RotationCodegenExtension

Author: jake-arkinstall

selene-compilers/hugr_qis/rust/lib.rs

@@ -27,13 +27,15 @@ use std::rc::Rc;
 use std::vec::Vec;
 use std::{fs, str, vec};
 use tket2::extension::TKET2_EXTENSION;
+use tket2::extension::rotation::ROTATION_EXTENSION;
 use tket2::hugr::extension::{ExtensionRegistry, prelude};
 use tket2::hugr::std_extensions::arithmetic::{
     conversions, float_ops, float_types, int_ops, int_types,
 };
 use tket2::hugr::std_extensions::{collections, logic, ptr};
 use tket2::hugr::{self, llvm::inkwell};
 use tket2::hugr::{Hugr, HugrView, Node};
+use tket2::llvm::rotation::RotationCodegenExtension;
 use tket2_hseries::QSystemPass;
 use tket2_hseries::extension::{futures as qsystem_futures, qsystem, result as qsystem_result};
 pub use tket2_hseries::llvm::futures::FuturesCodegenExtension;
@@ -67,6 +69,7 @@ static REGISTRY: std::sync::LazyLock<ExtensionRegistry> = std::sync::LazyLock::n
         qsystem_futures::EXTENSION.to_owned(),
         qsystem_result::EXTENSION.to_owned(),
         qsystem::EXTENSION.to_owned(),
+        ROTATION_EXTENSION.to_owned(),
         TKET2_EXTENSION.to_owned(),
         tket2::extension::bool::BOOL_EXTENSION.to_owned(),
         tket2::extension::debug::DEBUG_EXTENSION.to_owned(),
@@ -144,9 +147,10 @@ fn codegen_extensions() -> CodegenExtsMap<'static, Hugr> {
         .add_extension(ArrayCodegenExtension::new(DefaultArrayCodegen))
         .add_default_static_array_extensions()
         .add_extension(FuturesCodegenExtension)
-        .add_extension(QSystemCodegenExtension::from(pcg))
+        .add_extension(QSystemCodegenExtension::from(pcg.clone()))
         .add_extension(RandomCodegenExtension)
         .add_extension(ResultsCodegenExtension)
+        .add_extension(RotationCodegenExtension::new(pcg))
         .add_extension(UtilsCodegenExtension)
         .add_extension(DebugCodegenExtension)
         .finish()

selene-sim/python/selene_sim/instance.py

@@ -85,17 +85,19 @@ def get_environment(self) -> dict:
         Get the environment variables for the process.
         """
         env = os.environ.copy()
+        additional_dirs = os.pathsep.join(str(p) for p in self.library_search_dirs)
+        path_name = ""
         match platform.system():
             case "Linux":
-                env["LD_LIBRARY_PATH"] = os.pathsep.join(
-                    str(p) for p in self.library_search_dirs
-                )
+                path_name = "LD_LIBRARY_PATH"
             case "Darwin":
-                env["DYLD_LIBRARY_PATH"] = os.pathsep.join(
-                    str(p) for p in self.library_search_dirs
-                )
+                path_name = "DYLD_LIBRARY_PATH"
             case "Windows":
-                env["PATH"] = os.pathsep.join(str(p) for p in self.library_search_dirs)
+                path_name = "PATH"
+        if path_name in env:
+            env[path_name] += os.pathsep + additional_dirs
+        else:
+            env[path_name] = additional_dirs
         return env
 
     def spawn(self):

selene-sim/python/selene_sim/result_handling/result_stream.py

@@ -105,25 +105,25 @@ def _parse_row(self) -> tuple[Any, ...]:
                         res.append(val)
                     case (self.UINT_TAG, sz):
                         vals = unpack(f"{sz}Q", self.get_chunk(sz * 8))
-                        res.append(vals)
+                        res.append(list(vals))
                     case (self.INT_TAG, 0):
                         (val,) = unpack("q", self.get_chunk(8))
                         res.append(val)
                     case (self.INT_TAG, sz):
                         vals = unpack(f"{sz}q", self.get_chunk(sz * 8))
-                        res.append(vals)
+                        res.append(list(vals))
                     case (self.FLT_TAG, 0):
                         (val,) = unpack("d", self.get_chunk(8))
                         res.append(val)
                     case (self.FLT_TAG, sz):
                         vals = unpack(f"{sz}d", self.get_chunk(sz * 8))
-                        res.append(vals)
+                        res.append(list(vals))
                     case (self.BIT_TAG, 0):
                         (val,) = unpack("B", self.get_chunk(1))
                         res.append(val)
                     case (self.BIT_TAG, sz):
                         vals = unpack(f"{sz}B", self.get_chunk(sz))
-                        res.append(vals)
+                        res.append(list(vals))
                     case (self.STR_TAG, sz):
                         val = self.get_chunk(sz).decode("utf-8")
                         res.append(val)

selene-sim/python/tests/test_guppy.py

@@ -105,9 +105,9 @@ def main() -> None:
 
     runner = build(guppy.compile(main), "flip_n4_arr")
     expected = {
-        "cs": (1, 0, 1, 1, 0, 0, 0, 0, 0, 1),
-        "is": tuple(range(100)),
-        "fs": tuple(i * 0.0625 for i in range(100)),
+        "cs": [1, 0, 1, 1, 0, 0, 0, 0, 0, 1],
+        "is": list(range(100)),
+        "fs": list(i * 0.0625 for i in range(100)),
     }
 
     # run the simulation on Quest and Stim