trustformers-optim 0.1.0

Optimizers for TrustformeRS
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
//! # Averaged Adam Optimizer (2025)
//!
//! This module implements the Averaged Adam optimizer from "Averaged Adam accelerates
//! stochastic optimization..." (arXiv:2501.06081, January 10, 2025).
//!
//! ## Key Innovation: Polyak-Ruppert Averaging
//!
//! Averaged Adam combines the adaptive learning rate benefits of Adam with the
//! enhanced convergence properties of Polyak-Ruppert averaging. The algorithm
//! maintains both the standard Adam parameters and their averaged versions.
//!
//! ## Algorithm
//!
//! The Averaged Adam update rule:
//! ```text
//! Standard Adam updates:
//! m_t = β1 * m_{t-1} + (1 - β1) * g_t
//! v_t = β2 * v_{t-1} + (1 - β2) * g_t²
//! θ_t = θ_{t-1} - α * m̂_t / (√v̂_t + ε)
//!
//! Polyak-Ruppert averaging:
//! θ̄_t = γ * θ̄_{t-1} + (1 - γ) * θ_t
//! ```
//!
//! Where γ is the averaging coefficient, typically close to 1.0.
//!
//! ## Performance Benefits
//!
//! Research demonstrates superior performance across multiple domains:
//! - Physics-Informed Neural Networks (PINNs)
//! - Deep backward stochastic differential equations
//! - Deep Kolmogorov approximations for PDEs
//! - Optimal control problems
//! - Image classification (ResNet on CIFAR-10)
//!
//! ## Usage Example
//!
//! ```rust,no_run
//! use trustformers_optim::AveragedAdam;
//! use trustformers_core::traits::Optimizer;
//!
//! // Standard configuration
//! let mut optimizer = AveragedAdam::new(
//!     1e-3,           // learning rate
//!     (0.9, 0.999),   // (β1, β2) for momentum
//!     1e-8,           // epsilon
//!     0.01,           // weight decay
//!     0.999,          // averaging coefficient γ
//! );
//!
//! // PINN-optimized configuration
//! let mut pinn_optimizer = AveragedAdam::for_pinn_training();
//!
//! // Use averaged parameters for evaluation
//! optimizer.use_averaged_parameters(true);
//! ```

use crate::common::{OptimizerState, StateMemoryStats};
use crate::traits::StatefulOptimizer;
use std::collections::HashMap;
use trustformers_core::errors::{Result, TrustformersError};
use trustformers_core::tensor::Tensor;
use trustformers_core::traits::Optimizer;

/// Configuration for Averaged Adam optimizer.
#[derive(Debug, Clone)]
pub struct AveragedAdamConfig {
    /// Learning rate (α in the paper)
    pub lr: f32,
    /// Coefficients for computing running averages (β1, β2)
    pub betas: (f32, f32),
    /// Term added for numerical stability (ε in the paper)
    pub eps: f32,
    /// Decoupled weight decay coefficient
    pub weight_decay: f32,
    /// Polyak-Ruppert averaging coefficient (γ)
    pub averaging_coeff: f32,
    /// Whether to use averaged parameters for updates
    pub use_averaged: bool,
    /// Warmup steps before starting averaging
    pub averaging_warmup: usize,
}

impl Default for AveragedAdamConfig {
    fn default() -> Self {
        Self {
            lr: 1e-3,
            betas: (0.9, 0.999),
            eps: 1e-8,
            weight_decay: 0.01,
            averaging_coeff: 0.999,
            use_averaged: false,
            averaging_warmup: 100,
        }
    }
}

/// State for a single parameter in Averaged Adam.
#[derive(Debug, Clone)]
pub struct AveragedAdamParamState {
    /// First moment estimate (momentum)
    pub momentum: Vec<f32>,
    /// Second moment estimate (uncentered variance)
    pub variance: Vec<f32>,
    /// Averaged parameters (Polyak-Ruppert)
    pub averaged_params: Vec<f32>,
}

impl AveragedAdamParamState {
    pub fn new(size: usize) -> Self {
        Self {
            momentum: vec![0.0; size],
            variance: vec![0.0; size],
            averaged_params: vec![0.0; size],
        }
    }

