diff --git a/Cargo.lock b/Cargo.lock index cf4216a..b6f9ede 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -187,7 +187,7 @@ dependencies = [ "indexmap", "lazy_static", "os_str_bytes", - "strsim 0.10.0", + "strsim", "termcolor", "textwrap", ] @@ -243,41 +243,6 @@ dependencies = [ "find_cuda_helper", ] -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote", - "syn", -] - [[package]] name = "digest" version = "0.9.0" @@ -604,12 +569,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "indexmap" version = "1.7.0" @@ -697,7 +656,6 @@ dependencies = [ "env_logger", "kaspa-miner", "log", - "nvml-wrapper", "rand 0.8.4", ] @@ -931,27 +889,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nvml-wrapper" -version = "0.7.0" -source = "git+https://github.com/benrod3k/nvml-wrapper?branch=495.29.05#53f80372fdfdca4616a7cc65f005360b7afb1ca0" -dependencies = [ - "bitflags", - "libloading", - "nvml-wrapper-sys", - "static_assertions", - "thiserror", - "wrapcenum-derive", -] - -[[package]] -name = "nvml-wrapper-sys" -version = "0.5.0" -source = "git+https://github.com/benrod3k/nvml-wrapper?branch=495.29.05#53f80372fdfdca4616a7cc65f005360b7afb1ca0" -dependencies = [ - "libloading", -] - [[package]] name = "once_cell" version = "1.9.0" @@ -1435,18 +1372,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.10.0" @@ -1499,26 +1424,6 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" -[[package]] -name = "thiserror" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "time" version = "0.3.9" @@ -1888,18 +1793,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" -[[package]] -name = "wrapcenum-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bcc065c85ad2c3bd12aa4118bf164835712e25080c392557801a13292c60aec" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "wyz" version = "0.2.0" diff --git a/plugins/cuda/Cargo.toml b/plugins/cuda/Cargo.toml index a5f9ce4..3910ad7 100644 --- a/plugins/cuda/Cargo.toml +++ b/plugins/cuda/Cargo.toml @@ -12,7 +12,7 @@ log = "0.4" rand = "0.8" clap = { version = "3.0", features = ["color", "derive"]} env_logger = "0.9" -nvml-wrapper = { git = "https://github.com/benrod3k/nvml-wrapper", branch = "495.29.05" } +#nvml-wrapper = { git = "https://github.com/benrod3k/nvml-wrapper", branch = "495.29.05" } [lib] crate-type = ["cdylib", "rlib"] diff --git a/plugins/cuda/src/lib.rs b/plugins/cuda/src/lib.rs index 23e4cea..7ebc1e9 100644 --- a/plugins/cuda/src/lib.rs +++ b/plugins/cuda/src/lib.rs @@ -6,8 +6,8 @@ use cust::prelude::*; use kaspa_miner::{Plugin, Worker, WorkerSpec}; use log::LevelFilter; use log::{error, info}; -use nvml_wrapper::Device as NvmlDevice; -use nvml_wrapper::Nvml; +//use nvml_wrapper::Device as NvmlDevice; +//use nvml_wrapper::Nvml; use std::error::Error as StdError; pub type Error = Box; @@ -22,7 +22,7 @@ const DEFAULT_WORKLOAD_SCALE: f32 = 256.; pub struct CudaPlugin { specs: Vec, - nvml_instance: Nvml, + //nvml_instance: Nvml, _enabled: bool, } @@ -30,8 +30,8 @@ impl CudaPlugin { fn new() -> Result { cust::init(CudaFlags::empty())?; env_logger::builder().filter_level(LevelFilter::Info).parse_default_env().init(); - let nvml_instance = Nvml::init()?; - Ok(Self { specs: Vec::new(), _enabled: false, nvml_instance }) + //let nvml_instance = Nvml::init()?; + Ok(Self { specs: Vec::new(), _enabled: false/*, nvml_instance*/ }) } } @@ -62,6 +62,7 @@ impl Plugin for CudaPlugin { } }; + /* // if any of cuda_lock_core_clocks / cuda_lock_mem_clocks / cuda_power_limit is valid, init nvml and try to apply if opts.cuda_lock_core_clocks.is_some() || opts.cuda_lock_mem_clocks.is_some() @@ -109,7 +110,7 @@ impl Plugin for CudaPlugin { }; }; } - } + }*/ self.specs = (0..gpus.len()) .map(|i| CudaWorkerSpec {