surface gpu vram and cores details

Author: LexLuthr

cgo/proofs.go

@@ -278,14 +278,26 @@ func GenerateWindowPoSt(randomness *ByteArray32, replicas SliceRefPrivateReplica
 	return proofs, []uint64{}, nil
 }
 
-func GetGpuDevices() ([]string, error) {
-	resp := (*resultSliceBoxedSliceBoxedUint8)(C.get_gpu_devices())
-	defer resp.destroy()
-	if err := CheckErr(resp); err != nil {
-		return nil, err
+func GetGpuDevices() ([]GpuDeviceInfoGo, error) {
+	resp := (SliceBoxedGpuDeviceInfo)(C.get_gpu_devices())
+	defer C.destroy_gpu_devices(resp)
+
+	if resp.ptr == nil || resp.len == 0 {
+		return nil, nil
+	}
+
+	ref := resp.slice()
+	out := make([]GpuDeviceInfoGo, 0, len(ref))
+	for i := range ref {
+		name := string((*SliceBoxedUint8)(&ref[i].name).copy())
+		out = append(out, GpuDeviceInfoGo{
+			Name:      name,
+			VRAMBytes: uint64(ref[i].vram_bytes),
+			Cores:     uint32(ref[i].cores),
+		})
 	}
 
-	return (SliceBoxedSliceBoxedUint8)(resp.value).copyAsStrings(), nil
+	return out, nil
 }
 
 func GetSealVersion(registeredProof RegisteredSealProof) (string, error) {

cgo/types.go

@@ -68,6 +68,8 @@ type resultEmptySectorUpdateEncodeInto C.Result_EmptySectorUpdateEncodeInto_t
 type resultGenerateFallbackSectorChallenges C.Result_GenerateFallbackSectorChallenges_t
 type resultGenerateSingleWindowPoStWithVanilla C.Result_GenerateSingleWindowPoStWithVanilla_t
 type resultPoStProof C.Result_PoStProof_t
+type GpuDeviceInfo C.GpuDeviceInfo_t
+type SliceBoxedGpuDeviceInfo C.slice_boxed_GpuDeviceInfo_t
 
 // FVM types moved to types_fvm.go behind build tag
 
@@ -604,6 +606,30 @@ func (ptr *PoStProof) Destroy() {
 	}
 }
 
+func (ptr SliceBoxedGpuDeviceInfo) slice() []GpuDeviceInfo {
+	if ptr.ptr == nil || ptr.len == 0 {
+		return nil
+	}
+	return unsafe.Slice((*GpuDeviceInfo)(unsafe.Pointer(ptr.ptr)), int(ptr.len))
+}
+
+type GpuDeviceInfoGo struct {
+	Name      string
+	VRAMBytes uint64
+	Cores     uint32
+}
+
+func (info GpuDeviceInfo) copy() GpuDeviceInfoGo {
+	// name is slice_boxed_uint8_t, which matches your SliceBoxedUint8 wrapper.
+	name := (*SliceBoxedUint8)(&info.name).copy()
+
+	return GpuDeviceInfoGo{
+		Name:      string(name),
+		VRAMBytes: uint64(info.vram_bytes),
+		Cores:     uint32(info.cores),
+	}
+}
+
 // FVM helpers moved to types_fvm.go
 
 // FVM helpers moved to types_fvm.go

proofs.go

@@ -628,9 +628,9 @@ func GenerateWindowPoSt(
 	return proofs, nil, nil
 }
 
-// GetGPUDevices produces a slice of strings, each representing the name of a
+// GetGPUDevices produces a slice of struct, each representing the name, vRAM, and GPU cores of a
 // detected GPU device.
-func GetGPUDevices() ([]string, error) {
+func GetGPUDevices() ([]cgo.GpuDeviceInfoGo, error) {
 	return cgo.GetGpuDevices()
 }
 

rust/src/util/api.rs

@@ -4,10 +4,9 @@ use std::sync::Once;
 
 use anyhow::anyhow;
 use safer_ffi::prelude::*;
-use safer_ffi::slice::slice_boxed;
 
 use super::types::{
-    catch_panic_response, catch_panic_response_no_log, GpuDeviceResponse, InitLogFdResponse,
+    catch_panic_response, catch_panic_response_no_log, GpuDeviceResponse, InitLogFdResponse, GpuDeviceInfo
 };
 
 /// Protects the init off the logger.
@@ -35,18 +34,22 @@ pub fn init_log_with_file(file: File) -> Option<()> {
 
 /// Serialize the GPU device names into a vector
 #[cfg(any(feature = "opencl", feature = "cuda", feature = "cuda-supraseal"))]
-fn get_gpu_devices_internal() -> Vec<slice_boxed<u8>> {
+fn get_gpu_devices_internal() -> Vec<GpuDeviceInfo> {
     let devices = rust_gpu_tools::Device::all();
 
     devices
         .into_iter()
-        .map(|d| d.name().into_bytes().into_boxed_slice().into())
+        .map(|d| GpuDeviceInfo{
+            name: d.name().into_bytes().into_boxed_slice().into(),
+            vram_bytes: d.memory().into(),
+            cores: d.compute_units().into()
+        })
         .collect()
 }
 
 // Return empty vector for GPU devices if cuda and opencl are disabled
 #[cfg(not(any(feature = "opencl", feature = "cuda", feature = "cuda-supraseal")))]
-fn get_gpu_devices_internal() -> Vec<slice_boxed<u8>> {
+fn get_gpu_devices_internal() -> Vec<GpuDeviceInfo> {
     Vec::new()
 }
 

rust/src/util/types.rs

@@ -1,6 +1,7 @@
 use std::{fmt::Display, mem::MaybeUninit, ops::Deref, panic, path::PathBuf, str::Utf8Error};
 
 use safer_ffi::prelude::*;
+use safer_ffi::slice::slice_boxed;
 
 use super::api::init_log;
 
@@ -250,3 +251,15 @@ macro_rules! destructor {
         }
     };
 }
+
+#[derive_ReprC]
+#[repr(C)]
+#[derive(Clone)]
+pub struct GpuDeviceInfo<> {
+    pub name: slice_boxed<u8>,
+    pub vram_bytes: u64,
+    pub cores: u32,
+}
+
+pub type GpuDeviceResponse = Result<c_slice::Box<GpuDeviceInfo>>;
+