    pub fn memory_usage(&self) -> StateMemoryStats {
        let momentum_elements = self.momentum.len();
        let variance_elements = self.variance.len();
        let averaged_elements = self.averaged_params.len();

        StateMemoryStats {
            momentum_elements,
            variance_elements,
            third_moment_elements: averaged_elements,
            total_bytes: (momentum_elements + variance_elements + averaged_elements)
                * std::mem::size_of::<f32>()
                + std::mem::size_of::<Self>(),
            num_parameters: momentum_elements,
        }
    }
}

/// Averaged Adam optimizer with Polyak-Ruppert averaging for enhanced convergence.
///
/// Implements the algorithm from "Averaged Adam accelerates stochastic optimization..."
/// (arXiv:2501.06081, 2025), combining Adam's adaptive learning rates with the
/// superior convergence properties of parameter averaging.
#[derive(Debug, Clone)]
pub struct AveragedAdam {
    /// Configuration for this optimizer
    config: AveragedAdamConfig,
    /// Optimizer state tracking steps
    state: OptimizerState,
    /// Per-parameter state (momentum, variance, averaged params)
    param_states: HashMap<String, AveragedAdamParamState>,
}

impl AveragedAdam {
    /// Creates a new Averaged Adam optimizer.
    ///
    /// # Arguments
    /// * `lr` - Learning rate (typically 1e-4 to 1e-3)
    /// * `betas` - Coefficients for momentum and variance (β1, β2)
    /// * `eps` - Numerical stability term
    /// * `weight_decay` - Decoupled weight decay coefficient
    /// * `averaging_coeff` - Polyak-Ruppert averaging coefficient (typically 0.999)
    pub fn new(
        lr: f32,
        betas: (f32, f32),
        eps: f32,
        weight_decay: f32,
        averaging_coeff: f32,
    ) -> Self {
        let config = AveragedAdamConfig {
            lr,
            betas,
            eps,
            weight_decay,
            averaging_coeff,
            use_averaged: false,
            averaging_warmup: 100,
        };

        Self {
            config,
            state: OptimizerState::new(),
            param_states: HashMap::new(),
        }
    }

    /// Creates an Averaged Adam optimizer optimized for Physics-Informed Neural Networks.
    ///
    /// This preset uses hyperparameters that have shown superior performance
    /// for PINN training compared to standard Adam.
    pub fn for_pinn_training() -> Self {
        let config = AveragedAdamConfig {
            lr: 1e-3,
            betas: (0.9, 0.999),
            eps: 1e-8,
            weight_decay: 1e-4,
            averaging_coeff: 0.9999, // Higher averaging for PINNs
            use_averaged: false,
            averaging_warmup: 200, // Longer warmup for stability
        };

        Self {
            config,
            state: OptimizerState::new(),
            param_states: HashMap::new(),
        }
    }

    /// Creates an optimizer for image classification tasks.
    pub fn for_image_classification() -> Self {
        let config = AveragedAdamConfig {
            lr: 1e-3,
            betas: (0.9, 0.999),
            eps: 1e-8,
            weight_decay: 0.01,
            averaging_coeff: 0.999,
            use_averaged: false,
            averaging_warmup: 100,
        };

        Self {
            config,
            state: OptimizerState::new(),
            param_states: HashMap::new(),
        }
    }

    /// Creates an optimizer for optimal control problems.
    pub fn for_optimal_control() -> Self {
        let config = AveragedAdamConfig {
            lr: 5e-4,
            betas: (0.95, 0.999), // Higher β1 for control
            eps: 1e-8,
            weight_decay: 1e-5, // Lower weight decay
            averaging_coeff: 0.9995,
            use_averaged: false,
            averaging_warmup: 50, // Faster averaging start
        };

        Self {
            config,
            state: OptimizerState::new(),
            param_states: HashMap::new(),
        }
    }

    /// Sets whether to use averaged parameters for gradient updates.
    ///
    /// When true, uses the Polyak-Ruppert averaged parameters for forward pass.
    /// Typically enabled during evaluation or later stages of training.
    pub fn use_averaged_parameters(&mut self, use_averaged: bool) {
        self.config.use_averaged = use_averaged;
    }

    /// Returns the current averaged parameters for a given parameter name.
    ///
    /// Useful for evaluation or analysis of the averaging process.
    pub fn get_averaged_parameters(&self, param_name: &str) -> Option<&Vec<f32>> {
        self.param_states.get(param_name).map(|state| &state.averaged_params)
    }

