Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
11 changes: 5 additions & 6 deletions helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion logic/config_watcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions logic/frame_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions logic/mouse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}'
Expand Down
4 changes: 4 additions & 0 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down