From dd26965dfc764b23a14f9a743d646b99e9d1503b Mon Sep 17 00:00:00 2001 From: drath Date: Mon, 1 Sep 2025 01:50:05 +0200 Subject: [PATCH] bro --- src/gpu.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/gpu.cpp b/src/gpu.cpp index 04ef909..3b76dc9 100644 --- a/src/gpu.cpp +++ b/src/gpu.cpp @@ -148,19 +148,11 @@ gpu_t getGpu(GpuMetricsHeader_t header, std::string hw) { gpu.mem_vrm_temp = metrics.temperature_vrmem; gpu.power_avg = metrics.average_socket_power; } else { -<<<<<<< HEAD - gpu.core_clock = std::stol(readFile(hw + "/hwmon/hwmon" + std::to_string(hw_num) + "/freq1_input", 6)); - gpu.mem_clock = std::stol(readFile(hw + "/hwmon/hwmon" + std::to_string(hw_num) + "/freq2_input", 6)); - gpu.vcore = std::stod(readFile(hw + "/hwmon/hwmon" + std::to_string(hw_num) + "/in0_input")) / 1000.0; - gpu.power_avg = std::stol(readFile(hw + "/hwmon/hwmon" + std::to_string(hw_num) + "/power1_input", 6)); - gpu.edge_temp = std::stol(readFile(hw + "/hwmon/hwmon" + std::to_string(hw_num) + "/temp1_input", 3)); -======= gpu.core_clock = std::stol(readFile(hw + "/hwmon/hwmon" + std::to_string(hwmon)+ "/freq1_input", 6)); gpu.mem_clock = std::stol(readFile(hw + "/hwmon/hwmon" + std::to_string(hwmon)+ "/freq2_input", 6)); gpu.vcore = std::stod(readFile(hw + "/hwmon/hwmon" + std::to_string(hwmon)+ "/in0_input")) / 1000.0; gpu.power_avg = std::stol(readFile(hw + "/hwmon/hwmon" + std::to_string(hwmon)+ "/power1_input", 6)); gpu.edge_temp = std::stol(readFile(hw + "/hwmon/hwmon" + std::to_string(hwmon)+ "/temp1_input", 3)); ->>>>>>> 23bbb306a9b623ceecc48a6e3124ab7c9d77d849 gpu.core_usage = std::stoi(readFile(hw + "/gpu_busy_percent")); }