diff --git a/install/install_packages.bat b/install/install_packages.bat index f898d89..7309fd9 100644 --- a/install/install_packages.bat +++ b/install/install_packages.bat @@ -196,6 +196,22 @@ exit /b 0 set "PREV_RECORD_EXISTS=0" set "PREV_MODE=" set "PREV_OPTION=" +set "VENV_TORCH_TYPE=NONE" +set "VENV_TORCH_VER=NONE" +set "VENV_TORCH_CUDA=NONE" +set "VENV_ORT_TYPE=NONE" +set "VENV_ORT_VER=NONE" + +if exist "%VENV_PYTHON%" ( + for /f "tokens=1,2 delims==" %%A in ('"%VENV_PYTHON%" "%~dp0install_record.py" inspect-stack 2^>nul') do ( + if "%%A"=="TORCH_TYPE" set "VENV_TORCH_TYPE=%%B" + if "%%A"=="TORCH_VER" set "VENV_TORCH_VER=%%B" + if "%%A"=="TORCH_CUDA" set "VENV_TORCH_CUDA=%%B" + if "%%A"=="ORT_TYPE" set "VENV_ORT_TYPE=%%B" + if "%%A"=="ORT_VER" set "VENV_ORT_VER=%%B" + ) +) + if exist "%~dp0install_record.json" if exist "%VENV_PYTHON%" ( for /f "tokens=1,2 delims==" %%A in ('"%VENV_PYTHON%" "%~dp0install_record.py" read 2^>nul') do ( if "%%A"=="MODE" set "PREV_MODE=%%B" @@ -207,6 +223,10 @@ if "!PREV_RECORD_EXISTS!"=="1" ( echo Previous installation detected : [!PREV_OPTION!] !PREV_MODE! call :log "Previous install detected: Option !PREV_OPTION!, Mode !PREV_MODE!" ) +if not "!VENV_TORCH_TYPE!"=="NONE" ( + echo Current environment stack : Torch=!VENV_TORCH_TYPE! (!VENV_TORCH_VER!), ORT=!VENV_ORT_TYPE! (!VENV_ORT_VER!) + call :log "Current venv stack: Torch !VENV_TORCH_TYPE! (!VENV_TORCH_VER!), ORT !VENV_ORT_TYPE! (!VENV_ORT_VER!)" +) exit /b 0 :choose_mode @@ -274,11 +294,19 @@ exit /b 0 :create_venv set "VENV_CLEAR=" +set "NEED_TORCH_REPLACE=0" +set "NEED_ORT_REPLACE=0" + if exist "%VENV_DIR%\Scripts\python.exe" ( echo Existing virtual environment found: %VENV_DIR% call :prompt_choice REUSE_VENV "Reuse existing venv? [Y/N, default Y]: " "Y N" "Y" "Y or N" - if /i "!REUSE_VENV!"=="Y" exit /b 0 + if /i "!REUSE_VENV!"=="Y" ( + call :check_stack_transition + exit /b 0 + ) set "VENV_CLEAR=--clear" + set "VENV_TORCH_TYPE=NONE" + set "VENV_ORT_TYPE=NONE" ) echo Creating virtual environment with Python %PYTHON_VERSION%... @@ -294,6 +322,71 @@ if errorlevel 1 ( ) exit /b 0 +:check_stack_transition +set "NEED_TORCH_REPLACE=0" +set "NEED_ORT_REPLACE=0" + +rem -- Case 1: Upgrading from CPU to GPU (Option A or Option B) +if not "%INSTALL_MODE%"=="CPU" if "!VENV_TORCH_TYPE!"=="CPU" ( + echo. + echo ============================================================ + echo [UPGRADE] Migrating environment from CPU to %INSTALL_MODE% + echo ============================================================ + echo Existing CPU PyTorch and ONNX Runtime will be replaced with + echo CUDA-accelerated packages seamlessly. + echo ============================================================ + set "NEED_TORCH_REPLACE=1" + set "NEED_ORT_REPLACE=1" + call :log "Stack transition: Upgrading from CPU to %INSTALL_MODE%" + exit /b 0 +) + +rem -- Case 2: Switching from GPU to CPU fallback (Option C) +if "%INSTALL_MODE%"=="CPU" if "!VENV_TORCH_TYPE!"=="CUDA" ( + echo. + echo ============================================================ + echo [SWITCH] Switching environment from GPU to CPU fallback + echo ============================================================ + echo CUDA packages will be replaced with CPU builds seamlessly. + echo ============================================================ + set "NEED_TORCH_REPLACE=1" + set "NEED_ORT_REPLACE=1" + call :log "Stack transition: Switching from GPU to CPU fallback" + exit /b 0 +) + +rem -- Case 3: Switching between GPU options (A <-> B) +if "%INSTALL_MODE%"=="TENSORRT_RTX" ( + if not "!VENV_ORT_TYPE!"=="GPU_TRT" set "NEED_ORT_REPLACE=1" + if not "!VENV_ORT_VER!"=="1.24.4" set "NEED_ORT_REPLACE=1" + if "!NEED_ORT_REPLACE!"=="1" ( + echo. + echo [UPGRADE] Transitioning ONNX Runtime stack to TensorRT-RTX (ORT 1.24.4 + TRT-RTX plugin)... + call :log "Stack transition: Switching ORT stack to TensorRT-RTX" + ) +) +if "%INSTALL_MODE%"=="NVIDIA" ( + if "!VENV_ORT_TYPE!"=="GPU_TRT" set "NEED_ORT_REPLACE=1" + if not "!VENV_ORT_VER!"=="1.22.0" set "NEED_ORT_REPLACE=1" + if "!NEED_ORT_REPLACE!"=="1" ( + echo. + echo [SWITCH] Transitioning ONNX Runtime stack to standard CUDA EP (ORT 1.22.0)... + call :log "Stack transition: Switching ORT stack to standard CUDA EP" + ) +) + +rem -- Case 4: PyTorch CUDA integrity check (ensure cu128 and not partial/mismatched) +if not "%INSTALL_MODE%"=="CPU" ( + if not "!VENV_TORCH_CUDA!"=="12.8" ( + if not "!VENV_TORCH_TYPE!"=="NONE" ( + set "NEED_TORCH_REPLACE=1" + echo [UPGRADE] PyTorch CUDA version mismatch (!VENV_TORCH_CUDA! vs 12.8). Replacing with cu128... + call :log "Stack transition: Replacing PyTorch with cu128 due to version mismatch" + ) + ) +) +exit /b 0 + :install_base_deps echo. echo Preparing base dependencies... @@ -350,7 +443,15 @@ exit /b 0 echo. echo Installing NVIDIA CUDA PyTorch stack (Option A - CUDA EP)... call :log "Installing PyTorch CUDA from %TORCH_CU128%" -uv pip install --python "%VENV_PYTHON%" %TORCH_PACKAGES% --index-url "%TORCH_CU128%" + +if "!NEED_TORCH_REPLACE!"=="1" ( + echo [UPGRADE] Replacing existing PyTorch with CUDA 12.8 packages... + call :log "Replacing existing PyTorch packages with CUDA 12.8" + uv pip uninstall --python "%VENV_PYTHON%" -y torch torchvision torchaudio >nul 2>&1 + uv pip install --python "%VENV_PYTHON%" --reinstall-package torch --reinstall-package torchvision --reinstall-package torchaudio %TORCH_PACKAGES% --index-url "%TORCH_CU128%" +) else ( + uv pip install --python "%VENV_PYTHON%" %TORCH_PACKAGES% --index-url "%TORCH_CU128%" +) if errorlevel 1 ( call :warn "PyTorch CUDA installation failed. Offering CPU fallback." call :prompt_choice CPU_FALLBACK "Install CPU stack instead? [Y/N, default Y]: " "Y N" "Y" "Y or N" @@ -363,9 +464,9 @@ if errorlevel 1 ( exit /b 0 ) -echo Installing ONNX Runtime GPU compatibility package... +echo Installing ONNX Runtime GPU compatibility package (1.22.0)... uv pip uninstall --python "%VENV_PYTHON%" -y onnxruntime onnxruntime-ep-nv-tensorrt-rtx-cu12 >nul 2>&1 -uv pip install --python "%VENV_PYTHON%" onnxruntime-gpu==1.22.0 +uv pip install --python "%VENV_PYTHON%" --reinstall-package onnxruntime-gpu onnxruntime-gpu==1.22.0 if errorlevel 1 call :warn "Failed to install onnxruntime-gpu. UVR can still use PyTorch CUDA, but ONNX models may fall back or fail." exit /b 0 @@ -373,7 +474,15 @@ exit /b 0 echo. echo Installing NVIDIA CUDA PyTorch stack (Option B - TensorRT-RTX EP)... call :log "Installing PyTorch CUDA from %TORCH_CU128%" -uv pip install --python "%VENV_PYTHON%" %TORCH_PACKAGES% --index-url "%TORCH_CU128%" + +if "!NEED_TORCH_REPLACE!"=="1" ( + echo [UPGRADE] Replacing existing PyTorch with CUDA 12.8 packages... + call :log "Replacing existing PyTorch packages with CUDA 12.8" + uv pip uninstall --python "%VENV_PYTHON%" -y torch torchvision torchaudio >nul 2>&1 + uv pip install --python "%VENV_PYTHON%" --reinstall-package torch --reinstall-package torchvision --reinstall-package torchaudio %TORCH_PACKAGES% --index-url "%TORCH_CU128%" +) else ( + uv pip install --python "%VENV_PYTHON%" %TORCH_PACKAGES% --index-url "%TORCH_CU128%" +) if errorlevel 1 ( call :warn "PyTorch CUDA installation failed. Offering CPU fallback." call :prompt_choice CPU_FALLBACK "Install CPU stack instead? [Y/N, default Y]: " "Y N" "Y" "Y or N" @@ -386,22 +495,33 @@ if errorlevel 1 ( exit /b 0 ) -echo Preparing TensorRT-RTX packages... +echo Preparing TensorRT-RTX packages (ONNX Runtime GPU 1.24.4 + TRT-RTX EP)... uv pip uninstall --python "%VENV_PYTHON%" -y onnxruntime >nul 2>&1 +uv pip install --python "%VENV_PYTHON%" --reinstall-package onnxruntime-gpu onnxruntime-gpu==1.24.4 onnxruntime-ep-nv-tensorrt-rtx-cu12==0.4.0 +if errorlevel 1 call :warn "Failed to install TensorRT-RTX packages. Standard CUDA EP will still be used as fallback." exit /b 0 :install_cpu_stack echo. -echo Installing CPU fallback stack... +echo Installing CPU fallback stack (Option C - CPU)... call :log "Installing PyTorch CPU from %TORCH_CPU%" -uv pip install --python "%VENV_PYTHON%" %TORCH_PACKAGES% --index-url "%TORCH_CPU%" + +if "!NEED_TORCH_REPLACE!"=="1" ( + echo [SWITCH] Replacing existing PyTorch with CPU packages... + call :log "Replacing existing PyTorch packages with CPU packages" + uv pip uninstall --python "%VENV_PYTHON%" -y torch torchvision torchaudio >nul 2>&1 + uv pip install --python "%VENV_PYTHON%" --reinstall-package torch --reinstall-package torchvision --reinstall-package torchaudio %TORCH_PACKAGES% --index-url "%TORCH_CPU%" +) else ( + uv pip install --python "%VENV_PYTHON%" %TORCH_PACKAGES% --index-url "%TORCH_CPU%" +) if errorlevel 1 ( call :fail "Failed to install PyTorch CPU." exit /b 1 ) -uv pip uninstall --python "%VENV_PYTHON%" -y onnxruntime-gpu onnxruntime-ep-nv-tensorrt-rtx-cu12 >nul 2>&1 -uv pip install --python "%VENV_PYTHON%" onnxruntime==1.22.0 +echo Installing ONNX Runtime CPU package (1.22.0)... +uv pip uninstall --python "%VENV_PYTHON%" -y onnxruntime-gpu onnxruntime-ep-nv-tensorrt-rtx-cu12 cupy-cuda12x cuda-pathfinder polygraphy onnx-graphsurgeon >nul 2>&1 +uv pip install --python "%VENV_PYTHON%" --reinstall-package onnxruntime onnxruntime==1.22.0 if errorlevel 1 call :warn "Failed to install ONNX Runtime CPU. PyTorch models can still run, but ONNX models may fail." exit /b 0 diff --git a/install/install_record.py b/install/install_record.py index 57b4b7d..99f5b9a 100644 --- a/install/install_record.py +++ b/install/install_record.py @@ -78,6 +78,57 @@ def inspect_installed_packages() -> Dict[str, Any]: } +def inspect_installed_stack() -> Dict[str, str]: + """Inspect current environment to determine Torch build type and ORT variant.""" + torch_type = "NONE" + torch_ver = "NONE" + torch_cuda = "NONE" + try: + import torch + torch_ver = str(getattr(torch, "__version__", "NONE")) + cuda_val = getattr(torch.version, "cuda", None) + if cuda_val is not None: + torch_type = "CUDA" + torch_cuda = str(cuda_val) + elif "+cu" in torch_ver: + torch_type = "CUDA" + torch_cuda = "UNKNOWN" + else: + torch_type = "CPU" + torch_cuda = "NONE" + except Exception: + pass + + ort_type = "NONE" + ort_ver = "NONE" + try: + import importlib.metadata + installed = {d.metadata["Name"].lower(): d.version for d in importlib.metadata.distributions()} + has_trt_plugin = "onnxruntime-ep-nv-tensorrt-rtx-cu12" in installed + has_ort_gpu = "onnxruntime-gpu" in installed + has_ort_cpu = "onnxruntime" in installed + + if has_ort_gpu and has_trt_plugin: + ort_type = "GPU_TRT" + ort_ver = installed.get("onnxruntime-gpu", "NONE") + elif has_ort_gpu: + ort_type = "GPU_CUDA" + ort_ver = installed.get("onnxruntime-gpu", "NONE") + elif has_ort_cpu: + ort_type = "CPU" + ort_ver = installed.get("onnxruntime", "NONE") + except Exception: + pass + + return { + "TORCH_TYPE": torch_type, + "TORCH_VER": torch_ver, + "TORCH_CUDA": torch_cuda, + "ORT_TYPE": ort_type, + "ORT_VER": ort_ver, + } + + def write_install_record( option: str, install_mode: str, @@ -147,6 +198,9 @@ def main() -> int: write_p.add_argument("--has-rubberband", default="1", help="Whether rubberband is present (1/0)") write_p.add_argument("--has-vc-redist", default="1", help="Whether VC redist is present (1/0)") + inspect_p = subparsers.add_parser("inspect-stack", help="Inspect current venv stack") + inspect_p.add_argument("--json", action="store_true", help="Output raw JSON") + args = parser.parse_args() if args.action == "read": @@ -176,6 +230,15 @@ def main() -> int: print("RECORD_WRITTEN") return 0 + elif args.action == "inspect-stack": + stack = inspect_installed_stack() + if args.json: + print(json.dumps(stack, indent=2)) + else: + for k, v in stack.items(): + print(f"{k}={v}") + return 0 + parser.print_help() return 1 diff --git a/tests/test_tensorrt_rtx.py b/tests/test_tensorrt_rtx.py index d7fb10e..3f4410d 100644 --- a/tests/test_tensorrt_rtx.py +++ b/tests/test_tensorrt_rtx.py @@ -154,6 +154,18 @@ class InstallRecordTests(unittest.TestCase): corrupt_path.write_text("{bad json: 123", encoding="utf-8") self.assertIsNone(read_install_record(corrupt_path)) + def test_inspect_installed_stack_returns_expected_keys(self): + from install.install_record import inspect_installed_stack + stack = inspect_installed_stack() + self.assertIsInstance(stack, dict) + self.assertIn("TORCH_TYPE", stack) + self.assertIn("TORCH_VER", stack) + self.assertIn("TORCH_CUDA", stack) + self.assertIn("ORT_TYPE", stack) + self.assertIn("ORT_VER", stack) + self.assertIn(stack["TORCH_TYPE"], ("CUDA", "CPU", "NONE")) + self.assertIn(stack["ORT_TYPE"], ("GPU_TRT", "GPU_CUDA", "CPU", "NONE")) + if __name__ == "__main__": unittest.main()