From c5bdcf9ec35be96d6afc5b7b9db888dc375e1cf8 Mon Sep 17 00:00:00 2001 From: ov9zx Date: Mon, 4 Aug 2025 17:59:33 +0000 Subject: [PATCH] Update configuration and logic files with manual changes from Codex --- config.ini | 2 +- helper.py | 11 +++++------ logic/config_watcher.py | 2 +- logic/frame_parser.py | 7 ++++--- logic/mouse.py | 7 ++++--- run.py | 4 ++++ 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/config.ini b/config.ini index e59e210..04abfa6 100644 --- a/config.ini +++ b/config.ini @@ -57,7 +57,7 @@ AI_model_name = sunxds_0.5.6.pt AI_model_image_size = 640 AI_conf = 0.2 AI_device = 0 -AI_enable_AMD = False +AI_enable_DML = False disable_tracker = False [overlay] diff --git a/helper.py b/helper.py index e254dc5..665bbdd 100644 --- a/helper.py +++ b/helper.py @@ -817,18 +817,17 @@ def save_config(config): index=devices.index(config.get('AI', 'AI_device')), key="config_AI_device" ) - - AI_enable_AMD = st.checkbox( - label="AI enable AMD", - value=config.getboolean('AI', 'AI_enable_AMD'), - key="config_AI_enable_AMD" + AI_enable_DML = st.checkbox( + label="AI enable DirectML", + value=config.getboolean('AI', 'AI_enable_DML'), + key="config_AI_enable_DML" ) config.set('AI', 'AI_model_name', AI_model_name) config.set('AI', 'AI_model_image_size', str(AI_model_image_size)) config.set('AI', 'AI_conf', str(AI_conf)) config.set('AI', 'AI_device', AI_device) - config.set('AI', 'AI_enable_AMD', str(AI_enable_AMD)) + config.set('AI', 'AI_enable_DML', str(AI_enable_DML)) # Overlay st.subheader("Overlay", divider=True) diff --git a/logic/config_watcher.py b/logic/config_watcher.py index 46cbad7..b48dfd3 100644 --- a/logic/config_watcher.py +++ b/logic/config_watcher.py @@ -95,7 +95,7 @@ def Read(self, verbose=False): self.ai_model_image_size = int(self.config_AI["ai_model_image_size"]) self.AI_conf = float(self.config_AI["AI_conf"]) self.AI_device = str(self.config_AI["AI_device"]) - self.AI_enable_AMD = self.config_AI.getboolean("AI_enable_AMD") + self.AI_enable_DML = self.config_AI.getboolean("AI_enable_DML") self.disable_tracker = self.config_AI.getboolean("disable_tracker") # Overlay diff --git a/logic/frame_parser.py b/logic/frame_parser.py index 7008d37..4e01868 100644 --- a/logic/frame_parser.py +++ b/logic/frame_parser.py @@ -121,9 +121,10 @@ def _find_nearest_target(self, boxes_array, classes_tensor): return Target(*target_data, target_class) - def get_arch(self): - if cfg.AI_enable_AMD: - return f'hip:{cfg.AI_device}' + def get_arch(self): + if cfg.AI_enable_DML: + import torch_directml + return torch_directml.device(int(cfg.AI_device)) elif 'cpu' in cfg.AI_device: return 'cpu' else: diff --git a/logic/mouse.py b/logic/mouse.py index 8fdcc46..2bb7df5 100644 --- a/logic/mouse.py +++ b/logic/mouse.py @@ -46,9 +46,10 @@ def initialize_parameters(self): self.section_size_x = self.screen_width / 100 self.section_size_y = self.screen_height / 100 - def get_arch(self): - if cfg.AI_enable_AMD: - return f'hip:{cfg.AI_device}' + def get_arch(self): + if cfg.AI_enable_DML: + import torch_directml + return torch_directml.device(int(cfg.AI_device)) if 'cpu' in cfg.AI_device: return 'cpu' return f'cuda:{cfg.AI_device}' diff --git a/run.py b/run.py index 6a9e5f5..489b791 100644 --- a/run.py +++ b/run.py @@ -33,6 +33,10 @@ def perform_detection(model, image, tracker: sv.ByteTrack | None = None): show=False, stream=True ) + if cfg.AI_enable_DML: + import torch_directml + kwargs["device"] = torch_directml.device(int(cfg.AI_device)) + kwargs["half"] = False kwargs["cfg"] = "logic/tracker.yaml" if tracker else "logic/game.yaml"