Merge branch 'master' into master

[ROCm/amdsmi commit: ab740f9828]
This commit is contained in:
Chris Freehill
2019-05-13 18:51:36 -05:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -50,7 +50,6 @@ extern "C" {
#include <stdint.h>
#endif // __cplusplus
#include <stdint.h>
#include <stddef.h>
/** \file rocm_smi.h
@@ -115,9 +114,10 @@ typedef enum {
/**
* @brief Initialization flags
*
*
* Initialization flags may be OR'd together and passed to ::rsmi_init().
*/
typedef enum {
RSMI_INIT_FLAG_ALL_GPUS = 0x1, //!< Attempt to add all GPUs found
//!< (including non-AMD) to the list
+1 -1
View File
@@ -348,7 +348,7 @@ static bool isAMDGPU(std::string dev_path) {
fs.open(vend_path);
if (!fs.is_open()) {
return errno;
return false;
}
uint32_t vendor_id;