Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Overbill1683
Stable Diffusion Webui
提交
f253790b
S
Stable Diffusion Webui
项目概览
Overbill1683
/
Stable Diffusion Webui
11 个月 前同步成功
通知
1754
Star
81
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
分析
仓库
DevOps
项目成员
Pages
S
Stable Diffusion Webui
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Pages
分析
分析
仓库分析
DevOps
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
提交
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
f253790b
编写于
9月 30, 2022
作者:
A
AUTOMATIC1111
提交者:
GitHub
9月 30, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1371 from d8ahazard/master
Fix LDSR, BSRGAN, recursive SD checkpoint Loading
上级
3f64e23f
a9a0320d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
7 deletion
+17
-7
modules/bsrgan_model.py
modules/bsrgan_model.py
+1
-1
modules/ldsr_model.py
modules/ldsr_model.py
+13
-2
modules/ldsr_model_arch.py
modules/ldsr_model_arch.py
+1
-3
modules/modelloader.py
modules/modelloader.py
+2
-1
未找到文件。
modules/bsrgan_model.py
浏览文件 @
f253790b
...
...
@@ -69,7 +69,7 @@ class UpscalerBSRGAN(modules.upscaler.Upscaler):
if
not
os
.
path
.
exists
(
filename
)
or
filename
is
None
:
print
(
f
"BSRGAN: Unable to load model from
{
filename
}
"
,
file
=
sys
.
stderr
)
return
None
model
=
RRDBNet
(
in_nc
=
3
,
out_nc
=
3
,
nf
=
64
,
nb
=
23
,
gc
=
32
,
sf
=
2
)
# define network
model
=
RRDBNet
(
in_nc
=
3
,
out_nc
=
3
,
nf
=
64
,
nb
=
23
,
gc
=
32
,
sf
=
4
)
# define network
model
.
load_state_dict
(
torch
.
load
(
filename
),
strict
=
True
)
model
.
eval
()
for
k
,
v
in
model
.
named_parameters
():
...
...
modules/ldsr_model.py
浏览文件 @
f253790b
...
...
@@ -22,8 +22,20 @@ class UpscalerLDSR(Upscaler):
self
.
scalers
=
[
scaler_data
]
def
load_model
(
self
,
path
:
str
):
# Remove incorrect project.yaml file if too big
yaml_path
=
os
.
path
.
join
(
self
.
model_path
,
"project.yaml"
)
old_model_path
=
os
.
path
.
join
(
self
.
model_path
,
"model.pth"
)
new_model_path
=
os
.
path
.
join
(
self
.
model_path
,
"model.ckpt"
)
if
os
.
path
.
exists
(
yaml_path
):
statinfo
=
os
.
stat
(
yaml_path
)
if
statinfo
.
st_size
>=
10485760
:
print
(
"Removing invalid LDSR YAML file."
)
os
.
remove
(
yaml_path
)
if
os
.
path
.
exists
(
old_model_path
):
print
(
"Renaming model from model.pth to model.ckpt"
)
os
.
rename
(
old_model_path
,
new_model_path
)
model
=
load_file_from_url
(
url
=
self
.
model_url
,
model_dir
=
self
.
model_path
,
file_name
=
"model.
pth
"
,
progress
=
True
)
file_name
=
"model.
ckpt
"
,
progress
=
True
)
yaml
=
load_file_from_url
(
url
=
self
.
yaml_url
,
model_dir
=
self
.
model_path
,
file_name
=
"project.yaml"
,
progress
=
True
)
...
...
@@ -41,5 +53,4 @@ class UpscalerLDSR(Upscaler):
print
(
"NO LDSR!"
)
return
img
ddim_steps
=
shared
.
opts
.
ldsr_steps
pre_scale
=
shared
.
opts
.
ldsr_pre_down
return
ldsr
.
super_resolution
(
img
,
ddim_steps
,
self
.
scale
)
modules/ldsr_model_arch.py
浏览文件 @
f253790b
...
...
@@ -98,9 +98,7 @@ class LDSR:
im_og
=
image
width_og
,
height_og
=
im_og
.
size
# If we can adjust the max upscale size, then the 4 below should be our variable
print
(
"Foo"
)
down_sample_rate
=
target_scale
/
4
print
(
f
"Downsample rate is
{
down_sample_rate
}
"
)
wd
=
width_og
*
down_sample_rate
hd
=
height_og
*
down_sample_rate
width_downsampled_pre
=
int
(
wd
)
...
...
@@ -111,7 +109,7 @@ class LDSR:
f
'Downsampling from [
{
width_og
}
,
{
height_og
}
] to [
{
width_downsampled_pre
}
,
{
height_downsampled_pre
}
]'
)
im_og
=
im_og
.
resize
((
width_downsampled_pre
,
height_downsampled_pre
),
Image
.
LANCZOS
)
else
:
print
(
f
"Down sample rate is 1 from
{
target_scale
}
/ 4"
)
print
(
f
"Down sample rate is 1 from
{
target_scale
}
/ 4
(Not downsampling)
"
)
logs
=
self
.
run
(
model
[
"model"
],
im_og
,
diffusion_steps
,
eta
)
sample
=
logs
[
"sample"
]
...
...
modules/modelloader.py
浏览文件 @
f253790b
import
glob
import
os
import
shutil
import
importlib
...
...
@@ -41,7 +42,7 @@ def load_models(model_path: str, model_url: str = None, command_path: str = None
for
place
in
places
:
if
os
.
path
.
exists
(
place
):
for
file
in
os
.
listdir
(
plac
e
):
for
file
in
glob
.
iglob
(
place
+
'**/**'
,
recursive
=
Tru
e
):
full_path
=
os
.
path
.
join
(
place
,
file
)
if
os
.
path
.
isdir
(
full_path
):
continue
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录