From d567280265816ab07f09d1ad0e7a0a1166bce3a6 Mon Sep 17 00:00:00 2001 From: erikkaum Date: Tue, 16 Jul 2024 17:58:18 +0200 Subject: [PATCH] cargo fmt --- router/src/main.rs | 3 ++- router/src/usage_stats.rs | 34 ++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/router/src/main.rs b/router/src/main.rs index 13699f61..f4b7415b 100644 --- a/router/src/main.rs +++ b/router/src/main.rs @@ -475,7 +475,8 @@ async fn main() -> Result<(), RouterError> { } else { let unknow_error_event = usage_stats::UsageStatsEvent::new( ua.clone(), - usage_stats::EventType::Error("unknow_error".to_string())); + usage_stats::EventType::Error("unknow_error".to_string()), + ); unknow_error_event.send().await; } }; diff --git a/router/src/usage_stats.rs b/router/src/usage_stats.rs index 20aeb765..2c5f795b 100644 --- a/router/src/usage_stats.rs +++ b/router/src/usage_stats.rs @@ -1,9 +1,15 @@ use crate::config::Config; +use csv::ReaderBuilder; use reqwest::header::HeaderMap; use serde::Serialize; -use std::{fs::File, io::{self, BufRead}, path::Path, process::Command, time::Duration}; +use std::{ + fs::File, + io::{self, BufRead}, + path::Path, + process::Command, + time::Duration, +}; use uuid::Uuid; -use csv::ReaderBuilder; const TELEMETRY_URL: &str = "https://huggingface.co/api/telemetry/tgi"; @@ -229,11 +235,9 @@ impl XpuSmiInfo { fn new() -> Option> { let output = Command::new("xpu-smi") .args(&[ - "dump", - "-d", "-1", - "-m", "0,1,3,17", // Metrics IDs: GPU Utilization, GPU Power, GPU Core Temperature, GPU Memory Bandwidth Utilization - "-n", "1", - "-j", + "dump", "-d", "-1", "-m", + "0,1,3,17", // Metrics IDs: GPU Utilization, GPU Power, GPU Core Temperature, GPU Memory Bandwidth Utilization + "-n", "1", "-j", ]) .output() .ok()?; @@ -247,7 +251,7 @@ impl XpuSmiInfo { let json_data: serde_json::Value = match serde_json::from_str(&stdout) { Ok(data) => data, - Err(_) => { return None } + Err(_) => return None, }; if let Some(metrics_data) = json_data.as_array() { @@ -270,10 +274,8 @@ impl XpuSmiInfo { Some(infos) } - } - #[derive(Serialize, Debug, Clone)] pub struct SystemInfo { cpu_count: usize, @@ -334,10 +336,14 @@ pub fn is_container() -> io::Result { for line in reader.lines() { let line = line?; // Check for common container runtimes - if line.contains("/docker/") || line.contains("/docker-") || - line.contains("/kubepods/") || line.contains("/kubepods-") || - line.contains("containerd") || line.contains("crio") || - line.contains("podman") { + if line.contains("/docker/") + || line.contains("/docker-") + || line.contains("/kubepods/") + || line.contains("/kubepods-") + || line.contains("containerd") + || line.contains("crio") + || line.contains("podman") + { return Ok(true); } }