From d25f076f2a45d9dda0cb1098721d8a293cc80973 Mon Sep 17 00:00:00 2001 From: jgrusewski Date: Mon, 23 Feb 2026 11:25:31 +0100 Subject: [PATCH] refactor(ml): use canonical DeviceConfig from gpu module in Liquid CfC Replace local DeviceConfig enum definition in liquid/candle_cfc.rs with a re-export from the central crate::gpu::DeviceConfig, eliminating duplication while preserving all existing API and tests. Co-Authored-By: Claude Opus 4.6 --- ml/src/liquid/candle_cfc.rs | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/ml/src/liquid/candle_cfc.rs b/ml/src/liquid/candle_cfc.rs index 4651ec448..516def039 100644 --- a/ml/src/liquid/candle_cfc.rs +++ b/ml/src/liquid/candle_cfc.rs @@ -11,29 +11,8 @@ use serde::{Deserialize, Serialize}; use crate::cuda_compat::manual_sigmoid; use crate::MLError; -/// Device configuration for CfC training -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -pub enum DeviceConfig { - Cpu, - Cuda(usize), - Auto, -} - -impl DeviceConfig { - pub fn resolve(&self) -> Result { - match self { - DeviceConfig::Cpu => Ok(Device::Cpu), - DeviceConfig::Cuda(id) => Device::new_cuda(*id).map_err(|e| { - MLError::ConfigurationError(format!( - "CUDA device {} required but unavailable: {}", - id, e - )) - }), - DeviceConfig::Auto => Device::cuda_if_available(0) - .map_err(|e| MLError::ConfigurationError(format!("Auto device error: {}", e))), - } - } -} +/// Device configuration for CfC training — re-exported from central gpu module. +pub use crate::gpu::DeviceConfig; /// CfC v2 training configuration ///