Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add functionality to list connected gpu(s) #140

Merged
merged 8 commits into from
Mar 20, 2023
Merged

Add functionality to list connected gpu(s) #140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a1d1d7
feat - add functionality to list connected gpu(s)
Rolv-Apneseth Mar 15, 2023
af6844a
fix - try to fix some lint errors pointed out by workflow
Rolv-Apneseth Mar 15, 2023
e1b488b
change - remove gpu readout trait and locally define path to pci devices
Rolv-Apneseth Mar 16, 2023
83cde41
include list_gpus function in GeneralReadout trait
Rolv-Apneseth Mar 17, 2023
91e2e52
rename list_gpus to gpu
Rolv-Apneseth Mar 17, 2023
2068884
rename list_gpus to gpu
Rolv-Apneseth Mar 17, 2023
aac8a8d
define gpus function for all OSes other than Linux that returns a not…
Rolv-Apneseth Mar 17, 2023
ece67ac
skip devices which don't match any value in the pci.ids db and return…
Rolv-Apneseth Mar 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/linux/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,10 +546,8 @@ impl GeneralReadout for LinuxGeneralReadout {
fn disk_space(&self) -> Result<(u128, u128), ReadoutError> {
shared::disk_space(String::from("/"))
}
}

impl LinuxGeneralReadout {
pub fn list_gpus(&self) -> Result<Vec<String>, ReadoutError> {
fn list_gpus(&self) -> Result<Vec<String>, ReadoutError> {
let db = match Database::read() {
Ok(db) => db,
_ => panic!("Could not read pci.ids file"),
Expand Down
8 changes: 8 additions & 0 deletions src/traits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,11 @@ impl GeneralReadout for MacOSGeneralReadout {
fn disk_space(&self) -> Result<(u128, u128), ReadoutError> {
Ok((50000000,1000000000)) // Used / Total
}

fn list_gpus(&self) -> Result<Vec<String>, ReadoutError> {
// Get gpu(s) from list of connected pci devices
Ok(vec!(String::from("gpu1"), String::from("gpu2"))) // Return gpu sub-device names
}
}

```
Expand Down Expand Up @@ -581,6 +586,9 @@ pub trait GeneralReadout {
///
/// _e.g._ '1.2TB / 2TB'
fn disk_space(&self) -> Result<(u128, u128), ReadoutError>;

/// This function should return the sub device names of any _GPU(s)_ connected to the host machine.
fn list_gpus(&self) -> Result<Vec<String>, ReadoutError>;
Rolv-Apneseth marked this conversation as resolved.
Show resolved Hide resolved
}

/// Holds the possible variants for battery status.
Expand Down