From 3e730468d8f2a54a711014504aaef098150518d0 Mon Sep 17 00:00:00 2001 From: Dr-Noob Date: Sun, 19 Dec 2021 10:18:23 +0100 Subject: [PATCH] [v0.20] Fixes from previous commit --- src/common/main.cpp | 2 +- src/cuda/cuda.cpp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/common/main.cpp b/src/common/main.cpp index 2e51d86..c4bffcd 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -8,7 +8,7 @@ #include "../cuda/cuda.hpp" #include "../cuda/uarch.hpp" -static const char* VERSION = "0.11"; +static const char* VERSION = "0.20"; void print_help(char *argv[]) { const char **t = args_str; diff --git a/src/cuda/cuda.cpp b/src/cuda/cuda.cpp index afe5a0d..734f687 100644 --- a/src/cuda/cuda.cpp +++ b/src/cuda/cuda.cpp @@ -142,13 +142,8 @@ struct gpu_info* get_gpu_info_cuda(int gpu_idx) { gpu->cach = get_cache_info(deviceProp); gpu->mem = get_memory_info(gpu, deviceProp); gpu->topo = get_topology_info(deviceProp); -<<<<<<< HEAD - gpu->peak_performance = get_peak_performance(gpu); - gpu->peak_performance_t = get_peak_performance_t(deviceProp, gpu); -======= gpu->peak_performance = get_peak_performance_cuda(gpu); - gpu->peak_performance_tcu = get_peak_performance_tcu(gpu); ->>>>>>> origin/intel + gpu->peak_performance_tcu = get_peak_performance_tcu(deviceProp, gpu); return gpu; }