CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-05-16 02:13:46 +12:00
Code Issues Projects Releases Wiki Activity

Makefile auto detection and initial logic for excluding gpu code when libs are missing

Browse source
This commit is contained in:
aristocratos 2023-05-20 01:41:04 +02:00
parent 8bae1ec092
commit 8c710a2b68
2 changed files with 54 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -119,6 +119,22 @@ ifeq ($(PLATFORM_LC),linux)
PLATFORM_DIR := linux
THREADS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
SU_GROUP := root
ifneq ($(NO_GPU),true)
ifeq ($(shell find /usr/local/cuda/include/ -type f -name nvml.h >/dev/null 2>&1; echo $$?),0)
GPUCXXFLAGS := -I/usr/local/cuda/include
GPULDFLAGS := -L/usr/local/cuda/lib -lnvidia-ml
override ADDFLAGS += -DGPU_NVIDIA
else ifeq ($(shell find /opt/cuda/include/ -type f -name nvml.h >/dev/null 2>&1; echo $$?),0)
GPUCXXFLAGS := -I/opt/cuda/include
GPULDFLAGS := -L/opt/cuda/lib -lnvidia-ml
override ADDFLAGS += -DGPU_NVIDIA
endif
ifeq ($(shell find /opt/rocm/include/rocm_smi/ -type f -name rocm_smi.h >/dev/null 2>&1; echo $$?),0)
GPUCXXFLAGS += -I/opt/rocm/include
GPULDFLAGS += -L/opt/rocm/lib -lrocm_smi64
override ADDFLAGS += -DGPU_AMD
endif
endif
else ifeq ($(PLATFORM_LC),freebsd)
PLATFORM_DIR := freebsd
THREADS := $(shell getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)

45
src/linux/btop_collect.cpp
View file

@ -28,8 +28,12 @@ tab-size = 4
#include <ifaddrs.h>
#include <net/if.h>
#include <arpa/inet.h> // for inet_ntop()
#include <nvml.h>
#include <rocm_smi/rocm_smi.h>
#if defined(GPU_NVIDIA)
#include <nvml.h>
#endif
#if defined(GPU_AMD)
#include <rocm_smi/rocm_smi.h>
#endif
#if !(defined(STATIC_BUILD) && defined(__GLIBC__))
@ -101,7 +105,9 @@ namespace Gpu {
bool initialized = false;
bool init();
bool shutdown();
#if defined(GPU_NVIDIA)
vector<nvmlDevice_t> devices;
#endif
unsigned int device_count = 0;
}
@ -187,10 +193,12 @@ namespace Shared {
Mem::old_uptime = system_uptime();
Mem::collect();
if (Config::strings.at("cpu_graph_upper") == "default")
if (Config::strings.at("cpu_graph_upper") == "default" or not v_contains(Cpu::available_fields, Config::strings.at("cpu_graph_upper")))
Config::strings.at("cpu_graph_upper") = "total";
if (Config::strings.at("cpu_graph_lower") == "default")
if (Config::strings.at("cpu_graph_lower") == "default" or not v_contains(Cpu::available_fields, Config::strings.at("cpu_graph_lower")))
Config::strings.at("cpu_graph_lower") = "total";
Logger::debug("Shared::init() : Initialized.");
}
}
@ -850,7 +858,7 @@ namespace Gpu {
namespace Nvml {
bool init() {
if (initialized) return false;
#if defined(GPU_NVIDIA)
nvmlReturn_t result = nvmlInit();
if (result != NVML_SUCCESS) {
Logger::warning(std::string("Failed to initialize NVML, NVIDIA GPUs will not be detected: ") + nvmlErrorString(result));
@ -908,21 +916,28 @@ namespace Gpu {
return true;
} else {initialized = true; shutdown(); return false;}
#else
return false;
#endif
}
bool shutdown() {
if (!initialized) return false;
#if defined(GPU_NVIDIA)
nvmlReturn_t result = nvmlShutdown();
if (NVML_SUCCESS == result)
initialized = false;
else Logger::warning(std::string("Failed to shutdown NVML: ") + nvmlErrorString(result));
return !initialized;
#else
return false;
#endif
}
bool collect(gpu_info* gpus_slice) { // raw pointer to vector data, size == device_count
if (!initialized) return false;
#if defined(GPU_NVIDIA)
nvmlReturn_t result;
for (unsigned int i = 0; i < device_count; ++i) {
@ -1012,6 +1027,10 @@ namespace Gpu {
}
return true;
#else
(void)gpus_slice;
return false;
#endif
}
}
@ -1019,6 +1038,7 @@ namespace Gpu {
namespace Rsmi {
bool init() {
if (initialized) return false;
#if defined(GPU_AMD)
rsmi_status_t result;
result = rsmi_init(0);
@ -1062,20 +1082,27 @@ namespace Gpu {
return true;
} else {initialized = true; shutdown(); return false;}
#else
return false;
#endif
}
bool shutdown() {
if (!initialized) return false;
#if defined(GPU_AMD)
if (rsmi_shut_down() == RSMI_STATUS_SUCCESS)
initialized = false;
else Logger::warning("Failed to shutdown ROCm SMI");
return true;
#else
return false;
#endif
}
bool collect(gpu_info* gpus_slice) { // raw pointer to vector data, size == device_count, offset by Nvml::device_count elements
if (!initialized) return false;
#if defined(GPU_AMD)
rsmi_status_t result;
for (uint32_t i = 0; i < device_count; ++i) {
@ -1155,6 +1182,10 @@ namespace Gpu {
}
return true;
#else
(void)gpus_slice;
return false;
#endif
}
}