Upload AutoInstall Pytorch Triton Sage.bat

AutoInstall Pytorch Triton Sage.bat

@@ -24,7 +24,7 @@ for /f "delims=" %%i in ('%PYTHON% -c "import platform; print(platform.python_ve
 echo [INFO] Python Version: %PYVER%
 
 REM Pip version
-for /f "delims=" %%i in ('%PYTHON% -m pip --version') do set PIPVER=%%i
+for /f "delims=" %%i in ('%PYTHON% -s -m pip --version') do set PIPVER=%%i
 echo [INFO] Pip Version: %PIPVER%
 
 REM CPU Cores
@@ -53,6 +53,18 @@ echo.
 set /p "inp=Do you want to update pip and set setuptools to 70.2.0? (y/n): "
 if /i "!inp!"=="y" set UPDATE_PIP=true
 
+REM Update ComfyUI?
+set UPDATE_COMFY=false
+echo.
+set /p "inp=Do you want to update ComfyUI via Git? (y/n): "
+if /i "!inp!"=="y" set UPDATE_COMFY=true
+
+REM Create Launcher?
+set MAKE_LAUNCHER=false
+echo.
+set /p "inp=Do you want to generate a launcher batch file for FP16+Sage? (y/n): "
+if /i "!inp!"=="y" set MAKE_LAUNCHER=true
+
 REM Install PyTorch?
 set INSTALL_TORCH=false
 set TORCH_NIGHTLY=false
@@ -81,10 +93,10 @@ if "%torch_choice%"=="1" (
 REM Install Triton?
 set INSTALL_TRITON=false
 echo.
-echo [0] Skip Triton
 echo [1] Install Nightly Triton
 echo [2] Install Stable Triton
 echo [3] Install LeoMaxwell Triton
+echo [0] Skip Triton
 set /p "triton_choice=Choose Triton version: "
 if not "!triton_choice!"=="0" set INSTALL_TRITON=true
 
@@ -97,28 +109,19 @@ echo [0] Skip SageAttention
 set /p "sage_choice=Choose SageAttention version: "
 if not "!sage_choice!"=="0" set INSTALL_SAGE=true
 
-REM Update ComfyUI?
-set UPDATE_COMFY=false
-echo.
-set /p "inp=Do you want to update ComfyUI via Git? (y/n): "
-if /i "!inp!"=="y" set UPDATE_COMFY=true
-
-REM Create Launcher?
-set MAKE_LAUNCHER=false
-echo.
-set /p "inp=Do you want to generate a launcher batch file for FP16+Sage? (y/n): "
-if /i "!inp!"=="y" set MAKE_LAUNCHER=true
-
 REM === RUN CHOSEN INSTALLS ===
 
 cd /d "%UPDATE_DIR%"
 
 if "%UPDATE_PIP%"=="true" (
     echo [INFO] Updating pip and installing setuptools==70.2.0
-    %PYTHON% -m pip install --upgrade pip setuptools==70.2.0
+    %PYTHON% -s -m pip install --upgrade pip setuptools==70.2.0
 )
 
 if "%INSTALL_TORCH%"=="true" (
+    echo [INFO] Uninstalling old Torch versions
+    %PYTHON% -s -m pip uninstall -y torch torchvision torchaudio
+
     if "%TORCH_NIGHTLY%"=="true" (
         if "%TORCH_MANUAL%"=="true" (
             echo.
@@ -153,44 +156,47 @@ if "%INSTALL_TORCH%"=="true" (
             echo   Torchaudio: !AUDIO_URL!
             echo   Torchvision:!VISION_URL!
 
-            %PYTHON% -m pip install "!TORCH_URL!" "!AUDIO_URL!" "!VISION_URL!"
+            %PYTHON% -s -m pip install "!TORCH_URL!" "!AUDIO_URL!" "!VISION_URL!"
         ) else (
             echo [INFO] Installing PyTorch Nightly for CUDA %CLEAN_CUDA%
-            %PYTHON% -m pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu%CLEAN_CUDA%
+            %PYTHON% -s -m pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu%CLEAN_CUDA%
         )
     ) else (
         echo [INFO] Installing PyTorch Stable for CUDA %CLEAN_CUDA%
-        %PYTHON% -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu%CLEAN_CUDA%
+        %PYTHON% -s -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu%CLEAN_CUDA%
     )
 )
 
 if "%INSTALL_TRITON%"=="true" (
     echo [INFO] Uninstalling old Triton versions
-    %PYTHON% -m pip uninstall -y triton triton-windows
+    %PYTHON% -s -m pip uninstall -y triton triton-windows
 
     if "%triton_choice%"=="1" (
         echo Installing Triton Nightly
-        %PYTHON% -m pip install -U --pre triton-windows
+        %PYTHON% -s -m pip install -U --pre triton-windows
     ) else if "%triton_choice%"=="2" (
         echo Installing Triton Stable
-        %PYTHON% -m pip install triton-windows
+        %PYTHON% -s -m pip install triton-windows
     ) else if "%triton_choice%"=="3" (
         echo Installing LeoMaxwell Triton
-        %PYTHON% -m pip install https://github.com/leomaxwell973/Triton-3.3.0-UPDATE_FROM_3.2.0_and_FIXED-Windows-Nvidia-Prebuilt/releases/download/3.3.0_cu128_Py312/triton-3.3.0-cp312-cp312-win_amd64.whl
+        %PYTHON% -s -m pip install https://github.com/leomaxwell973/Triton-3.3.0-UPDATE_FROM_3.2.0_and_FIXED-Windows-Nvidia-Prebuilt/releases/download/3.3.0_cu128_Py312/triton-3.3.0-cp312-cp312-win_amd64.whl
     )
 )
 
 if "%INSTALL_SAGE%"=="true" (
+    echo [INFO] Uninstalling old SageAttention versions
+    %PYTHON% -s -m pip uninstall -y sageattention
+
     if "%sage_choice%"=="1" (
         echo Installing SageAttention v1
-        %PYTHON% -m pip install sageattention==1.0.6
+        %PYTHON% -s -m pip install sageattention==1.0.6
     ) else (
         echo Installing SageAttention v2 from source
         cd "%UPDATE_DIR%"
         git clone https://github.com/thu-ml/SageAttention
         cd SageAttention
         set MAX_JOBS=%CPU_CORES%
-        %PYTHON% -m pip install .
+        %PYTHON% -s -m pip install .
 
         cd ..
         rmdir /s /q SageAttention