hueso/Alpaca
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New system for override and new overrides

Browse Source
This commit is contained in:
jeffser 2024-06-04 12:55:31 -06:00
parent 71ab8cfba4
commit 073c619d89
2 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/window.py
View File

@ -332,13 +332,12 @@ class AlpacaWindow(Adw.ApplicationWindow):
thread.start() thread.start()
@Gtk.Template.Callback() @Gtk.Template.Callback()
def override_changed(self, dropdown, pspec): def override_changed(self, entry):
if str(pspec) != "<GParamUInt 'selected'>": return #Great code name = entry.get_name()
name = dropdown.get_name() value = entry.get_text()
value = dropdown.get_selected_item().get_string() if dropdown.get_selected() != 0 else None
if (not value and name not in local_instance.overrides) or (value and value in local_instance.overrides and local_instance.overrides[name] == value): return if (not value and name not in local_instance.overrides) or (value and value in local_instance.overrides and local_instance.overrides[name] == value): return
if not value: del local_instance.overrides[name] if not value: del local_instance.overrides[name]
if value: local_instance.overrides[name] = value else: local_instance.overrides[name] = value
self.save_server_config() self.save_server_config()
if not self.run_remote: local_instance.reset() if not self.run_remote: local_instance.reset()
@ -1192,11 +1191,8 @@ class AlpacaWindow(Adw.ApplicationWindow):
#Overrides #Overrides
if "ollama_overrides" in data: local_instance.overrides = data['ollama_overrides'] if "ollama_overrides" in data: local_instance.overrides = data['ollama_overrides']
for override, element in {"HSA_OVERRIDE_GFX_VERSION": self.override_HSA_OVERRIDE_GFX_VERSION}.items(): for override, element in {"HSA_OVERRIDE_GFX_VERSION": self.override_HSA_OVERRIDE_GFX_VERSION}.items():
if override and override in local_instance.overrides: if override in local_instance.overrides:
model = element.get_model() element.set_text(local_instance.overrides[override])
for i in range(model.get_n_items()):
if model.get_string(i) == local_instance.overrides[override]:
element.set_selected(i)
self.background_switch.set_active(self.run_on_background) self.background_switch.set_active(self.run_on_background)

64
src/window.ui
View File

@ -391,11 +391,11 @@
<property name="title" translatable="yes">Ollama Overrides</property> <property name="title" translatable="yes">Ollama Overrides</property>
<property name="description" translatable="yes">Manage the arguments used on Ollama, any changes on this page only applies to the integrated instance, the instance will restart if you make changes</property> <property name="description" translatable="yes">Manage the arguments used on Ollama, any changes on this page only applies to the integrated instance, the instance will restart if you make changes</property>
<child> <child>
<object class="AdwComboRow" id="override_HSA_OVERRIDE_GFX_VERSION"> <object class="AdwEntryRow" id="override_HSA_OVERRIDE_GFX_VERSION">
<signal name="notify" handler="override_changed"/> <signal name="apply" handler="override_changed"/>
<property name="name">HSA_OVERRIDE_GFX_VERSION</property> <property name="name">HSA_OVERRIDE_GFX_VERSION</property>
<property name="title" translatable="no">AMD Radeon GFX</property> <property name="title" translatable="no">HSA_OVERRIDE_GFX_VERSION</property>
<property name="subtitle" translatable="yes">HSA_OVERRIDE_GFX_VERSION</property> <property name="show-apply-button">true</property>
<child type="prefix"> <child type="prefix">
<object class="GtkButton"> <object class="GtkButton">
<signal name="clicked" handler="link_button_handler"/> <signal name="clicked" handler="link_button_handler"/>
@ -408,24 +408,46 @@
</style> </style>
</object> </object>
</child> </child>
<property name="model">
<object class="GtkStringList">
<items>
<item translatable="yes">(Do not override)</item>
<item>gfx900</item>
<item>gfx906</item>
<item>gfx908</item>
<item>gfx90a</item>
<item>gfx940</item>
<item>gfx941</item>
<item>gfx942</item>
<item>gfx1030</item>
<item>gfx1100</item>
<item>gfx1101</item>
<item>gfx1102</item>
</items>
</object> </object>
</property> </child>
<child>
<object class="AdwEntryRow" id="override_CUDA_VISIBLE_DEVICES">
<signal name="apply" handler="override_changed"/>
<property name="name">CUDA_VISIBLE_DEVICES</property>
<property name="title" translatable="no">CUDA_VISIBLE_DEVICES</property>
<property name="show-apply-button">true</property>
<child type="prefix">
<object class="GtkButton">
<signal name="clicked" handler="link_button_handler"/>
<property name="name">https://github.com/ollama/ollama/blob/main/docs/gpu.md#gpu-selection</property>
<property name="vexpand">false</property>
<property name="valign">3</property>
<property name="icon-name">globe-symbolic</property>
<style>
<class name="success"/>
</style>
</object>
</child>
</object>
</child>
<child>
<object class="AdwEntryRow" id="override_HIP_VISIBLE_DEVICES">
<signal name="apply" handler="override_changed"/>
<property name="name">HIP_VISIBLE_DEVICES</property>
<property name="title" translatable="no">HIP_VISIBLE_DEVICES</property>
<property name="show-apply-button">true</property>
<child type="prefix">
<object class="GtkButton">
<signal name="clicked" handler="link_button_handler"/>
<property name="name">https://github.com/ollama/ollama/blob/main/docs/gpu.md#gpu-selection-1</property>
<property name="vexpand">false</property>
<property name="valign">3</property>
<property name="icon-name">globe-symbolic</property>
<style>
<class name="success"/>
</style>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>