feat: engine selection

public/locales/af/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "Pas Uitnodigingskode Toe",
   "audio-enabled": "Audio enabled",
   "cancel": "Cancel",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "Verander taal",
   "confirm": "Bevestig",
   "confirm-action": "Bevestig aksie",

public/locales/cn/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "应用邀请代码",
   "audio-enabled": "Audio enabled",
   "cancel": "取消",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "更改语言",
   "confirm": "确认",
   "confirm-action": "确认操作",

public/locales/de/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "Einladungscode anwenden",
   "audio-enabled": "Audio enabled",
   "cancel": "Abbrechen",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "Sprache",
   "confirm": "Bestätigen",
   "confirm-action": "Aktion bestätigen",

public/locales/en/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "Apply Invite Code",
   "audio-enabled": "Audio enabled",
   "cancel": "Cancel",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "Language",
   "confirm": "Confirm",
   "confirm-action": "Confirm action",

public/locales/fr/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "Appliquer le code d\"invitation",
   "audio-enabled": "Audio enabled",
   "cancel": "Cancel",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "Langue",
   "confirm": "Confirmer",
   "confirm-action": "Confirmer l\"action",

public/locales/hi/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "आमंत्रण कोड लागू करें",
   "audio-enabled": "Audio enabled",
   "cancel": "रद्द करें",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "भाषा",
   "confirm": "पुष्टि करें",
   "confirm-action": "क्रिया की पुष्टि करें",

public/locales/id/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "Terapkan Kode Undangan",
   "audio-enabled": "Audio enabled",
   "cancel": "Batal",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "Bahasa",
   "confirm": "Konfirmasi",
   "confirm-action": "Konfirmasi tindakan",

public/locales/ja/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "招待コードを適用",
   "audio-enabled": "Audio enabled",
   "cancel": "キャンセル",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "言語",
   "confirm": "確認",
   "confirm-action": "アクションを確認",

public/locales/ko/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "초대 코드 적용",
   "audio-enabled": "Audio enabled",
   "cancel": "취소",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "언어",
   "confirm": "확인",
   "confirm-action": "작업 확인",

public/locales/pl/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "Zastosuj Kod Zaproszenia",
   "audio-enabled": "Audio enabled",
   "cancel": "Anuluj",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "Zmień język",
   "confirm": "Potwierdź",
   "confirm-action": "Potwierdź działanie",

public/locales/ru/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "Применить код приглашения",
   "audio-enabled": "Audio enabled",
   "cancel": "Отмена",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "Язык",
   "confirm": "Подтвердить",
   "confirm-action": "Подтвердить действие",

public/locales/tr/settings.json

@@ -6,6 +6,7 @@
   "applyInviteCode": "Davet Kodunu Uygula",
   "audio-enabled": "Audio enabled",
   "cancel": "İptal",
+  "change-gpu-engine": "Change Gpu Engine",
   "change-language": "Dil Değiştir",
   "confirm": "Onayla",
   "confirm-action": "İşlemi onayla",

src-tauri/src/app_config.rs

@@ -21,6 +21,7 @@
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 use crate::credential_manager::{Credential, KEYRING_ACCESSED};
+use crate::gpu_miner::EngineType;
 use semver::Version;
 use std::{path::PathBuf, time::SystemTime};
 use sys_locale::get_locale;
@@ -119,6 +120,8 @@ pub struct AppConfigFromFile {
     airdrop_tokens: Option<AirdropTokens>,
     #[serde(default = "default_true")]
     audio_enabled: bool,
+    #[serde(default = "default_gpu_engine")]
+    gpu_engine: String,
 }
 
 impl Default for AppConfigFromFile {
@@ -164,6 +167,7 @@ impl Default for AppConfigFromFile {
             last_changelog_version: default_changelog_version(),
             airdrop_tokens: None,
             audio_enabled: true,
+            gpu_engine: default_gpu_engine(),
         }
     }
 }
@@ -285,6 +289,7 @@ pub(crate) struct AppConfig {
     last_changelog_version: String,
     airdrop_tokens: Option<AirdropTokens>,
     audio_enabled: bool,
+    gpu_engine: String,
 }
 
 impl AppConfig {
@@ -332,6 +337,7 @@ impl AppConfig {
             last_changelog_version: default_changelog_version(),
             airdrop_tokens: None,
             audio_enabled: true,
+            gpu_engine: EngineType::OpenCL.to_string(),
         }
     }
 