    /// Computes the averaging factor for the current step.
    ///
    /// Uses warmup to gradually increase the averaging influence.
    fn compute_averaging_factor(&self) -> f32 {
        if self.state.step < self.config.averaging_warmup {
            // Linear warmup from 0 to averaging_coeff
            let warmup_progress = self.state.step as f32 / self.config.averaging_warmup as f32;
            warmup_progress * self.config.averaging_coeff
        } else {
            self.config.averaging_coeff
        }
    }

    /// Updates averaged parameters using Polyak-Ruppert averaging.
    fn update_averaged_parameters(
        &mut self,
        param_name: &str,
        current_params: &[f32],
    ) -> Result<()> {
        let gamma = self.compute_averaging_factor();

        if let Some(param_state) = self.param_states.get_mut(param_name) {
            if param_state.averaged_params.len() != current_params.len() {
                // Initialize averaged parameters if size mismatch
                param_state.averaged_params = current_params.to_vec();
            } else {
                // Polyak-Ruppert averaging: θ̄_t = γ * θ̄_{t-1} + (1 - γ) * θ_t
                for (avg_param, &curr_param) in
                    param_state.averaged_params.iter_mut().zip(current_params.iter())
                {
                    *avg_param = gamma * (*avg_param) + (1.0 - gamma) * curr_param;
                }
            }
        }
        Ok(())
    }
}

impl Optimizer for AveragedAdam {
    fn update(&mut self, param: &mut Tensor, gradient: &Tensor) -> Result<()> {
        // Get parameter data (bind to variable before taking pointer)
        let param_data = param.data()?;
        let param_name = format!("{:p}", param_data.as_ptr());
        let grad_data = gradient.data()?;

        if param_data.len() != grad_data.len() {
            return Err(TrustformersError::tensor_op_error(
                "Parameter and gradient size mismatch",
                "AveragedAdam::update",
            ));
        }

        let param_size = param_data.len();

        // Initialize parameter state if needed
        if !self.param_states.contains_key(&param_name) {
            let mut param_state = AveragedAdamParamState::new(param_size);
            // Initialize averaged parameters with current parameters
            param_state.averaged_params = param_data.clone();
            self.param_states.insert(param_name.to_string(), param_state);
        }

        let param_state = self.param_states.get_mut(&param_name).ok_or_else(|| {
            TrustformersError::tensor_op_error(
                "Parameter state not found after insertion",
                "AveragedAdam::update",
            )
        })?;

        // Ensure state buffers have correct size
        if param_state.momentum.len() != param_size {
            param_state.momentum.resize(param_size, 0.0);
            param_state.variance.resize(param_size, 0.0);
            param_state.averaged_params.resize(param_size, 0.0);
        }

        let step = self.state.step as f32 + 1.0;
        let (beta1, beta2) = self.config.betas;

        // Apply weight decay to gradients
        let mut effective_grad = grad_data.clone();
        if self.config.weight_decay > 0.0 {
            for (grad, &param_val) in effective_grad.iter_mut().zip(param_data.iter()) {
                *grad += self.config.weight_decay * param_val;
            }
        }

        // Adam updates
        let mut updated_params = param_data.clone();
        for i in 0..param_size {
            // Update biased first moment estimate
            param_state.momentum[i] =
                beta1 * param_state.momentum[i] + (1.0 - beta1) * effective_grad[i];

            // Update biased second moment estimate
            param_state.variance[i] =
                beta2 * param_state.variance[i] + (1.0 - beta2) * effective_grad[i].powi(2);

            // Bias correction
            let m_hat = param_state.momentum[i] / (1.0 - beta1.powf(step));
            let v_hat = param_state.variance[i] / (1.0 - beta2.powf(step));

            // Parameter update
            updated_params[i] -= self.config.lr * m_hat / (v_hat.sqrt() + self.config.eps);
        }

        // Update averaged parameters using Polyak-Ruppert averaging
        self.update_averaged_parameters(&param_name, &updated_params)?;

        // Use averaged parameters if enabled
        let final_params =
            if self.config.use_averaged && self.state.step >= self.config.averaging_warmup {
                // Get fresh reference to param_state after update
                let param_state = self.param_states.get(&param_name).ok_or_else(|| {
                    TrustformersError::tensor_op_error(
                        "Parameter state not found",
                        "AveragedAdam::update",
                    )
                })?;
                param_state.averaged_params.clone()
            } else {
                updated_params.clone()
            };

        // Create new tensor with updated parameters
        let updated_tensor = Tensor::new(final_params)?;
        *param = updated_tensor;

        Ok(())
    }

