github/DeepFaceLab
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLab.git synced 2025-07-05 20:42:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from jkennedyvz/jk/macm1

Browse source 
Jk/macm1
This commit is contained in:
jkennedyvz 2022-05-22 18:15:45 -07:00 • committed by GitHub
commit 5199bedcb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
XSegEditor/QCursorDB.py
View file

@ -1,6 +1,6 @@
from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from PySide6.QtCore import *
from PySide6.QtGui import *
from PySide6.QtWidgets import *
class QCursorDB():
@staticmethod

6
XSegEditor/QIconDB.py
View file

@ -1,6 +1,6 @@
from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from PySide6.QtCore import *
from PySide6.QtGui import *
from PySide6.QtWidgets import *
class QIconDB():

6
XSegEditor/QImageDB.py
View file

@ -1,6 +1,6 @@
from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from PySide6.QtCore import *
from PySide6.QtGui import *
from PySide6.QtWidgets import *
class QImageDB():
@staticmethod

13
XSegEditor/XSegEditor.py
View file

@ -12,9 +12,9 @@ from types import SimpleNamespace as sn
import cv2
import numpy as np
import numpy.linalg as npla
from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from PySide6.QtCore import *
from PySide6.QtGui import *
from PySide6.QtWidgets import *
from core import imagelib, pathex
from core.cv2ex import *
@ -152,9 +152,9 @@ class CanvasConfig():
if color_schemes is None:
color_schemes = [
ColorScheme( QColor(192,0,0,alpha=0), QColor(192,0,0,alpha=72), QColor(192,0,0), 2, QColor(255,255,255), QCursorDB.cross_red ),
ColorScheme( QColor(0,192,0,alpha=0), QColor(0,192,0,alpha=72), QColor(0,192,0), 2, QColor(255,255,255), QCursorDB.cross_green ),
ColorScheme( QColor(0,0,192,alpha=0), QColor(0,0,192,alpha=72), QColor(0,0,192), 2, QColor(255,255,255), QCursorDB.cross_blue ),
ColorScheme( QColor(192,0,0), QColor(192,0,0), QColor(192,0,0), 2, QColor(255,255,255), QCursorDB.cross_red ),
ColorScheme( QColor(0,192,0), QColor(0,192,0), QColor(0,192,0), 2, QColor(255,255,255), QCursorDB.cross_green ),
ColorScheme( QColor(0,0,192), QColor(0,0,192), QColor(0,0,192), 2, QColor(255,255,255), QCursorDB.cross_blue ),
]
self.color_schemes = color_schemes
@ -941,7 +941,6 @@ class QCanvasOperator(QWidget):
qp = self.qp
qp.begin(self)
qp.setRenderHint(QPainter.Antialiasing)
qp.setRenderHint(QPainter.HighQualityAntialiasing)
qp.setRenderHint(QPainter.SmoothPixmapTransform)
src_rect = QRect(0, 0, *self.img_size)

4
core/imagelib/warp.py
View file

@ -143,7 +143,7 @@ def gen_warp_params (w, flip=False, rotation_range=[-10,10], scale_range=[-0.5,
################
#random transform
random_transform_mat = cv2.getRotationMatrix2D((w // 2, w // 2), rotation, scale)
random_transform_mat = cv2.getRotationMatrix2D((int(w // 2), int(w // 2)), rotation, scale)
random_transform_mat[:, 2] += (tx*w, ty*w)
params = dict()
@ -178,4 +178,4 @@ def warp_by_params (params, img, can_warp, can_transform, can_flip, border_repli
img = img[...,None]
if can_flip and params['flip']:
img = img[:,::-1,...]
return img
return img

6
core/leras/device.py
View file

@ -46,7 +46,7 @@ class Devices(object):
idx_mem = 0
for device in self.devices:
mem = device.total_mem
if mem > idx_mem:
if mem >= idx_mem:
result = device
idx_mem = mem
return result
@ -56,7 +56,7 @@ class Devices(object):
idx_mem = sys.maxsize
for device in self.devices:
mem = device.total_mem
if mem < idx_mem:
if mem <= idx_mem:
result = device
idx_mem = mem
return result
@ -270,4 +270,4 @@ class Devices(object):
os.environ[f'NN_DEVICE_{i}_TOTAL_MEM'] = str(device['total_mem'])
os.environ[f'NN_DEVICE_{i}_FREE_MEM'] = str(device['free_mem'])
os.environ[f'NN_DEVICE_{i}_CC'] = str(device['cc'])
"""
"""

1
core/leras/nn.py
View file

@ -112,6 +112,7 @@ class nn():
config.gpu_options.force_gpu_compatible = True
config.gpu_options.allow_growth = True
config.allow_soft_placement = True
nn.tf_sess_config = config
if nn.tf_sess is None:

6
core/qtex/QSubprocessor.py
View file

@ -3,9 +3,9 @@ import sys
import time
import traceback
from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from PySide6.QtCore import *
from PySide6.QtGui import *
from PySide6.QtWidgets import *
from core.interact import interact as io

6
core/qtex/QXIconButton.py
View file

@ -1,6 +1,6 @@
from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from PySide6.QtCore import *
from PySide6.QtGui import *
from PySide6.QtWidgets import *
from localization import StringsDB
from .QXMainWindow import *

6
core/qtex/QXMainWindow.py
View file

@ -1,6 +1,6 @@
from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from PySide6.QtCore import *
from PySide6.QtGui import *
from PySide6.QtWidgets import *
class QXMainWindow(QWidget):
"""

6
core/qtex/qtex.py
View file

@ -1,7 +1,7 @@
import numpy as np
from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from PySide6.QtCore import *
from PySide6.QtGui import *
from PySide6.QtWidgets import *
from localization import StringsDB
from .QXMainWindow import *

4
requirements-cuda.txt
View file

@ -8,5 +8,5 @@ scikit-image==0.14.2
scipy==1.4.1
colorama
tensorflow-gpu==2.4.0
pyqt5
tf2onnx==1.9.3
pysides6
tf2onnx==1.9.3