@@ -412,6 +418,7 @@ impl AppConfig {
                 self.last_changelog_version = config.last_changelog_version;
                 self.airdrop_tokens = config.airdrop_tokens;
                 self.audio_enabled = config.audio_enabled;
+                self.gpu_engine = config.gpu_engine;
 
                 KEYRING_ACCESSED.store(
                     config.keyring_accessed,
@@ -495,6 +502,13 @@ impl AppConfig {
         &self.last_changelog_version
     }
 
+    pub fn gpu_engine(&self) -> EngineType {
+        match EngineType::from_string(&self.gpu_engine) {
+            Ok(engine) => engine,
+            Err(_) => EngineType::OpenCL,
+        }
+    }
+
     pub async fn set_mode(
         &mut self,
         mode: String,
@@ -800,6 +814,12 @@ impl AppConfig {
         Ok(())
     }
 
+    pub async fn set_gpu_engine(&mut self, engine: &str) -> Result<(), anyhow::Error> {
+        self.gpu_engine = engine.to_string();
+        self.update_config_file().await?;
+        Ok(())
+    }
+
     // Allow needless update because in future there may be fields that are
     // missing
     #[allow(clippy::needless_update)]
@@ -850,6 +870,7 @@ impl AppConfig {
             last_changelog_version: self.last_changelog_version.clone(),
             airdrop_tokens: self.airdrop_tokens.clone(),
             audio_enabled: self.audio_enabled,
+            gpu_engine: self.gpu_engine.clone(),
         };
         let config = serde_json::to_string(config)?;
         debug!(target: LOG_TARGET, "Updating config file: {:?} {:?}", file, self.clone());
@@ -899,6 +920,10 @@ fn default_monero_address() -> String {
     DEFAULT_MONERO_ADDRESS.to_string()
 }
 
+fn default_gpu_engine() -> String {
+    EngineType::OpenCL.to_string()
+}
+
 async fn create_monereo_address(path: PathBuf) -> Result<String, anyhow::Error> {
     let cm = CredentialManager::default_with_dir(path);
 

src-tauri/src/commands.rs

@@ -30,8 +30,9 @@ use crate::credential_manager::{CredentialError, CredentialManager};
 use crate::external_dependencies::{
     ExternalDependencies, ExternalDependency, RequiredExternalDependency,
 };
+use crate::gpu_miner::EngineType;
 use crate::gpu_miner_adapter::{GpuMinerStatus, GpuNodeSource};
-use crate::hardware::hardware_status_monitor::PublicDeviceProperties;
+use crate::gpu_status_file::GpuStatus;
 use crate::internal_wallet::{InternalWallet, PaperWalletConfig};
 use crate::p2pool::models::{Connections, P2poolStats};
 use crate::progress_tracker::ProgressTracker;
@@ -92,7 +93,7 @@ pub struct CpuMinerMetrics {
 
 #[derive(Debug, Serialize, Clone)]
 pub struct GpuMinerMetrics {
-    hardware: Vec<PublicDeviceProperties>,
+    hardware: Vec<GpuStatus>,
     mining: GpuMinerStatus,
 }
 
@@ -1010,17 +1011,22 @@ pub async fn set_display_mode(
 
     Ok(())
 }
-
 #[tauri::command]
-pub async fn set_excluded_gpu_devices(
-    excluded_gpu_devices: Vec<u8>,
+pub async fn toggle_device_exclusion(
+    device_index: u32,
+    excluded: bool,
+    app: tauri::AppHandle,
     state: tauri::State<'_, UniverseAppState>,
 ) -> Result<(), String> {
     let mut gpu_miner = state.gpu_miner.write().await;
+    let config_dir = app
+        .path()
+        .app_config_dir()
+        .expect("Could not get config dir");
     gpu_miner
-        .set_excluded_device(excluded_gpu_devices)
+        .toggle_device_exclusion(config_dir, device_index, excluded)
         .await
-        .inspect_err(|e| error!("error at set_excluded_gpu_devices {:?}", e))
+        .inspect_err(|e| error!("error at toggle_device_exclusion {:?}", e))
         .map_err(|e| e.to_string())?;
     Ok(())
 }
@@ -1805,3 +1811,42 @@ pub async fn proceed_with_update(
     }
     Ok(())
 }
+
+#[tauri::command]
+pub async fn set_selected_engine(
+    selected_engine: &str,
+    state: tauri::State<'_, UniverseAppState>,
+    app: tauri::AppHandle,
+) -> Result<(), String> {
+    info!(target: LOG_TARGET, "set_selected_engine called with engine: {:?}", selected_engine);
+    let timer = Instant::now();
+
+    info!(target: LOG_TARGET, "Setting selected engine");
+    let engine_type = EngineType::from_string(selected_engine).map_err(|e| e.to_string())?;
+    info!(target: LOG_TARGET, "Selected engine set to {:?}", engine_type);
+    let config = app
+        .path()
+        .app_config_dir()
+        .expect("Could not get config dir");
+    state
+        .gpu_miner
+        .write()
+        .await
+        .set_selected_engine(engine_type, config, app)
+        .await
+        .map_err(|e| e.to_string())?;
+
+    state
+        .config
+        .write()
+        .await
+        .set_gpu_engine(selected_engine)
+        .await
+        .map_err(|e| e.to_string())?;
+
+    if timer.elapsed() > MAX_ACCEPTABLE_COMMAND_TIME {
+        warn!(target: LOG_TARGET, "proceed_with_update took too long: {:?}", timer.elapsed());
+    }
+
+    Ok(())
+}

src-tauri/src/events.rs

@@ -23,6 +23,8 @@
 use serde::Serialize;
 use std::collections::HashMap;
 
+use crate::gpu_status_file::{GpuDevice, GpuStatus};
+
 #[derive(Debug, Serialize, Clone)]
 pub struct SetupStatusEvent {
     pub event_type: String,
@@ -37,3 +39,14 @@ pub struct ReleaseNotesHandlerEvent {
     pub is_app_update_available: bool,
     pub should_show_dialog: bool,
 }
+
+#[derive(Debug, Serialize, Clone)]
+pub struct DetectedAvailableGpuEngines {
+    pub engines: Vec<String>,
+    pub selected_engine: String,
+}
+
+#[derive(Debug, Serialize, Clone)]
+pub struct DetectedDevices {
+    pub devices: Vec<GpuDevice>,
+}