Skip to content

Commit

Permalink
fix naming
Browse files Browse the repository at this point in the history
  • Loading branch information
TNTwise committed Apr 21, 2024
1 parent 2a47cd8 commit a57abb9
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion modules/CustomModelsNCNN.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ def modelOptions(self):
self.ui.Rife_Model.setEnabled(True)
# lambda: startRender(self.input_file,f'{outputpath}/{os.path.basename(self.input_file)}_{self.fps*self.times}fps.mp4',self.times)
self.ui.RifeStart.clicked.connect(
lambda: upscale.start_upscale(self, "custom-models-ncnn-python-cuda")
lambda: upscale.start_upscale(self, "custom-models-ncnn-python")
)
4 changes: 2 additions & 2 deletions modules/ESRGAN.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def modelOptions(self):
self.greyOutRealSRTimes()
self.ui.RifeStart.clicked.connect(
lambda: upscale.start_upscale(
self, "realesrgan-ncnn-python-cuda"
) # checks for if cuda, just going to use the same if ignoring frame extraction
self, "realesrgan-ncnn-python"
)
)
self.ui.Rife_Times.clear()
self.ui.denoiseLevelLabel.hide()
Expand Down
2 changes: 1 addition & 1 deletion modules/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def cudaAndNCNN(self, videopath, renderdir, videoName, thread):
if "-ncnn-vulkan" in self.AI:
self.ncnn = True
self.cuda = False
if "-cuda" in self.AI:
if "-cuda" in self.AI or "-ncnn-python" in self.AI:
self.ncnn = False
self.cuda = True
os.system(f'mkdir -p "{renderdir}/{videoName}_temp/output_frames/0/"')
Expand Down
2 changes: 1 addition & 1 deletion modules/realsr.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def modelOptions(self):
self.ui.Rife_Model.currentIndexChanged.connect((self.greyOutRealSRTimes))
self.greyOutRealSRTimes()
self.ui.RifeStart.clicked.connect(
lambda: upscale.start_upscale(self, "realsr-ncnn-python-cuda")
lambda: upscale.start_upscale(self, "realsr-ncnn-python")
)
self.ui.Rife_Times.clear()
self.ui.denoiseLevelLabel.hide()
Expand Down
2 changes: 1 addition & 1 deletion src/misc/onProgramStart.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def bindButtons(self):
)
self.ui.esrganHelpModel.clicked.connect(
lambda: open_link(
r"https://github.com/upscayl/upscayl/wiki/%F0%9F%96%A5%EF%B8%8F-Model-Conversion%E2%80%89%E2%80%93%E2%80%89Get-more-models!"
"https://github.com/upscayl/upscayl/wiki/Model-Conversion-Guide"
)
)
self.ui.cudaArchSupportButton.clicked.connect(
Expand Down
6 changes: 3 additions & 3 deletions src/runAI/workers.py
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ def realESRGAN(self):
)


if self.main.AI == "realesrgan-ncnn-python-cuda":
if self.main.AI == "realesrgan-ncnn-python":
output_file = returnOutputFile(
self.main, self.main.videoName, self.main.encoder
)
Expand All @@ -928,7 +928,7 @@ def realESRGAN(self):
)


if self.main.AI == "realsr-ncnn-python-cuda":
if self.main.AI == "realsr-ncnn-python":
output_file = returnOutputFile(
self.main, self.main.videoName, self.main.encoder
)
Expand All @@ -946,7 +946,7 @@ def realESRGAN(self):
threads=int(settings.VRAM),
)

if self.main.AI == "custom-models-ncnn-python-cuda":
if self.main.AI == "custom-models-ncnn-python":
output_file = returnOutputFile(
self.main, self.main.videoName, self.main.encoder
)
Expand Down
Binary file modified src/torch/rife/__pycache__/rife.cpython-311.pyc
Binary file not shown.
Binary file modified src/torch/rife/rife414/__pycache__/IFNet_HDv3.cpython-311.pyc
Binary file not shown.
Binary file modified src/torch/rife/rife414/__pycache__/RIFE_HDv3.cpython-311.pyc
Binary file not shown.
Binary file modified src/torch/rife/rife416lite/__pycache__/IFNet_HDv3.cpython-311.pyc
Binary file not shown.
Binary file modified src/torch/rife/rife416lite/__pycache__/RIFE_HDv3.cpython-311.pyc
Binary file not shown.

0 comments on commit a57abb9

Please sign in to comment.