Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
151e2cc6
Unverified
Commit
151e2cc6
authored
Nov 27, 2022
by
AUTOMATIC1111
Committed by
GitHub
Nov 27, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4461 from brkirch/face-restoration-device-fix
Fix setting device for GFPGAN and CodeFormer
parents
cc90dcc9
f4a488f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
codeformer_model.py
modules/codeformer_model.py
+3
-0
gfpgan_model.py
modules/gfpgan_model.py
+3
-1
No files found.
modules/codeformer_model.py
View file @
151e2cc6
...
@@ -36,6 +36,7 @@ def setup_model(dirname):
...
@@ -36,6 +36,7 @@ def setup_model(dirname):
from
basicsr.utils.download_util
import
load_file_from_url
from
basicsr.utils.download_util
import
load_file_from_url
from
basicsr.utils
import
imwrite
,
img2tensor
,
tensor2img
from
basicsr.utils
import
imwrite
,
img2tensor
,
tensor2img
from
facelib.utils.face_restoration_helper
import
FaceRestoreHelper
from
facelib.utils.face_restoration_helper
import
FaceRestoreHelper
from
facelib.detection.retinaface
import
retinaface
from
modules.shared
import
cmd_opts
from
modules.shared
import
cmd_opts
net_class
=
CodeFormer
net_class
=
CodeFormer
...
@@ -65,6 +66,8 @@ def setup_model(dirname):
...
@@ -65,6 +66,8 @@ def setup_model(dirname):
net
.
load_state_dict
(
checkpoint
)
net
.
load_state_dict
(
checkpoint
)
net
.
eval
()
net
.
eval
()
if
hasattr
(
retinaface
,
'device'
):
retinaface
.
device
=
devices
.
device_codeformer
face_helper
=
FaceRestoreHelper
(
1
,
face_size
=
512
,
crop_ratio
=
(
1
,
1
),
det_model
=
'retinaface_resnet50'
,
save_ext
=
'png'
,
use_parse
=
True
,
device
=
devices
.
device_codeformer
)
face_helper
=
FaceRestoreHelper
(
1
,
face_size
=
512
,
crop_ratio
=
(
1
,
1
),
det_model
=
'retinaface_resnet50'
,
save_ext
=
'png'
,
use_parse
=
True
,
device
=
devices
.
device_codeformer
)
self
.
net
=
net
self
.
net
=
net
...
...
modules/gfpgan_model.py
View file @
151e2cc6
...
@@ -36,7 +36,9 @@ def gfpgann():
...
@@ -36,7 +36,9 @@ def gfpgann():
else
:
else
:
print
(
"Unable to load gfpgan model!"
)
print
(
"Unable to load gfpgan model!"
)
return
None
return
None
model
=
gfpgan_constructor
(
model_path
=
model_file
,
upscale
=
1
,
arch
=
'clean'
,
channel_multiplier
=
2
,
bg_upsampler
=
None
)
if
hasattr
(
facexlib
.
detection
.
retinaface
,
'device'
):
facexlib
.
detection
.
retinaface
.
device
=
devices
.
device_gfpgan
model
=
gfpgan_constructor
(
model_path
=
model_file
,
upscale
=
1
,
arch
=
'clean'
,
channel_multiplier
=
2
,
bg_upsampler
=
None
,
device
=
devices
.
device_gfpgan
)
loaded_gfpgan_model
=
model
loaded_gfpgan_model
=
model
return
model
return
model
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment