Not sure this is what we want
This commit is contained in:
@@ -71,7 +71,6 @@ set(GPUFECH_COMMON
|
|||||||
${COMMON_DIR}/main.cpp
|
${COMMON_DIR}/main.cpp
|
||||||
${COMMON_DIR}/args.cpp
|
${COMMON_DIR}/args.cpp
|
||||||
${COMMON_DIR}/gpu.cpp
|
${COMMON_DIR}/gpu.cpp
|
||||||
${COMMON_DIR}/sort.cpp
|
|
||||||
${COMMON_DIR}/global.cpp
|
${COMMON_DIR}/global.cpp
|
||||||
${COMMON_DIR}/printer.cpp
|
${COMMON_DIR}/printer.cpp
|
||||||
${COMMON_DIR}/master.cpp
|
${COMMON_DIR}/master.cpp
|
||||||
@@ -86,7 +85,9 @@ if(NOT(ENABLE_HSA_BACKEND AND NOT ENABLE_CUDA_BACKEND AND NOT ENABLE_INTEL_BACKE
|
|||||||
# order to show the list of GPUs available on the system, so that the user will
|
# order to show the list of GPUs available on the system, so that the user will
|
||||||
# get at least some feedback even if HSA is not found.
|
# get at least some feedback even if HSA is not found.
|
||||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
|
||||||
list(APPEND GPUFECH_COMMON ${COMMON_DIR}/pci.cpp)
|
list(APPEND GPUFECH_COMMON ${COMMON_DIR}/pci.cpp ${COMMON_DIR}/sort.cpp)
|
||||||
|
set(CMAKE_ENABLE_PCIUTILS ON)
|
||||||
|
|
||||||
find_package(PCIUTILS)
|
find_package(PCIUTILS)
|
||||||
if(NOT ${PCIUTILS_FOUND})
|
if(NOT ${PCIUTILS_FOUND})
|
||||||
message(STATUS "${BoldYellow}pciutils not found, downloading and building a local copy...${ColorReset}")
|
message(STATUS "${BoldYellow}pciutils not found, downloading and building a local copy...${ColorReset}")
|
||||||
@@ -116,6 +117,10 @@ set(SANITY_FLAGS -Wfloat-equal -Wshadow -Wpointer-arith -Wall -Wextra -pedantic
|
|||||||
target_compile_features(gpufetch PRIVATE cxx_std_11)
|
target_compile_features(gpufetch PRIVATE cxx_std_11)
|
||||||
target_compile_options(gpufetch PRIVATE ${SANITY_FLAGS})
|
target_compile_options(gpufetch PRIVATE ${SANITY_FLAGS})
|
||||||
|
|
||||||
|
if (CMAKE_ENABLE_PCIUTILS)
|
||||||
|
target_compile_definitions(gpufetch PUBLIC BACKEND_USE_PCI)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(ENABLE_INTEL_BACKEND)
|
if(ENABLE_INTEL_BACKEND)
|
||||||
target_compile_definitions(gpufetch PUBLIC BACKEND_INTEL)
|
target_compile_definitions(gpufetch PUBLIC BACKEND_INTEL)
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,6 @@
|
|||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
#include "../cuda/pci.hpp"
|
|
||||||
|
|
||||||
#define UNKNOWN_FREQ -1
|
#define UNKNOWN_FREQ -1
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
|||||||
@@ -8,6 +8,10 @@
|
|||||||
#include "../cuda/cuda.hpp"
|
#include "../cuda/cuda.hpp"
|
||||||
#include "../cuda/uarch.hpp"
|
#include "../cuda/uarch.hpp"
|
||||||
|
|
||||||
|
#ifdef BACKEND_USE_PCI
|
||||||
|
#include "pci.hpp"
|
||||||
|
#endif
|
||||||
|
|
||||||
static const char* VERSION = "0.30";
|
static const char* VERSION = "0.30";
|
||||||
|
|
||||||
void print_help(char *argv[]) {
|
void print_help(char *argv[]) {
|
||||||
@@ -79,8 +83,12 @@ int main(int argc, char* argv[]) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(get_num_gpus_available(list) == 0) {
|
if(get_num_gpus_available(list) == 0) {
|
||||||
|
#ifdef BACKEND_USE_PCI
|
||||||
printErr("No GPU was detected! Available GPUs are:");
|
printErr("No GPU was detected! Available GPUs are:");
|
||||||
print_gpus_list_pci();
|
print_gpus_list_pci();
|
||||||
|
#else
|
||||||
|
printErr("No GPU was detected!");
|
||||||
|
#endif
|
||||||
printf("Please, make sure that the appropiate backend is enabled:\n");
|
printf("Please, make sure that the appropiate backend is enabled:\n");
|
||||||
print_enabled_backends();
|
print_enabled_backends();
|
||||||
printf("Visit https://github.com/Dr-Noob/gpufetch#2-backends for more information\n");
|
printf("Visit https://github.com/Dr-Noob/gpufetch#2-backends for more information\n");
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
||||||
|
#ifdef BACKEND_USE_PCI
|
||||||
#include "pci.hpp"
|
#include "pci.hpp"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "global.hpp"
|
#include "global.hpp"
|
||||||
#include "colors.hpp"
|
#include "colors.hpp"
|
||||||
#include "master.hpp"
|
#include "master.hpp"
|
||||||
@@ -19,7 +22,9 @@ struct gpu_list {
|
|||||||
|
|
||||||
struct gpu_list* get_gpu_list() {
|
struct gpu_list* get_gpu_list() {
|
||||||
int idx = 0;
|
int idx = 0;
|
||||||
|
#ifdef BACKEND_USE_PCI
|
||||||
struct pci_dev *devices = get_pci_devices_from_pciutils();
|
struct pci_dev *devices = get_pci_devices_from_pciutils();
|
||||||
|
#endif
|
||||||
struct gpu_list* list = (struct gpu_list*) malloc(sizeof(struct gpu_list));
|
struct gpu_list* list = (struct gpu_list*) malloc(sizeof(struct gpu_list));
|
||||||
list->num_gpus = 0;
|
list->num_gpus = 0;
|
||||||
list->gpus = (struct gpu_info**) malloc(sizeof(struct info*) * MAX_GPUS);
|
list->gpus = (struct gpu_info**) malloc(sizeof(struct info*) * MAX_GPUS);
|
||||||
@@ -40,7 +45,7 @@ struct gpu_list* get_gpu_list() {
|
|||||||
bool valid = true;
|
bool valid = true;
|
||||||
|
|
||||||
while(valid) {
|
while(valid) {
|
||||||
list->gpus[idx] = get_gpu_info_hsa(devices, idx);
|
list->gpus[idx] = get_gpu_info_hsa(idx);
|
||||||
if(list->gpus[idx] != NULL) idx++;
|
if(list->gpus[idx] != NULL) idx++;
|
||||||
else valid = false;
|
else valid = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
|
|
||||||
#include "hsa.hpp"
|
#include "hsa.hpp"
|
||||||
#include "uarch.hpp"
|
#include "uarch.hpp"
|
||||||
#include "../common/pci.hpp"
|
|
||||||
#include "../common/global.hpp"
|
#include "../common/global.hpp"
|
||||||
#include "../common/uarch.hpp"
|
#include "../common/uarch.hpp"
|
||||||
|
|
||||||
@@ -76,7 +75,7 @@ struct topology_h* get_topology_info(struct agent_info info) {
|
|||||||
return topo;
|
return topo;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct gpu_info* get_gpu_info_hsa(struct pci_dev *devices, int gpu_idx) {
|
struct gpu_info* get_gpu_info_hsa(int gpu_idx) {
|
||||||
struct gpu_info* gpu = (struct gpu_info*) emalloc(sizeof(struct gpu_info));
|
struct gpu_info* gpu = (struct gpu_info*) emalloc(sizeof(struct gpu_info));
|
||||||
gpu->pci = NULL;
|
gpu->pci = NULL;
|
||||||
gpu->idx = gpu_idx;
|
gpu->idx = gpu_idx;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#include "../common/gpu.hpp"
|
#include "../common/gpu.hpp"
|
||||||
|
|
||||||
struct gpu_info* get_gpu_info_hsa(struct pci_dev *devices, int gpu_idx);
|
struct gpu_info* get_gpu_info_hsa(int gpu_idx);
|
||||||
char* get_str_cu(struct gpu_info* gpu);
|
char* get_str_cu(struct gpu_info* gpu);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user