More pecos-qir cleanup

Author: ciaranra

crates/pecos-qir/src/compiler.rs

@@ -9,4 +9,8 @@ pub mod prelude;
 pub mod runtime;
 pub mod state;
 
+// Internal modules for compilation
+mod qir_compiler;
+mod runtime_builder;
+
 pub use engine::QirEngine;

crates/pecos-qir/src/lib.rs

@@ -29,24 +29,48 @@ pub use macos::*;
 #[must_use]
 pub fn standard_llvm_paths() -> Vec<PathBuf> {
     #[cfg(target_os = "windows")]
-    return windows::WindowsCompiler::standard_llvm_paths();
+    {
+        vec![
+            // CI environment - GitHub Actions might install LLVM here
+            PathBuf::from("D:\\a\\_temp\\llvm\\bin"),
+            // Standard installation paths
+            PathBuf::from("C:\\Program Files\\LLVM\\bin"),
+            PathBuf::from("C:\\Program Files (x86)\\LLVM\\bin"),
+            // Common Windows package manager locations
+            PathBuf::from("C:\\msys64\\mingw64\\bin"),
+            PathBuf::from("C:\\msys64\\usr\\bin"),
+        ]
+    }
 
     #[cfg(target_os = "linux")]
-    return linux::LinuxCompiler::standard_llvm_paths();
+    {
+        vec![
+            PathBuf::from("/usr/bin"),
+            PathBuf::from("/usr/local/bin"),
+            PathBuf::from("/usr/lib/llvm/bin"),
+        ]
+    }
 
     #[cfg(target_os = "macos")]
-    return macos::MacOSCompiler::standard_llvm_paths();
+    {
+        vec![
+            PathBuf::from("/usr/bin"),
+            PathBuf::from("/usr/local/bin"),
+            PathBuf::from("/opt/homebrew/opt/llvm/bin"),
+        ]
+    }
 }
 
 /// Get platform-specific executable name
 #[must_use]
 pub fn executable_name(tool_name: &str) -> String {
     #[cfg(target_os = "windows")]
-    return windows::WindowsCompiler::executable_name(tool_name);
+    {
+        format!("{tool_name}.exe")
+    }
 
-    #[cfg(target_os = "linux")]
-    return linux::LinuxCompiler::executable_name(tool_name);
-
-    #[cfg(target_os = "macos")]
-    return macos::MacOSCompiler::executable_name(tool_name);
+    #[cfg(not(target_os = "windows"))]
+    {
+        tool_name.to_string()
+    }
 }

crates/pecos-qir/src/platform.rs

@@ -1,24 +1,10 @@
 //! Linux-specific implementations for QIR compilation
 
-use std::path::PathBuf;
-
 /// Handle Linux-specific QIR compilation
 pub struct LinuxCompiler;
 
 impl LinuxCompiler {
-    /// Get standard LLVM installation paths for Linux
-    #[must_use]
-    pub fn standard_llvm_paths() -> Vec<PathBuf> {
-        vec![
-            PathBuf::from("/usr/bin"),
-            PathBuf::from("/usr/local/bin"),
-            PathBuf::from("/usr/lib/llvm/bin"),
-        ]
-    }
-
-    /// Get executable name for Linux
-    #[must_use]
-    pub fn executable_name(tool_name: &str) -> String {
-        tool_name.to_string()
-    }
+    // Currently, Linux doesn't require any platform-specific implementations
+    // beyond the common functionality provided in the parent module.
+    // This struct exists for consistency and future extensibility.
 }

crates/pecos-qir/src/platform/linux.rs

@@ -1,34 +1,14 @@
 //! macOS-specific implementations for QIR compilation
 
-use log::{debug, warn};
+use log::debug;
 use pecos_core::errors::PecosError;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::process::Command;
 
 /// Handle macOS-specific QIR compilation
 pub struct MacOSCompiler;
 
 impl MacOSCompiler {
-    /// Log an error with thread ID
-    pub fn log_error(error: PecosError, thread_id: &str) -> PecosError {
-        warn!("QIR Compiler: [Thread {}] {}", thread_id, error);
-        error
-    }
-
-    /// Get standard LLVM installation paths for macOS
-    pub fn standard_llvm_paths() -> Vec<PathBuf> {
-        vec![
-            PathBuf::from("/usr/bin"),
-            PathBuf::from("/usr/local/bin"),
-            PathBuf::from("/opt/homebrew/opt/llvm/bin"),
-        ]
-    }
-
-    /// Get executable name for macOS
-    pub fn executable_name(tool_name: &str) -> String {
-        tool_name.to_string()
-    }
-
     /// Link object file and runtime library into a shared library on macOS
     ///
     /// This method uses `-dynamiclib` instead of `-shared` as required by macOS linker