Remove some unused macros. (#2618)

* Remove some unused macros.

* More unused fixes.
This commit is contained in:
Laurent Mazare 2024-11-15 16:46:55 +01:00 committed by GitHub
parent f689ce5d39
commit 00d8a0c178
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 13 additions and 14 deletions

View File

@ -27,7 +27,7 @@ intel-mkl-src = { workspace = true, optional = true }
num-traits = { workspace = true } num-traits = { workspace = true }
palette = { version = "0.7.6", optional = true } palette = { version = "0.7.6", optional = true }
enterpolation = { version = "0.2.1", optional = true} enterpolation = { version = "0.2.1", optional = true}
pyo3 = { version = "0.22.0", features = ["auto-initialize"], optional = true } pyo3 = { version = "0.22.0", features = ["auto-initialize", "abi3-py311"], optional = true }
rayon = { workspace = true } rayon = { workspace = true }
rubato = { version = "0.15.0", optional = true } rubato = { version = "0.15.0", optional = true }
safetensors = { workspace = true } safetensors = { workspace = true }

View File

@ -1,5 +1,4 @@
use std::collections::VecDeque; use std::collections::VecDeque;
use std::fmt::Display;
use candle::{DType, Device, Error, Module, Result, Tensor, Var}; use candle::{DType, Device, Error, Module, Result, Tensor, Var};
use candle_nn::{ use candle_nn::{
@ -167,6 +166,7 @@ fn track(
Ok(()) Ok(())
} }
#[allow(unused)]
struct Actor<'a> { struct Actor<'a> {
varmap: VarMap, varmap: VarMap,
vb: VarBuilder<'a>, vb: VarBuilder<'a>,
@ -211,7 +211,7 @@ impl Actor<'_> {
let target_network = make_network("target-actor")?; let target_network = make_network("target-actor")?;
// this sets the two networks to be equal to each other using tau = 1.0 // this sets the two networks to be equal to each other using tau = 1.0
track(&mut varmap, &vb, "target-actor", "actor", &dims, 1.0); track(&mut varmap, &vb, "target-actor", "actor", &dims, 1.0)?;
Ok(Self { Ok(Self {
varmap, varmap,
@ -244,6 +244,7 @@ impl Actor<'_> {
} }
} }
#[allow(unused)]
struct Critic<'a> { struct Critic<'a> {
varmap: VarMap, varmap: VarMap,
vb: VarBuilder<'a>, vb: VarBuilder<'a>,
@ -287,7 +288,7 @@ impl Critic<'_> {
let target_network = make_network("target-critic")?; let target_network = make_network("target-critic")?;
// this sets the two networks to be equal to each other using tau = 1.0 // this sets the two networks to be equal to each other using tau = 1.0
track(&mut varmap, &vb, "target-critic", "critic", &dims, 1.0); track(&mut varmap, &vb, "target-critic", "critic", &dims, 1.0)?;
Ok(Self { Ok(Self {
varmap, varmap,
@ -322,6 +323,7 @@ impl Critic<'_> {
} }
} }
#[allow(unused)]
#[allow(clippy::upper_case_acronyms)] #[allow(clippy::upper_case_acronyms)]
pub struct DDPG<'a> { pub struct DDPG<'a> {
actor: Actor<'a>, actor: Actor<'a>,

View File

@ -1,4 +1,3 @@
#![allow(unused)]
//! Wrappers around the Python API of Gymnasium (the new version of OpenAI gym) //! Wrappers around the Python API of Gymnasium (the new version of OpenAI gym)
use candle::{Device, Result, Tensor}; use candle::{Device, Result, Tensor};
use pyo3::prelude::*; use pyo3::prelude::*;

View File

@ -1,5 +1,3 @@
#![allow(unused)]
#[cfg(feature = "mkl")] #[cfg(feature = "mkl")]
extern crate intel_mkl_src; extern crate intel_mkl_src;

View File

@ -14,7 +14,7 @@ fn new_model(
) -> Result<(impl Module, VarMap)> { ) -> Result<(impl Module, VarMap)> {
let input_size = input_shape.iter().product(); let input_size = input_shape.iter().product();
let mut varmap = VarMap::new(); let varmap = VarMap::new();
let var_builder = VarBuilder::from_varmap(&varmap, dtype, device); let var_builder = VarBuilder::from_varmap(&varmap, dtype, device);
let model = seq() let model = seq()

View File

@ -1,9 +1,8 @@
#![allow(unused)]
//! Vectorized version of the gym environment. //! Vectorized version of the gym environment.
use candle::{DType, Device, Result, Tensor}; use candle::{DType, Device, Result, Tensor};
use pyo3::prelude::*; use pyo3::prelude::*;
use pyo3::types::PyDict;
#[allow(unused)]
#[derive(Debug)] #[derive(Debug)]
pub struct Step { pub struct Step {
pub obs: Tensor, pub obs: Tensor,
@ -11,6 +10,7 @@ pub struct Step {
pub is_done: Tensor, pub is_done: Tensor,
} }
#[allow(unused)]
pub struct VecGymEnv { pub struct VecGymEnv {
env: PyObject, env: PyObject,
action_space: usize, action_space: usize,
@ -21,6 +21,7 @@ fn w(res: PyErr) -> candle::Error {
candle::Error::wrap(res) candle::Error::wrap(res)
} }
#[allow(unused)]
impl VecGymEnv { impl VecGymEnv {
pub fn new(name: &str, img_dir: Option<&str>, nprocesses: usize) -> Result<VecGymEnv> { pub fn new(name: &str, img_dir: Option<&str>, nprocesses: usize) -> Result<VecGymEnv> {
Python::with_gil(|py| { Python::with_gil(|py| {

View File

@ -20,7 +20,7 @@ candle-nn = { workspace = true }
candle-onnx = { workspace = true, optional = true } candle-onnx = { workspace = true, optional = true }
half = { workspace = true } half = { workspace = true }
intel-mkl-src = { workspace = true, optional = true } intel-mkl-src = { workspace = true, optional = true }
pyo3 = { version = "0.22.0", features = ["extension-module", "abi3-py38"] } pyo3 = { version = "0.22.0", features = ["extension-module", "abi3-py311"] }
[build-dependencies] [build-dependencies]
pyo3-build-config = "0.22" pyo3-build-config = "0.22"

View File

@ -4,9 +4,8 @@
//! //!
//! Based on implementation from [huggingface/transformers](https://github.com/huggingface/transformers/blob/main/src/transformers/models/encodec/modeling_encodec.py) //! Based on implementation from [huggingface/transformers](https://github.com/huggingface/transformers/blob/main/src/transformers/models/encodec/modeling_encodec.py)
#![allow(unused)]
use candle::{DType, IndexOp, Layout, Module, Result, Shape, Tensor, D}; use candle::{DType, IndexOp, Layout, Module, Result, Shape, Tensor, D};
use candle_nn::{conv1d, Conv1d, Conv1dConfig, ConvTranspose1d, VarBuilder}; use candle_nn::{conv1d, Conv1d, ConvTranspose1d, VarBuilder};
// Encodec Model // Encodec Model
// https://github.com/huggingface/transformers/blob/main/src/transformers/models/encodec/modeling_encodec.py // https://github.com/huggingface/transformers/blob/main/src/transformers/models/encodec/modeling_encodec.py
@ -226,6 +225,7 @@ impl candle::CustomOp2 for CodebookEncode {
} }
// https://github.com/huggingface/transformers/blob/abaca9f9432a84cfaa95531de4c72334f38a42f2/src/transformers/models/encodec/modeling_encodec.py#L340 // https://github.com/huggingface/transformers/blob/abaca9f9432a84cfaa95531de4c72334f38a42f2/src/transformers/models/encodec/modeling_encodec.py#L340
#[allow(unused)]
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct EuclideanCodebook { pub struct EuclideanCodebook {
inited: Tensor, inited: Tensor,

View File

@ -15,7 +15,6 @@
//! - [Model Card](https://huggingface.co/bigcode/starcoder) //! - [Model Card](https://huggingface.co/bigcode/starcoder)
//! //!
#![allow(unused)]
use candle::{DType, Device, Module, Result, Tensor, D}; use candle::{DType, Device, Module, Result, Tensor, D};
use candle_nn::{layer_norm, linear_b, LayerNorm, Linear, VarBuilder}; use candle_nn::{layer_norm, linear_b, LayerNorm, Linear, VarBuilder};
use std::sync::Arc; use std::sync::Arc;