From 7987ecb3a04463d09d3aec7b7247f083771cf760 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 26 Dec 2025 06:15:12 -0800 Subject: [PATCH] ... --- app.py | 10 +++++----- ebook2audiobook.cmd | 10 +++++++++- ebook2audiobook.sh | 3 ++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app.py b/app.py index 2d2d69f4..0d8f7da5 100644 --- a/app.py +++ b/app.py @@ -105,20 +105,20 @@ Docker run image: CPU: docker run --rm -it -p 7860:7860 ebook2audiobook:cpu CUDA: - docker run --gpus all --rm -it -p 7860:7860 ebook2audiobook:cu[118/121/128 etc..] + docker run --gpus all --rm -it -p 7860:7860 ebook2audiobook:cu[118/122/124/126 etc..] ROCM: - docker run --device=/dev/kfd --device=/dev/dri --rm -it -p 7860:7860 ebook2audiobook:rocm[5.5/6.1/6.4 etc..] + docker run --device=/dev/kfd --device=/dev/dri --rm -it -p 7860:7860 ebook2audiobook:rocm[6.0/6.1/6.4 etc..] XPU: docker run --device=/dev/dri --rm -it -p 7860:7860 ebook2audiobook:xpu JETSON: - docker run --runtime nvidia --rm -it -p 7860:7860 ebook2audiobook:jetson[51/60/61 etc...] + docker run --runtime nvidia --rm -it -p 7860:7860 ebook2audiobook:jetson[60/61 etc...] Headless mode: CPU: docker run --rm -it -v "/my/real/ebooks/folder/absolute/path:/app/ebooks" -v "/my/real/output/folder/absolute/path:/app/audiobooks" -p 7860:7860 ebook2audiobook:cpu --headless --ebook "/app/ebooks/myfile.pdf" [--voice /app/my/voicepath/voice.mp3 etc..] CUDA: - docker run --gpus all --rm -it -v "/my/real/ebooks/folder/absolute/path:/app/ebooks" -v "/my/real/output/folder/absolute/path:/app/audiobooks" -p 7860:7860 ebook2audiobook:cu[118/121/128 etc..] --headless --ebook "/app/ebooks/myfile.pdf" [--voice /app/my/voicepath/voice.mp3 etc..] + docker run --gpus all --rm -it -v "/my/real/ebooks/folder/absolute/path:/app/ebooks" -v "/my/real/output/folder/absolute/path:/app/audiobooks" -p 7860:7860 ebook2audiobook:cu[118/122/124/126 etc..] --headless --ebook "/app/ebooks/myfile.pdf" [--voice /app/my/voicepath/voice.mp3 etc..] ROCM: - docker run --device=/dev/kfd --device=/dev/dri --rm -it -v "/my/real/ebooks/folder/absolute/path:/app/ebooks" -v "/my/real/output/folder/absolute/path:/app/audiobooks" -p 7860:7860 ebook2audiobook:rocm[5.5/6.1/6.4 etc..] --headless --ebook "/app/ebooks/myfile.pdf" [--voice /app/my/voicepath/voice.mp3 etc..] + docker run --device=/dev/kfd --device=/dev/dri --rm -it -v "/my/real/ebooks/folder/absolute/path:/app/ebooks" -v "/my/real/output/folder/absolute/path:/app/audiobooks" -p 7860:7860 ebook2audiobook:rocm[6.0/6.1/6.4 etc..] --headless --ebook "/app/ebooks/myfile.pdf" [--voice /app/my/voicepath/voice.mp3 etc..] XPU: docker run --device=/dev/dri --rm -it -v "/my/real/ebooks/folder/absolute/path:/app/ebooks" -v "/my/real/output/folder/absolute/path:/app/audiobooks" -p 7860:7860 ebook2audiobook:xpu --headless --ebook "/app/ebooks/myfile.pdf" [--voice /app/my/voicepath/voice.mp3 etc..] JETSON: diff --git a/ebook2audiobook.cmd b/ebook2audiobook.cmd index 09d66bec..d010a45c 100755 --- a/ebook2audiobook.cmd +++ b/ebook2audiobook.cmd @@ -81,6 +81,8 @@ set "BROWSER_HELPER=%SCRIPT_DIR%\.bh.ps1" set "HELP_FOUND=%ARGS:--help=%" set "HEADLESS_FOUND=%ARGS:--headless=%" +IF NOT DEFINED DEVICE_TAG SET "DEVICE_TAG=" + set "OK_SCOOP=0" set "OK_CONDA=0" set "OK_PROGRAMS=0" @@ -526,7 +528,13 @@ exit /b 0 :build_docker_image set "ARG=%~1" -for /f %%A in ('powershell -NoLogo -Command "(ConvertFrom-Json ''%ARG%'').tag"') do set "TAG=%%A" +if "%DEVICE_TAG%"=="" ( + for /f "usebackq delims=" %%A in (`powershell -NoLogo -Command "(ConvertFrom-Json '%ARG%').tag"`) do ( + set "TAG=%%A" + ) +) else ( + set "TAG=%DEVICE_TAG%" +) "%PS_EXE%" %PS_ARGS% -command "if (!(Get-Command docker -ErrorAction SilentlyContinue)) { Write-Host '=============== Error: Docker must be installed and running!' -ForegroundColor Red; exit 1 }" if errorlevel 1 exit /b 1 "%PS_EXE%" %PS_ARGS% -command "if (docker compose version > $null 2>&1) { exit 0 } else { exit 1 }" diff --git a/ebook2audiobook.sh b/ebook2audiobook.sh index 2da1e03b..234c151e 100755 --- a/ebook2audiobook.sh +++ b/ebook2audiobook.sh @@ -63,6 +63,7 @@ PACK_MGR_OPTIONS="" BUILD_NAME="" ISO3_LANG="eng" SUDO="sudo" +DEVICE_TAG="${DEVICE_TAG:-}" ARGS=("$@") @@ -719,7 +720,7 @@ function build_docker_image { echo -e "\e[31m=============== Error: Docker must be installed and running!.\e[0m" return 1 fi - local TAG=$(python3 -c 'import json,sys; print(json.loads(sys.argv[1])["tag"])' "$ARG") + local TAG=${DEVICE_TAG:-$(python3 -c 'import json,sys; print(json.loads(sys.argv[1])["tag"])' "$ARG")} local cmd_options="" local cmd_extra="" local py_vers="$PYTHON_VERSION"