mirror of
https://github.com/easydiffusion/easydiffusion.git
synced 2025-04-09 18:49:11 +02:00
Disable the GPU list if auto is enabled
This commit is contained in:
parent
027b2e1b88
commit
f904945d40
@ -332,13 +332,13 @@
|
|||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
<script src="media/js/parameters.js?v=5"></script>
|
<script src="media/js/parameters.js?v=6"></script>
|
||||||
<script src="media/js/plugins.js?v=1"></script>
|
<script src="media/js/plugins.js?v=1"></script>
|
||||||
<script src="media/js/utils.js?v=6"></script>
|
<script src="media/js/utils.js?v=6"></script>
|
||||||
<script src="media/js/inpainting-editor.js?v=1"></script>
|
<script src="media/js/inpainting-editor.js?v=1"></script>
|
||||||
<script src="media/js/image-modifiers.js?v=6"></script>
|
<script src="media/js/image-modifiers.js?v=6"></script>
|
||||||
<script src="media/js/auto-save.js?v=7"></script>
|
<script src="media/js/auto-save.js?v=7"></script>
|
||||||
<script src="media/js/main.js?v=14"></script>
|
<script src="media/js/main.js?v=15"></script>
|
||||||
<script src="media/js/themes.js?v=4"></script>
|
<script src="media/js/themes.js?v=4"></script>
|
||||||
<script src="media/js/dnd.js?v=8"></script>
|
<script src="media/js/dnd.js?v=8"></script>
|
||||||
<script>
|
<script>
|
||||||
|
@ -1147,7 +1147,13 @@ useCPUField.addEventListener('click', function() {
|
|||||||
} else if (useGPUsField.options.length >= MIN_GPUS_TO_SHOW_SELECTION) {
|
} else if (useGPUsField.options.length >= MIN_GPUS_TO_SHOW_SELECTION) {
|
||||||
gpuSettingEntry.style.display = ''
|
gpuSettingEntry.style.display = ''
|
||||||
autoPickGPUSettingEntry.style.display = ''
|
autoPickGPUSettingEntry.style.display = ''
|
||||||
autoPickGPUsField.checked = (autoPickGPUsField.getAttribute('data-old-value') === 'true')
|
let oldVal = autoPickGPUsField.getAttribute('data-old-value')
|
||||||
|
if (oldVal === null || oldVal === undefined) { // the UI started with CPU selected by default
|
||||||
|
autoPickGPUsField.checked = true
|
||||||
|
} else {
|
||||||
|
autoPickGPUsField.checked = (oldVal === 'true')
|
||||||
|
}
|
||||||
|
useGPUsField.disabled = autoPickGPUsField.checked
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -1160,6 +1166,8 @@ autoPickGPUsField.addEventListener('click', function() {
|
|||||||
if (this.checked) {
|
if (this.checked) {
|
||||||
$('#use_gpus').val([])
|
$('#use_gpus').val([])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useGPUsField.disabled = this.checked
|
||||||
})
|
})
|
||||||
|
|
||||||
async function changeAppConfig(configDelta) {
|
async function changeAppConfig(configDelta) {
|
||||||
@ -1376,17 +1384,17 @@ async function getDevices() {
|
|||||||
useCPUField.checked = true
|
useCPUField.checked = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if (allDeviceIds.length < MIN_GPUS_TO_SHOW_SELECTION) {
|
if (allDeviceIds.length < MIN_GPUS_TO_SHOW_SELECTION || useCPUField.checked) {
|
||||||
let gpuSettingEntry = getParameterSettingsEntry('use_gpus')
|
let gpuSettingEntry = getParameterSettingsEntry('use_gpus')
|
||||||
gpuSettingEntry.style.display = 'none'
|
gpuSettingEntry.style.display = 'none'
|
||||||
let autoPickGPUSettingEntry = getParameterSettingsEntry('auto_pick_gpus')
|
let autoPickGPUSettingEntry = getParameterSettingsEntry('auto_pick_gpus')
|
||||||
autoPickGPUSettingEntry.style.display = 'none'
|
autoPickGPUSettingEntry.style.display = 'none'
|
||||||
|
}
|
||||||
|
|
||||||
if (allDeviceIds.length === 0) {
|
if (allDeviceIds.length === 0) {
|
||||||
useCPUField.checked = true
|
useCPUField.checked = true
|
||||||
useCPUField.disabled = true // no compatible GPUs, so make the CPU mandatory
|
useCPUField.disabled = true // no compatible GPUs, so make the CPU mandatory
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
autoPickGPUsField.checked = (res['config'] === 'auto')
|
autoPickGPUsField.checked = (res['config'] === 'auto')
|
||||||
|
|
||||||
@ -1397,7 +1405,9 @@ async function getDevices() {
|
|||||||
useGPUsField.insertAdjacentHTML('beforeend', deviceOption)
|
useGPUsField.insertAdjacentHTML('beforeend', deviceOption)
|
||||||
})
|
})
|
||||||
|
|
||||||
if (!autoPickGPUsField.checked) {
|
if (autoPickGPUsField.checked) {
|
||||||
|
useGPUsField.disabled = true
|
||||||
|
} else {
|
||||||
$('#use_gpus').val(activeDeviceIds)
|
$('#use_gpus').val(activeDeviceIds)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -83,7 +83,7 @@ var PARAMETERS = [
|
|||||||
id: "use_gpus",
|
id: "use_gpus",
|
||||||
type: ParameterType.select_multiple,
|
type: ParameterType.select_multiple,
|
||||||
label: "GPUs to use",
|
label: "GPUs to use",
|
||||||
note: "select multiple GPUs to process in parallel",
|
note: "to process in parallel",
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user