Franscobec/gpufetch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v0.20] Fixes from previous commit

Browse Source
This commit is contained in:
Dr-Noob
2021-12-19 10:18:23 +01:00
parent 981bfabdc8
commit 3e730468d8
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/main.cpp
View File

@@ -8,7 +8,7 @@
#include "../cuda/cuda.hpp" #include "../cuda/cuda.hpp"
#include "../cuda/uarch.hpp" #include "../cuda/uarch.hpp"
static const char* VERSION = "0.11"; static const char* VERSION = "0.20";
void print_help(char *argv[]) { void print_help(char *argv[]) {
const char **t = args_str; const char **t = args_str;

7
src/cuda/cuda.cpp
View File

@@ -142,13 +142,8 @@ struct gpu_info* get_gpu_info_cuda(int gpu_idx) {
gpu->cach = get_cache_info(deviceProp); gpu->cach = get_cache_info(deviceProp);
gpu->mem = get_memory_info(gpu, deviceProp); gpu->mem = get_memory_info(gpu, deviceProp);
gpu->topo = get_topology_info(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 = get_peak_performance_cuda(gpu);
gpu->peak_performance_tcu = get_peak_performance_tcu(gpu); gpu->peak_performance_tcu = get_peak_performance_tcu(deviceProp, gpu);
>>>>>>> origin/intel
return gpu; return gpu;
} }