    fn zero_grad(&mut self) {
        // Averaged Adam doesn't need to clear gradients
    }

    fn step(&mut self) {
        self.state.step += 1;
    }

    fn set_lr(&mut self, lr: f32) {
        self.config.lr = lr;
    }

    fn get_lr(&self) -> f32 {
        self.config.lr
    }
}

impl StatefulOptimizer for AveragedAdam {
    type Config = AveragedAdamConfig;
    type State = OptimizerState;

    fn config(&self) -> &Self::Config {
        &self.config
    }

    fn state(&self) -> &Self::State {
        &self.state
    }

    fn state_mut(&mut self) -> &mut Self::State {
        &mut self.state
    }

    fn state_dict(&self) -> Result<HashMap<String, Tensor>> {
        let mut state_dict = HashMap::new();

        // Save configuration
        state_dict.insert("lr".to_string(), Tensor::new(vec![self.config.lr])?);
        state_dict.insert("beta1".to_string(), Tensor::new(vec![self.config.betas.0])?);
        state_dict.insert("beta2".to_string(), Tensor::new(vec![self.config.betas.1])?);
        state_dict.insert("eps".to_string(), Tensor::new(vec![self.config.eps])?);
        state_dict.insert(
            "weight_decay".to_string(),
            Tensor::new(vec![self.config.weight_decay])?,
        );
        state_dict.insert(
            "averaging_coeff".to_string(),
            Tensor::new(vec![self.config.averaging_coeff])?,
        );
        state_dict.insert(
            "step".to_string(),
            Tensor::new(vec![self.state.step as f32])?,
        );

        for (param_name, param_state) in &self.param_states {
            // Store momentum
            state_dict.insert(
                format!("momentum_{}", param_name),
                Tensor::new(param_state.momentum.clone())?,
            );
            // Store variance
            state_dict.insert(
                format!("variance_{}", param_name),
                Tensor::new(param_state.variance.clone())?,
            );
            // Store averaged parameters
            state_dict.insert(
                format!("averaged_{}", param_name),
                Tensor::new(param_state.averaged_params.clone())?,
            );
        }

        Ok(state_dict)
    }

    fn load_state_dict(&mut self, state_dict: HashMap<String, Tensor>) -> Result<()> {
        // Load configuration
        if let Some(lr_tensor) = state_dict.get("lr") {
            let lr_data = lr_tensor.data()?;
            if !lr_data.is_empty() {
                self.config.lr = lr_data[0];
            }
        }

        if let Some(step_tensor) = state_dict.get("step") {
            let step_data = step_tensor.data()?;
            if !step_data.is_empty() {
                self.state.step = step_data[0] as usize;
            }
        }

        // Collect parameter names
        let mut param_names = std::collections::HashSet::new();
        for key in state_dict.keys() {
            if let Some(underscore_idx) = key.find('_') {
                let prefix = &key[..underscore_idx];
                if prefix == "momentum" || prefix == "variance" || prefix == "averaged" {
                    let param_name = &key[underscore_idx + 1..];
                    param_names.insert(param_name.to_string());
                }
            }
        }

        // Load parameter states
        for param_name in param_names {
            let momentum_key = format!("momentum_{}", param_name);
            let variance_key = format!("variance_{}", param_name);
            let averaged_key = format!("averaged_{}", param_name);

            if let (Some(momentum_tensor), Some(variance_tensor), Some(averaged_tensor)) = (
                state_dict.get(&momentum_key),
                state_dict.get(&variance_key),
                state_dict.get(&averaged_key),
            ) {
                let param_state = AveragedAdamParamState {
                    momentum: momentum_tensor.data()?,
                    variance: variance_tensor.data()?,
                    averaged_params: averaged_tensor.data()?,
                };
                self.param_states.insert(param_name, param_state);
            }
        }

        Ok(())
    }

