Skip to content

Commit a2f07f3

Browse files
IllusiveMan196IllusiveMan196
committed
Squashed commit of the following:
commit 88c1224 Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Thu May 9 01:49:45 2024 +0900 [DirectML] Fix samplers. commit e2cbdab Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Mon May 6 10:27:49 2024 +0900 Fix bug. commit 9514d91 Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Sun May 5 23:29:44 2024 +0900 Fix ONNX/Olive. commit 7fd77f2 Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Sun May 5 22:45:46 2024 +0900 Fix ONNX/Olive generation. commit 216340d Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Sun May 5 20:10:54 2024 +0900 Fix bug. commit a92b859 Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Sun May 5 19:56:08 2024 +0900 Support olive-ai 0.5.x. commit 674c5ca Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Tue Apr 30 16:12:53 2024 +0900 Fix. commit 89e60b8 Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Tue Apr 30 13:38:44 2024 +0900 Rewrite ZLUDA installer. commit 65588fc Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Mon Apr 29 23:02:11 2024 +0900 Fix. commit 5d11e9c Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Mon Apr 29 22:55:17 2024 +0900 Bump ZLUDA. commit 620b78c Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Mon Apr 29 22:50:42 2024 +0900 Improve ZLUDA installation. commit 6130ef9 Merge: b7c5e60 1c0a0c4 Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Tue Apr 23 19:48:08 2024 +0900 Merge remote-tracking branch 'upstream/master' commit 1c0a0c4 Merge: e2b177c 7dfe959 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 18:00:36 2024 +0300 Merge branch 'dev' commit 7dfe959 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 18:00:23 2024 +0300 update changelog commit 8f64dad Merge: e2b177c 821adc3 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 17:57:39 2024 +0300 Merge pull request AUTOMATIC1111#15594 from AUTOMATIC1111/fix-get_crop_region_v2 fix get_crop_region_v2 commit 821adc3 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Mon Apr 22 23:03:27 2024 +0900 fix get_crop_region_v2 Co-Authored-By: Dowon <ks2515@naver.com> commit e2b177c Merge: e84703b e837124 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 12:26:24 2024 +0300 Merge branch 'dev' commit e837124 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 12:26:05 2024 +0300 changelog commit 3fdc3cf Merge: 61f6479 e9809de Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 12:24:06 2024 +0300 Merge pull request AUTOMATIC1111#15591 from AUTOMATIC1111/restore-1.8.0-style-naming-of-scripts Restore 1.8.0 style naming of scripts commit e9809de Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Mon Apr 22 18:21:48 2024 +0900 restore 1.8.0-style naming of scripts commit 61f6479 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 12:19:30 2024 +0300 restore 1.8.0-style naming of scripts commit e84703b Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 11:59:54 2024 +0300 update changelog commit e4aa0c3 Merge: a183ea4 6c7c176 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 11:50:34 2024 +0300 Merge pull request AUTOMATIC1111#15587 from AUTOMATIC1111/fix-mistake-in-#15583 fix mistake in AUTOMATIC1111#15583 commit a183ea4 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 22 11:49:55 2024 +0300 undo adding scripts to sys.modules commit 6c7c176 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Mon Apr 22 00:10:49 2024 +0900 fix mistake in AUTOMATIC1111#15583 commit e6a8d0b Merge: d1998d7 db263df Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 18:06:40 2024 +0300 Merge pull request AUTOMATIC1111#15583 from AUTOMATIC1111/get_crop_region_v2 get_crop_region_v2 commit db263df Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Sun Apr 21 19:34:11 2024 +0900 get_crop_region_v2 commit d1998d7 Merge: c0eaeb1 8e1c356 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:43:19 2024 +0300 Merge pull request AUTOMATIC1111#15531 from thatfuckingbird/fix-mistyped-function-name fix typo in function call (eror -> error) commit c0eaeb1 Merge: 9bcfb92 a95326b Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:42:57 2024 +0300 Merge pull request AUTOMATIC1111#15532 from huchenlei/fix_module Fix cls.__module__ value in extension script commit 9bcfb92 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:41:28 2024 +0300 rename logging from textual inversion to not confuse it with global logging module commit d74fc56 Merge: a44ed23 63fd38a Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:23:38 2024 +0300 Merge pull request AUTOMATIC1111#15547 from AUTOMATIC1111/numpy-DeprecationWarning-product---prod numpy DeprecationWarning product -> prod commit a44ed23 Merge: daae178 9d4fdc4 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:22:58 2024 +0300 Merge pull request AUTOMATIC1111#15555 from light-and-ray/fix_x1_upscalers fix x1 upscalers commit daae178 Merge: ce19a7b 909c3df Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:22:30 2024 +0300 Merge pull request AUTOMATIC1111#15560 from AUTOMATIC1111/api-downscale Remove API upscaling factor limits commit ce19a7b Merge: 8d6e72d 50190ca Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:22:04 2024 +0300 Merge pull request AUTOMATIC1111#15544 from cabelo/master Compatibility with Debian 11, Fedora 34+ and openSUSE 15.4+ commit 8d6e72d Merge: 6f4f6bf ba2a737 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:21:21 2024 +0300 Merge pull request AUTOMATIC1111#15561 from speculativemoonstone/fix-launch-git-directories Allow webui.sh to be runnable from arbitrary directories containing a .git file commit 6f4f6bf Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:18:58 2024 +0300 add more info to the error message for AUTOMATIC1111#15567 commit 367b823 Merge: c8ac42a d212fb5 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:09:27 2024 +0300 Merge pull request AUTOMATIC1111#15567 from AUTOMATIC1111/no-image-data-blocks-debug Hide 'No Image data blocks found.' message commit c8ac42a Merge: 449bc7b bba306d Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:07:58 2024 +0300 Merge pull request AUTOMATIC1111#15533 from travisg/callback-fix fix: remove_callbacks_for_function should also remove from the ordered map commit 449bc7b Merge: 3810413 71314e4 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:06:45 2024 +0300 Merge pull request AUTOMATIC1111#15534 from storyicon/fix-masking Fix images do not match / Coordinate 'right' is less than 'left' commit 3810413 Merge: f8f5d6c b5b1487 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 07:00:28 2024 +0300 Merge pull request AUTOMATIC1111#15581 from AUTOMATIC1111/FilenameGenerator-sampler-scheduler FilenameGenerator Sampler Scheduler commit f8f5d6c Merge: cde35be 5cb567c Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 06:59:56 2024 +0300 Merge pull request AUTOMATIC1111#15577 from AUTOMATIC1111/api-get-schedulers Add schedulers API endpoint commit cde35be Merge: ff6f468 49fee7c Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun Apr 21 06:59:38 2024 +0300 Merge pull request AUTOMATIC1111#15582 from kaanyalova/avif-support Add avif support commit 49fee7c Author: kaanyalova <76952012+kaanyalova@users.noreply.github.com> Date: Sat Apr 20 23:18:54 2024 +0300 Add avif support commit b5b1487 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Sun Apr 21 02:26:50 2024 +0900 FilenameGenerator Sampler Scheduler commit 5cb567c Author: missionfloyd <missionfloyd@users.noreply.github.com> Date: Fri Apr 19 20:29:22 2024 -0600 Add schedulers API endpoint commit d212fb5 Author: missionfloyd <missionfloyd@users.noreply.github.com> Date: Thu Apr 18 20:56:51 2024 -0600 Hide 'No Image data blocks found.' message commit b7c5e60 Author: Seunghoon Lee <lshqqytiger@naver.com> Date: Fri Apr 19 10:09:47 2024 +0900 Fix lshqqytiger#449. commit 71314e4 Author: storyicon <storyicon@foxmail.com> Date: Thu Apr 18 11:59:25 2024 +0000 feat:compatible with inconsistent/empty mask Signed-off-by: storyicon <storyicon@foxmail.com> commit ba2a737 Author: Speculative Moonstone <167392122+speculativemoonstone@users.noreply.github.com> Date: Thu Apr 18 04:25:32 2024 +0000 Allow webui.sh to be runnable from directories containing a .git file commit 909c3df Author: missionfloyd <missionfloyd@users.noreply.github.com> Date: Wed Apr 17 21:20:03 2024 -0600 Remove API upscaling factor limits commit 9d4fdc4 Author: Andray <light.and.ray@gmail.com> Date: Thu Apr 18 01:53:23 2024 +0400 fix x1 upscalers commit 63fd38a Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Wed Apr 17 15:44:49 2024 +0900 numpy DeprecationWarning product -> prod commit 50190ca Author: Alessandro de Oliveira Faria (A.K.A. CABELO) <cabelo@opensuse.org> Date: Wed Apr 17 00:01:56 2024 -0300 Compatibility with Debian 11, Fedora 34+ and openSUSE 15.4+ commit 0980fdf Author: storyicon <storyicon@foxmail.com> Date: Tue Apr 16 07:35:33 2024 +0000 fix: images do not match Signed-off-by: storyicon <storyicon@foxmail.com> commit bba306d Author: Travis Geiselbrecht <geist@foobox.com> Date: Mon Apr 15 21:10:11 2024 -0700 fix: remove callbacks properly in remove_callbacks_for_function() Like remove_current_script_callback just before, also remove from the ordered_callbacks_map to keep the callback map and ordered callback map in sync. commit a95326b Author: huchenlei <chenlei.hu@mail.utoronto.ca> Date: Mon Apr 15 22:34:01 2024 -0400 nit commit 0f82948 Author: huchenlei <chenlei.hu@mail.utoronto.ca> Date: Mon Apr 15 22:14:19 2024 -0400 Fix cls.__module__ commit 8e1c356 Author: thatfuckingbird <67429906+thatfuckingbird@users.noreply.github.com> Date: Mon Apr 15 21:17:24 2024 +0200 fix typo in function call (eror -> error) commit ff6f468 Merge: 3fadb4f adadb4e Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Sat Apr 13 06:38:58 2024 +0300 Merge branch 'master' into dev commit 3fadb4f Merge: ac8ffb3 592e40e Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Thu Apr 11 19:33:55 2024 +0300 Merge pull request AUTOMATIC1111#15492 from w-e-w/update-restricted_opts update restricted_opts commit 592e40e Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Thu Apr 11 22:51:29 2024 +0900 update restricted_opts commit 4068429 Author: storyicon <storyicon@foxmail.com> Date: Wed Apr 10 10:53:25 2024 +0000 fix: Coordinate 'right' is less than 'left' Signed-off-by: storyicon <storyicon@foxmail.com> commit ac8ffb3 Merge: a976f4d ef83f68 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Tue Apr 9 16:00:56 2024 +0300 Merge pull request AUTOMATIC1111#15470 from AUTOMATIC1111/read-infotext-Script-not-found error handling paste_field callables commit ef83f68 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Tue Apr 9 21:28:44 2024 +0900 catch exception for all paste_fields callable commit 600f339 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Tue Apr 9 20:59:04 2024 +0900 Warning when Script is not found commit a976f4d Merge: c48b6bf e3aabe6 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Tue Apr 9 12:05:02 2024 +0300 Merge pull request AUTOMATIC1111#15460 from AUTOMATIC1111/create_infotext-index-and-callable create_infotext allow index and callable, re-work Hires prompt infotext commit c48b6bf Merge: d9708c9 2580235 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Tue Apr 9 11:00:30 2024 +0300 Merge pull request AUTOMATIC1111#15465 from jordenyt/fix-extras-api-upscale-enabled Fix extra-single-image API not doing upscale failed commit 2580235 Author: Jorden Tse <jordenyt@gmail.com> Date: Tue Apr 9 11:13:47 2024 +0800 Fix extra-single-image API not doing upscale failed commit d9708c9 Author: AUTOMATIC1111 <16777216c@gmail.com> Date: Mon Apr 8 16:15:25 2024 +0300 fix limited file write (thanks, Sylwia) commit e3aabe6 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Mon Apr 8 19:48:38 2024 +0900 add documentation for create_infotext commit 1e1176b Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Mon Apr 8 18:18:33 2024 +0900 non-serializable as None commit 219e644 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Mon Apr 8 01:41:52 2024 +0900 re-work extra_generation_params for Hires prompt commit 47ed9b2 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Mon Apr 8 01:39:31 2024 +0900 allow list or callables in generation_params commit 6efdfe3 Author: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Sun Apr 7 22:58:12 2024 +0900 if use use_main_prompt index = 0
1 parent 3c8ee96 commit a2f07f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+839
-707
lines changed

