Skip to content

Commit 2cc76d8

Browse files
committed
修复QPT会因为依赖等关系将CPU版本的Paddle打包入内,造成CPU+GPU版本同时被安装,提示运行在CPU模式下, 实际上可以用上GPU
给用户增加检测GPU可用性提示
1 parent 55223d9 commit 2cc76d8

12 files changed

Lines changed: 18 additions & 4 deletions

File tree

.github/workflows/build-windows-cuda-10.2.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ jobs:
7373
pip download -d ./vse_out/Debug/opt/packages/ paddlepaddle-gpu==2.5.2.post102 -f https://www.paddlepaddle.org.cn/whl/windows/mkl/avx/stable.html && \
7474
pip download -d ./vse_out/Debug/opt/packages/ -r requirements.txt && \
7575
cp -rfv ./vse_out/Debug/opt/packages/* ./vse_out/Release/opt/packages/ && \
76-
rm -fv ./vse_out/*/opt/packages/numpy-2*
76+
rm -fv ./vse_out/*/opt/packages/numpy-2* && \
77+
rm -fv ./vse_out/*/opt/packages/paddlepaddle-* && \
78+
rm -fv ./vse_out/*/opt/PaddlePaddlePackage/001-*
7779
env:
7880
QPT_Action: "True"
7981
CUDA_PATH_V10_2: "${{steps.cuda-toolkit.outputs.CUDA_PATH}}"

.github/workflows/build-windows-cuda-11.8.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ jobs:
6262
pip download -d ./vse_out/Debug/opt/packages/ paddlepaddle-gpu==3.0.0rc1 -i https://www.paddlepaddle.org.cn/packages/stable/cu118/ && \
6363
pip download -d ./vse_out/Debug/opt/packages/ -r requirements.txt && \
6464
cp -rfv ./vse_out/Debug/opt/packages/* ./vse_out/Release/opt/packages/ && \
65-
rm -fv ./vse_out/*/opt/packages/numpy-2*
65+
rm -fv ./vse_out/*/opt/packages/numpy-2* && \
66+
rm -fv ./vse_out/*/opt/packages/paddlepaddle-* && \
67+
rm -fv ./vse_out/*/opt/PaddlePaddlePackage/001-*
6668
env:
6769
QPT_Action: "True"
6870
shell: bash

.github/workflows/build-windows-cuda-12.3.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ jobs:
6262
pip download -d ./vse_out/Debug/opt/packages/ paddlepaddle-gpu==3.0.0rc1 -i https://www.paddlepaddle.org.cn/packages/stable/cu123/ && \
6363
pip download -d ./vse_out/Debug/opt/packages/ -r requirements.txt && \
6464
cp -rfv ./vse_out/Debug/opt/packages/* ./vse_out/Release/opt/packages/ && \
65-
rm -fv ./vse_out/*/opt/packages/numpy-2*
65+
rm -fv ./vse_out/*/opt/packages/numpy-2* && \
66+
rm -fv ./vse_out/*/opt/packages/paddlepaddle-* && \
67+
rm -fv ./vse_out/*/opt/PaddlePaddlePackage/001-*
6668
env:
6769
QPT_Action: "True"
6870
shell: bash

backend/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from tools.constant import *
1818

1919
# 项目版本号
20-
VERSION = "2.0.1"
20+
VERSION = "2.0.2"
2121

2222
# 项目的base目录
2323
BASE_DIR = str(Path(os.path.abspath(__file__)).parent)

backend/interface/ch.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ SubtitleArea = 字幕区域
111111
RecSubLang = 识别字幕语言
112112
RecMode = 识别模式
113113
IllegalPathWarning = 【警告】程序运行中断!路径不合法!请不要将程序放入带有空格和中文的路径下!!!请修改程序路径名后重新运行程序
114+
GPUWarning = 【重要提示】请勿通过任务管理器、GPU低占用率或"PaddlePaddle works on..."等信息提示判断程序是否调用显卡资源。由于现代显卡的运算效率极高,通常可在每秒内处理上千张图像任务,出现低占用率属正常现象。如需验证硬件调用状态,请通过对比CPU版本与GPU版本的执行耗时差异进行判断,若两者运行时间相近再进行反馈。
114115
GPUSpeedUp = 使用GPU进行加速
115116
FrameCount = 帧数
116117
FrameRate = 帧率

backend/interface/chinese_cht.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ SubtitleArea = 字幕區域
111111
RecSubLang = 識別字幕語言
112112
RecMode = 識別模式
113113
IllegalPathWarning = 【警告】程序運行中斷!路徑不合法!請不要將程序放入帶有空格和中文的路徑下!!!請修改程序路徑名後重新運行程序
114+
GPUWarning = 【重要提示】請勿透過工作管理員、GPU低使用率或「PaddlePaddle works on...」等訊息提示判斷程式是否調用顯示卡資源。由於現代顯示卡的運算效率極高,通常可在每秒內處理上千張影像任務,低使用率屬正常現象。如需驗證硬體調用狀態,請透過對比CPU版本與GPU版本的執行耗時差異進行判斷,若兩者運行時間相近再進行回饋。
114115
GPUSpeedUp = 使用GPU進行加速
115116
FrameCount = 幀數
116117
FrameRate = 幀率

backend/interface/en.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ SubtitleArea = Subtitle Area
111111
RecSubLang = Subtitle Language
112112
RecMode = Mode
113113
IllegalPathWarning = [Warning] The program is interrupted! The path is illegal! Please do not put the program in a path with spaces and Chinese! ! ! Please modify the program path name and re-run the program
114+
GPUWarning = [Important Notice] Do not rely on Task Manager, low GPU utilization, or messages like "PaddlePaddle works on..." to determine whether the program utilizes GPU resources. Modern GPUs are designed for extreme computational efficiency, typically capable of processing thousands of image tasks per second, making low utilization rates a normal occurrence. To verify hardware resource allocation, please compare execution time differences between the CPU and GPU versions. Submit feedback only if the runtime durations are comparable.
114115
GPUSpeedUp = Use GPU for acceleration
115116
FrameCount = Frame Count
116117
FrameRate = Frame Rate

backend/interface/es.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ SubtitleArea = Área de subtítulos
111111
RecSubLang = Idioma de subtítulos
112112
RecMode = Modo
113113
IllegalPathWarning = [Advertencia] ¡El programa se interrumpió! ¡La ruta es ilegal! ¡No coloque el programa en una ruta con espacios y caracteres chinos! Por favor, modifique el nombre de ruta del programa y vuelva a ejecutarlo.
114+
GPUWarning = [Aviso importante] No utilice el Administrador de tareas, la baja utilización de GPU ni mensajes como "PaddlePaddle works on..." para evaluar el uso de recursos gráficos. Las GPU modernas tienen una eficiencia computacional excepcional, procesando miles de imágenes por segundo, por lo que una baja tasa de uso es normal. Para verificar el estado de asignación de hardware, compare las diferencias de tiempo de ejecución entre las versiones de CPU y GPU. Proporcione comentarios únicamente si los tiempos de ejecución son similares.
114115
GPUSpeedUp = Use GPU para aceleración
115116
FrameCount = Conteo de fotogramas
116117
FrameRate = Velocidad de fotogramas

backend/interface/japan.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ SubtitleArea = サブタイトル領域
111111
RecSubLang = サブタイトル言語
112112
RecMode = モード
113113
IllegalPathWarning = 【注意】プログラムは中断されました! パスが不正です! プログラムをスペースや中国語が含まれるパスに置かないでください!!! プログラムのパス名を修正してプログラムを再実行してください
114+
GPUWarning = 【重要なお知らせ】タスクマネージャー、GPU低使用率、または「PaddlePaddle works on...」といったメッセージでGPUリソースの使用状況を判断しないでください。最新GPUは極めて高い演算効率を備え、通常1秒間に数千の画像タスクを処理可能なため、低使用率は正常です。ハードウェアリソースの使用状態を確認する場合は、CPU版とGPU版の実行時間差を比較してください。両者の処理時間が近似する場合に限り、フィードバックを提出願います。
114115
GPUSpeedUp = GPUを使用して加速します
115116
FrameCount = フレーム数
116117
FrameRate = フレームレート

backend/interface/ko.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ SubtitleArea = 자막 영역
111111
RecSubLang = 자막 언어 인식
112112
RecMode = 인식 모드
113113
IllegalPathWarning = [경고] 프로그램이 중단되었습니다! 경로가 올바르지 않습니다! 공백과 한국어가 포함된 경로에 프로그램을 넣지 마세요! 경로 이름을 변경하고 프로그램을 다시 실행해주세요
114+
GPUWarning = [중요 공지] 작업 관리자, GPU 저사용률 또는 "PaddlePaddle works on..." 메시지로 GPU 리소스 사용 여부를 판단하지 마십시오. 최신 GPU는 초당 수천 장의 이미지 작업을 처리할 수 있는 극한의 연산 효율성을 지니며, 낮은 사용률은 정상 현상입니다. 하드웨어 할당 상태를 확인하려면 CPU 버전과 GPU 버전의 실행 시간 차이를 비교해 주시기 바랍니다. 두 버전의 소요 시간이 유사한 경우에만 피드백을 제출해 주십시오.
114115
GPUSpeedUp = 가속을 위해 GPU 사용
115116
FrameCount = 프레임 수
116117
FrameRate = 프레임 속도

0 commit comments

Comments
 (0)