Changed things around to allow Micromamba to work with paths containing spaces.

This commit is contained in:
jllllll 2023-03-25 01:14:29 -05:00
parent 1e260544cd
commit 2e02d42682
4 changed files with 13 additions and 21 deletions

View File

@ -7,11 +7,10 @@ cd /D "%~dp0"
set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba
set INSTALL_ENV_DIR=%cd%\installer_files\env set INSTALL_ENV_DIR=%cd%\installer_files\env
if not exist "%MAMBA_ROOT_PREFIX%\Scripts\activate.bat" ( if not exist "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" (
call "%MAMBA_ROOT_PREFIX%\micromamba.exe" shell hook >nul 2>&1 call "%MAMBA_ROOT_PREFIX%\micromamba.exe" shell hook >nul 2>&1
) )
call "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat" || ( echo MicroMamba hook not found. && goto end ) call "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" activate "%INSTALL_ENV_DIR%" || ( echo MicroMamba hook not found. && goto end )
call micromamba activate "%INSTALL_ENV_DIR%" || goto end
cd text-generation-webui || goto end cd text-generation-webui || goto end
goto %TextOnly% goto %TextOnly%

View File

@ -53,24 +53,19 @@ if "%PACKAGES_TO_INSTALL%" NEQ "" (
) )
@rem create micromamba hook @rem create micromamba hook
if not exist "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat" ( if not exist "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" (
call "%MAMBA_ROOT_PREFIX%\micromamba.exe" shell hook >nul 2>&1 call "%MAMBA_ROOT_PREFIX%\micromamba.exe" shell hook >nul 2>&1
) )
@rem activate base micromamba env
call "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat" || ( echo Micromamba hook not found. && goto end )
@rem create the installer env @rem create the installer env
if not exist "%INSTALL_ENV_DIR%" ( if not exist "%INSTALL_ENV_DIR%" (
call micromamba create -y --prefix "%INSTALL_ENV_DIR%" echo Packages to install: %PACKAGES_TO_INSTALL%
call "%MAMBA_ROOT_PREFIX%\micromamba.exe" create -y --prefix "%INSTALL_ENV_DIR%" %CHANNEL% %PACKAGES_TO_INSTALL%
) )
)
@rem activate installer env @rem activate installer env
call micromamba activate "%INSTALL_ENV_DIR%" || ( echo %INSTALL_ENV_DIR% not found. && goto end ) call "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" activate "%INSTALL_ENV_DIR%" || ( echo MicroMamba hook not found. && goto end )
echo "Packages to install: %PACKAGES_TO_INSTALL%"
call micromamba install -y %CHANNEL% %PACKAGES_TO_INSTALL%
)
@rem clone the repository and install the pip requirements @rem clone the repository and install the pip requirements
if exist text-generation-webui\ ( if exist text-generation-webui\ (

View File

@ -5,11 +5,10 @@ cd /D "%~dp0"
set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba
set INSTALL_ENV_DIR=%cd%\installer_files\env set INSTALL_ENV_DIR=%cd%\installer_files\env
if not exist "%MAMBA_ROOT_PREFIX%\Scripts\activate.bat" ( if not exist "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" (
call "%MAMBA_ROOT_PREFIX%\micromamba.exe" shell hook >nul 2>&1 call "%MAMBA_ROOT_PREFIX%\micromamba.exe" shell hook >nul 2>&1
) )
call "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat" || ( echo Micromamba hook not found. && goto end ) call "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" activate "%INSTALL_ENV_DIR%" || ( echo MicroMamba hook not found. && goto end )
call micromamba activate "%INSTALL_ENV_DIR%" || goto end
cmd /k "%*" cmd /k "%*"

View File

@ -7,11 +7,10 @@ cd /D "%~dp0"
set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba set MAMBA_ROOT_PREFIX=%cd%\installer_files\mamba
set INSTALL_ENV_DIR=%cd%\installer_files\env set INSTALL_ENV_DIR=%cd%\installer_files\env
if not exist "%MAMBA_ROOT_PREFIX%\Scripts\activate.bat" ( if not exist "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" (
call "%MAMBA_ROOT_PREFIX%\micromamba.exe" shell hook >nul 2>&1 call "%MAMBA_ROOT_PREFIX%\micromamba.exe" shell hook >nul 2>&1
) )
call "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat" || ( echo Micromamba hook not found. && goto end ) call "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" activate "%INSTALL_ENV_DIR%" || ( echo MicroMamba hook not found. && goto end )
call micromamba activate "%INSTALL_ENV_DIR%" || goto end
cd text-generation-webui cd text-generation-webui
call python server.py --auto-devices --cai-chat call python server.py --auto-devices --cai-chat