‎CHANGELOG.md

+36-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
## 1.9.3
2+
3+
### Bug Fixes:
4+
* fix get_crop_region_v2 ([#15594](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15594))
5+
6+
## 1.9.2
7+
8+
### Extensions and API:
9+
* restore 1.8.0-style naming of scripts
10+
11+
## 1.9.1
12+
13+
### Minor:
14+
* Add avif support ([#15582](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15582))
15+
* Add filename patterns: `[sampler_scheduler]` and `[scheduler]` ([#15581](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15581))
16+
17+
### Extensions and API:
18+
* undo adding scripts to sys.modules
19+
* Add schedulers API endpoint ([#15577](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15577))
20+
* Remove API upscaling factor limits ([#15560](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15560))
21+
22+
### Bug Fixes:
23+
* Fix images do not match / Coordinate 'right' is less than 'left' ([#15534](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15534))
24+
* fix: remove_callbacks_for_function should also remove from the ordered map ([#15533](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15533))
25+
* fix x1 upscalers ([#15555](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15555))
26+
* Fix cls.__module__ value in extension script ([#15532](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15532))
27+
* fix typo in function call (eror -> error) ([#15531](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15531))
28+
29+
### Other:
30+
* Hide 'No Image data blocks found.' message ([#15567](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15567))
31+
* Allow webui.sh to be runnable from arbitrary directories containing a .git file ([#15561](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15561))
32+
* Compatibility with Debian 11, Fedora 34+ and openSUSE 15.4+ ([#15544](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15544))
33+
* numpy DeprecationWarning product -> prod ([#15547](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15547))
34+
* get_crop_region_v2 ([#15583](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15583), [#15587](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15587))
35+
36+
137
## 1.9.0
238

339
### Features:
@@ -85,7 +121,6 @@
85121
* Fix extra-single-image API not doing upscale failed ([#15465](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15465))
86122
* error handling paste_field callables ([#15470](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/15470))
87123

88-
89124
### Hardware:
90125
* Add training support and change lspci for Ascend NPU ([#14981](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/14981))
91126
* Update to ROCm5.7 and PyTorch ([#14820](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/14820))

‎configs/olive/sd/text_encoder.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@
1616
"systems": {
1717
"local_system": {
1818
"type": "LocalSystem",
19-
"config": { "accelerators": ["gpu"] }
19+
"config": {
20+
"accelerators": [
21+
{
22+
"device": "gpu",
23+
"execution_providers": ["DmlExecutionProvider"]
24+
}
25+
]
26+
}
2027
}
2128
},
2229
"evaluators": {
@@ -38,7 +45,6 @@
3845
"passes": {
3946
"optimize_CPUExecutionProvider": {
4047
"type": "OrtTransformersOptimization",
41-
"disable_search": true,
4248
"config": {
4349
"model_type": "clip",
4450
"opt_level": 0,
@@ -49,7 +55,6 @@
4955
},
5056
"optimize_DmlExecutionProvider": {
5157
"type": "OrtTransformersOptimization",
52-
"disable_search": true,
5358
"config": {
5459
"model_type": "clip",
5560
"opt_level": 0,
@@ -78,12 +83,13 @@
7883
"group_norm_channels_last": false
7984
},
8085
"force_fp32_ops": ["RandomNormalLike"],
81-
"force_fp16_inputs": { "GroupNorm": [0, 1, 2] }
86+
"force_fp16_inputs": {
87+
"GroupNorm": [0, 1, 2]
88+
}
8289
}
8390
},
8491
"optimize_CUDAExecutionProvider": {
8592
"type": "OrtTransformersOptimization",
86-
"disable_search": true,
8793
"config": {
8894
"model_type": "clip",
8995
"opt_level": 0,
@@ -94,7 +100,6 @@
94100
},
95101
"optimize_ROCMExecutionProvider": {
96102
"type": "OrtTransformersOptimization",
97-
"disable_search": true,
98103
"config": {
99104
"model_type": "clip",
100105
"opt_level": 0,
@@ -117,17 +122,13 @@
117122
},
118123
"pass_flows": [["optimize_AutoExecutionProvider"]],
119124
"engine": {
120-
"search_strategy": {
121-
"execution_order": "joint",
122-
"search_algorithm": "exhaustive"
123-
},
125+
"log_severity_level": 0,
124126
"evaluator": "common_evaluator",
125127
"evaluate_input_model": false,
126128
"host": "local_system",
127129
"target": "local_system",
128130
"cache_dir": "cache",
129131
"output_name": "text_encoder",
130-
"output_dir": "footprints",
131-
"execution_providers": ["DmlExecutionProvider"]
132+
"output_dir": "footprints"
132133
}
133134
}

‎configs/olive/sd/unet.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,14 @@
3333
"systems": {
3434
"local_system": {
3535
"type": "LocalSystem",
36-
"config": { "accelerators": ["gpu"] }
36+
"config": {
37+
"accelerators": [
38+
{
39+
"device": "gpu",
40+
"execution_providers": ["DmlExecutionProvider"]
41+
}
42+
]
43+
}
3744
}
3845
},
3946
"evaluators": {
@@ -55,7 +62,6 @@
5562
"passes": {
5663
"optimize_CPUExecutionProvider": {
5764
"type": "OrtTransformersOptimization",
58-
"disable_search": true,
5965
"config": {
6066
"model_type": "clip",
6167
"opt_level": 0,
@@ -66,7 +72,6 @@
6672
},
6773
"optimize_DmlExecutionProvider": {
6874
"type": "OrtTransformersOptimization",
69-
"disable_search": true,
7075
"config": {
7176
"model_type": "unet",
7277
"opt_level": 0,
@@ -95,12 +100,13 @@
95100
"group_norm_channels_last": false
96101
},
97102
"force_fp32_ops": ["RandomNormalLike"],
98-
"force_fp16_inputs": { "GroupNorm": [0, 1, 2] }
103+
"force_fp16_inputs": {
104+
"GroupNorm": [0, 1, 2]
105+
}
99106
}
100107
},
101108
"optimize_CUDAExecutionProvider": {
102109
"type": "OrtTransformersOptimization",
103-
"disable_search": true,
104110
"config": {
105111
"model_type": "unet",
106112
"opt_level": 0,
@@ -111,7 +117,6 @@
111117
},
112118
"optimize_ROCMExecutionProvider": {
113119
"type": "OrtTransformersOptimization",
114-
"disable_search": true,
115120
"config": {
116121
"model_type": "unet",
117122
"opt_level": 0,
@@ -134,17 +139,13 @@
134139
},
135140
"pass_flows": [["optimize_AutoExecutionProvider"]],
136141
"engine": {
137-
"search_strategy": {
138-
"execution_order": "joint",
139-
"search_algorithm": "exhaustive"
140-
},
142+
"log_severity_level": 0,
141143
"evaluator": "common_evaluator",
142144
"evaluate_input_model": false,
143145
"host": "local_system",
144146
"target": "local_system",
145147
"cache_dir": "cache",
146148
"output_name": "unet",
147-
"output_dir": "footprints",
148-
"execution_providers": ["DmlExecutionProvider"]
149+
"output_dir": "footprints"
149150
}
150151
}

‎configs/olive/sd/vae_decoder.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,14 @@
2323
"systems": {
2424
"local_system": {
2525
"type": "LocalSystem",
26-
"config": { "accelerators": ["gpu"] }
26+
"config": {
27+
"accelerators": [
28+
{
29+
"device": "gpu",
30+
"execution_providers": ["DmlExecutionProvider"]
31+
}
32+
]
33+
}
2734
}
2835
},
2936
"evaluators": {
@@ -45,7 +52,6 @@
4552
"passes": {
4653
"optimize_CPUExecutionProvider": {
4754
"type": "OrtTransformersOptimization",
48-
"disable_search": true,
4955
"config": {
5056
"model_type": "clip",
5157
"opt_level": 0,
@@ -56,7 +62,6 @@
5662
},
5763
"optimize_DmlExecutionProvider": {
5864
"type": "OrtTransformersOptimization",
59-
"disable_search": true,
6065
"config": {
6166
"model_type": "vae",
6267
"opt_level": 0,
@@ -85,12 +90,13 @@
8590
"group_norm_channels_last": false
8691
},
8792
"force_fp32_ops": ["RandomNormalLike"],
88-
"force_fp16_inputs": { "GroupNorm": [0, 1, 2] }
93+
"force_fp16_inputs": {
94+
"GroupNorm": [0, 1, 2]
95+
}
8996
}
9097
},
9198
"optimize_CUDAExecutionProvider": {
9299
"type": "OrtTransformersOptimization",
93-
"disable_search": true,
94100
"config": {
95101
"model_type": "vae",
96102
"opt_level": 0,
@@ -101,7 +107,6 @@
101107
},
102108
"optimize_ROCMExecutionProvider": {
103109
"type": "OrtTransformersOptimization",
104-
"disable_search": true,
105110
"config": {
106111
"model_type": "vae",
107112
"opt_level": 0,
@@ -124,17 +129,13 @@
124129
},
125130
"pass_flows": [["optimize_AutoExecutionProvider"]],
126131
"engine": {
127-
"search_strategy": {
128-
"execution_order": "joint",
129-
"search_algorithm": "exhaustive"
130-
},
132+
"log_severity_level": 0,
131133
"evaluator": "common_evaluator",
132134
"evaluate_input_model": false,
133135
"host": "local_system",
134136
"target": "local_system",
135137
"cache_dir": "cache",
136138
"output_name": "vae_decoder",
137-
"output_dir": "footprints",
138-
"execution_providers": ["DmlExecutionProvider"]
139+
"output_dir": "footprints"
139140
}
140141
}

‎configs/olive/sd/vae_encoder.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,14 @@
2323
"systems": {
2424
"local_system": {
2525
"type": "LocalSystem",
26-
"config": { "accelerators": ["gpu"] }
26+
"config": {
27+
"accelerators": [
28+
{
29+
"device": "gpu",
30+
"execution_providers": ["DmlExecutionProvider"]
31+
}
32+
]
33+
}
2734
}
2835
},
2936
"evaluators": {
@@ -45,7 +52,6 @@
4552
"passes": {
4653
"optimize_CPUExecutionProvider": {
4754
"type": "OrtTransformersOptimization",
48-
"disable_search": true,
4955
"config": {
5056
"model_type": "clip",
5157
"opt_level": 0,
@@ -56,7 +62,6 @@
5662
},
5763
"optimize_DmlExecutionProvider": {
5864
"type": "OrtTransformersOptimization",
59-
"disable_search": true,
6065
"config": {
6166
"model_type": "vae",
6267
"opt_level": 0,
@@ -85,12 +90,13 @@
8590
"group_norm_channels_last": false
8691
},
8792
"force_fp32_ops": ["RandomNormalLike"],
88-
"force_fp16_inputs": { "GroupNorm": [0, 1, 2] }
93+
"force_fp16_inputs": {
94+
"GroupNorm": [0, 1, 2]
95+
}
8996
}
9097
},
9198
"optimize_CUDAExecutionProvider": {
9299
"type": "OrtTransformersOptimization",
93-
"disable_search": true,
94100
"config": {
95101
"model_type": "vae",
96102
"opt_level": 0,
@@ -101,7 +107,6 @@
101107
},
102108
"optimize_ROCMExecutionProvider": {
103109
"type": "OrtTransformersOptimization",
104-
"disable_search": true,
105110
"config": {
106111
"model_type": "vae",
107112
"opt_level": 0,
@@ -124,17 +129,13 @@
124129
},
125130
"pass_flows": [["optimize_AutoExecutionProvider"]],
126131
"engine": {
127-
"search_strategy": {
128-
"execution_order": "joint",
129-
"search_algorithm": "exhaustive"
130-
},
132+
"log_severity_level": 0,
131133
"evaluator": "common_evaluator",
132134
"evaluate_input_model": false,
133135
"host": "local_system",
134136
"target": "local_system",
135137
"cache_dir": "cache",
136138
"output_name": "vae_encoder",
137-
"output_dir": "footprints",
138-
"execution_providers": ["DmlExecutionProvider"]
139+
"output_dir": "footprints"
139140
}
140141
}

0 commit comments

Comments
 (0)