    fn memory_usage(&self) -> StateMemoryStats {
        let mut total_momentum = 0;
        let mut total_variance = 0;
        let mut total_averaged = 0;
        let mut total_params = 0;

        for param_state in self.param_states.values() {
            let state_stats = param_state.memory_usage();
            total_momentum += state_stats.momentum_elements;
            total_variance += state_stats.variance_elements;
            total_averaged += state_stats.third_moment_elements;
            total_params += state_stats.num_parameters;
        }

        let total_bytes = (total_momentum + total_variance + total_averaged)
            * std::mem::size_of::<f32>()
            + std::mem::size_of::<AveragedAdamConfig>()
            + std::mem::size_of::<OptimizerState>();

        StateMemoryStats {
            momentum_elements: total_momentum,
            variance_elements: total_variance,
            third_moment_elements: total_averaged,
            total_bytes,
            num_parameters: total_params,
        }
    }

    fn reset_state(&mut self) {
        self.param_states.clear();
        self.state = OptimizerState::new();
    }

    fn num_parameters(&self) -> usize {
        self.param_states.values().map(|state| state.momentum.len()).sum()
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use trustformers_core::tensor::Tensor;

    #[test]
    fn test_averaged_adam_creation() {
        let optimizer = AveragedAdam::new(1e-3, (0.9, 0.999), 1e-8, 0.01, 0.999);
        assert_eq!(optimizer.get_lr(), 1e-3);
        assert_eq!(optimizer.config.betas, (0.9, 0.999));
        assert_eq!(optimizer.config.averaging_coeff, 0.999);
    }

    #[test]
    fn test_pinn_preset() {
        let optimizer = AveragedAdam::for_pinn_training();
        assert_eq!(optimizer.config.averaging_coeff, 0.9999);
        assert_eq!(optimizer.config.averaging_warmup, 200);
    }

    #[test]
    fn test_image_classification_preset() {
        let optimizer = AveragedAdam::for_image_classification();
        assert_eq!(optimizer.config.weight_decay, 0.01);
        assert_eq!(optimizer.config.averaging_coeff, 0.999);
    }

    #[test]
    fn test_optimal_control_preset() {
        let optimizer = AveragedAdam::for_optimal_control();
        assert_eq!(optimizer.config.betas.0, 0.95);
        assert_eq!(optimizer.config.averaging_warmup, 50);
    }

    #[test]
    fn test_parameter_update() {
        let mut optimizer = AveragedAdam::new(0.1, (0.9, 0.999), 1e-8, 0.0, 0.999);
        let mut param = Tensor::new(vec![1.0, 2.0, 3.0]).expect("Failed to create tensor");
        let grad = Tensor::new(vec![0.1, 0.2, 0.3]).expect("Failed to create tensor");

        optimizer.update(&mut param, &grad).expect("Optimizer update failed");
        optimizer.step();

        // Check that parameters were updated
        let updated_data = param.data().expect("Operation failed in test");
        assert!(updated_data[0] < 1.0);
        assert!(updated_data[1] < 2.0);
        assert!(updated_data[2] < 3.0);
    }

    #[test]
    fn test_averaged_parameters() {
        let mut optimizer = AveragedAdam::new(0.1, (0.9, 0.999), 1e-8, 0.0, 0.9);
        let mut param = Tensor::new(vec![1.0, 2.0]).expect("Failed to create tensor");
        let grad = Tensor::new(vec![0.1, 0.2]).expect("Failed to create tensor");

        // Perform several updates
        for _ in 0..10 {
            optimizer.update(&mut param, &grad).expect("Optimizer update failed");
            optimizer.step();
        }

        // Check that averaged parameters exist - get the first parameter key
        let param_keys: Vec<String> = optimizer.param_states.keys().cloned().collect();
        assert!(!param_keys.is_empty());
        let first_param_key = &param_keys[0];
        let averaged = optimizer.get_averaged_parameters(first_param_key);
        assert!(averaged.is_some());
        assert_eq!(averaged.expect("Operation failed in test").len(), 2);
    }

    #[test]
    fn test_use_averaged_parameters() {
        let mut optimizer = AveragedAdam::new(0.1, (0.9, 0.999), 1e-8, 0.0, 0.9);
        optimizer.config.averaging_warmup = 0; // Disable warmup for test

        let mut param = Tensor::new(vec![1.0]).expect("Failed to create tensor");
        let grad = Tensor::new(vec![0.1]).expect("Failed to create tensor");

        // Initial update without averaging
        optimizer.update(&mut param, &grad).expect("Optimizer update failed");
        optimizer.step();
        let standard_value = param.data().expect("Operation failed in test")[0];

        // Reset and use averaged parameters
        param = Tensor::new(vec![1.0]).expect("Failed to create tensor");
        optimizer.reset_state();
        optimizer.use_averaged_parameters(true);

        optimizer.update(&mut param, &grad).expect("Optimizer update failed");
        optimizer.step();
        let averaged_value = param.data().expect("Operation failed in test")[0];

        // Values should be different when using averaging
        assert_ne!(standard_value, averaged_value);
    }

    #[test]
    fn test_state_dict_operations() {
        let mut optimizer = AveragedAdam::new(1e-3, (0.9, 0.999), 1e-8, 0.01, 0.999);
        let mut param = Tensor::new(vec![1.0, 2.0]).expect("Failed to create tensor");
        let grad = Tensor::new(vec![0.1, 0.2]).expect("Failed to create tensor");

        // Perform update to create state
        optimizer.update(&mut param, &grad).expect("Optimizer update failed");
        optimizer.step();

        // Save state
        let state_dict = optimizer.state_dict().expect("Failed to get state dict");
        assert!(state_dict.contains_key("lr"));
        assert!(state_dict.contains_key("step"));

        // Check that at least one parameter state exists (momentum/variance/averaged)
        let has_momentum = state_dict.keys().any(|k| k.starts_with("momentum_"));
        let has_variance = state_dict.keys().any(|k| k.starts_with("variance_"));
        let has_averaged = state_dict.keys().any(|k| k.starts_with("averaged_"));
        assert!(has_momentum);
        assert!(has_variance);
        assert!(has_averaged);

        // Create new optimizer and load state
        let mut new_optimizer = AveragedAdam::new(1e-3, (0.9, 0.999), 1e-8, 0.01, 0.999);
        new_optimizer.load_state_dict(state_dict).expect("Failed to load state dict");

        // Check state was loaded correctly
        assert_eq!(new_optimizer.state().step, optimizer.state().step);
        assert!(!new_optimizer.param_states.is_empty());
    }

    #[test]
    fn test_memory_usage() {
        let mut optimizer = AveragedAdam::new(1e-3, (0.9, 0.999), 1e-8, 0.01, 0.999);
        let mut param = Tensor::new(vec![1.0; 100]).expect("Failed to create tensor");
        let grad = Tensor::new(vec![0.1; 100]).expect("Failed to create tensor");

        optimizer.update(&mut param, &grad).expect("Optimizer update failed");

        let memory_stats = optimizer.memory_usage();
        assert!(memory_stats.momentum_elements > 0);
        assert!(memory_stats.variance_elements > 0);
        assert!(memory_stats.third_moment_elements > 0);
        assert!(memory_stats.total_bytes > 0);

        // Should have memory for momentum, variance, and averaged parameters
        assert_eq!(memory_stats.momentum_elements, 100);
        assert_eq!(memory_stats.variance_elements, 100);
        assert_eq!(memory_stats.third_moment_elements, 100);
    }

    #[test]
    fn test_averaging_warmup() {
        let mut optimizer = AveragedAdam::new(0.1, (0.9, 0.999), 1e-8, 0.0, 0.999);
        optimizer.config.averaging_warmup = 5;

        // Before warmup, averaging factor should be lower
        let early_factor = optimizer.compute_averaging_factor();
        assert!(early_factor < 0.999);

        // Advance past warmup
        for _ in 0..10 {
            optimizer.step();
        }

        let late_factor = optimizer.compute_averaging_factor();
        assert_eq!(late_factor, 0.999);
    }

    #[test]
    fn test_num_parameters() {
        let mut optimizer = AveragedAdam::new(1e-3, (0.9, 0.999), 1e-8, 0.01, 0.999);
        assert_eq!(optimizer.num_parameters(), 0);

        let mut param1 = Tensor::new(vec![1.0; 10]).expect("Failed to create tensor");
        let grad1 = Tensor::new(vec![0.1; 10]).expect("Failed to create tensor");
        optimizer.update(&mut param1, &grad1).expect("Optimizer update failed");
        assert_eq!(optimizer.num_parameters(), 10);

        let mut param2 = Tensor::new(vec![2.0; 20]).expect("Failed to create tensor");
        let grad2 = Tensor::new(vec![0.2; 20]).expect("Failed to create tensor");
        optimizer.update(&mut param2, &grad2).expect("Optimizer update failed");
        assert_eq!(optimizer.num_parameters(), 30);
    }
}