Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi platform single repo #6605

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Multi platform single repo #6605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58f729f
change the scripts to use os specific env paths
jfmherokiller Dec 22, 2024
48019c9
Refactor one_click to use OS-specific environment paths
jfmherokiller Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ if [[ "$(pwd)" =~ " " ]]; then echo This script relies on Miniconda which can no
{ conda deactivate && conda deactivate && conda deactivate; } 2> /dev/null

# config
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda"
INSTALL_ENV_DIR="$(pwd)/installer_files/env"
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda_linux"
INSTALL_ENV_DIR="$(pwd)/installer_files/env_linux"

# environment isolation
export PYTHONNOUSERSITE=1
Expand Down
4 changes: 2 additions & 2 deletions cmd_macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ if [[ "$(pwd)" =~ " " ]]; then echo This script relies on Miniconda which can no
{ conda deactivate && conda deactivate && conda deactivate; } 2> /dev/null

# config
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda"
INSTALL_ENV_DIR="$(pwd)/installer_files/env"
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda_osx"
INSTALL_ENV_DIR="$(pwd)/installer_files/env_osx"

# environment isolation
export PYTHONNOUSERSITE=1
Expand Down
4 changes: 2 additions & 2 deletions cmd_windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ set TEMP=%cd%\installer_files
(call conda deactivate && call conda deactivate && call conda deactivate) 2>nul

@rem config
set CONDA_ROOT_PREFIX=%cd%\installer_files\conda
set INSTALL_ENV_DIR=%cd%\installer_files\env
set CONDA_ROOT_PREFIX=%cd%\installer_files\conda_windows
set INSTALL_ENV_DIR=%cd%\installer_files\env_windows

@rem environment isolation
set PYTHONNOUSERSITE=1
Expand Down
43 changes: 28 additions & 15 deletions one_click.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,35 @@
TORCH_VERSION = "2.4.1"
TORCHVISION_VERSION = "0.19.1"
TORCHAUDIO_VERSION = "2.4.1"
# Platform handling


def is_linux():
return sys.platform.startswith("linux")


def is_windows():
return sys.platform.startswith("win")


def is_macos():
return sys.platform.startswith("darwin")


def platform_name():
if is_linux():
return "linux"
elif is_windows():
return "windows"
elif is_macos():
return "osx"
else:
return ""


# Environment
script_dir = os.getcwd()
conda_env_path = os.path.join(script_dir, "installer_files", "env")
conda_env_path = os.path.join(script_dir, "installer_files", "env_" + platform_name())

# Command-line flags
cmd_flags_path = os.path.join(script_dir, "CMD_FLAGS.txt")
Expand All @@ -42,18 +67,6 @@ def signal_handler(sig, frame):
signal.signal(signal.SIGINT, signal_handler)


def is_linux():
return sys.platform.startswith("linux")


def is_windows():
return sys.platform.startswith("win")


def is_macos():
return sys.platform.startswith("darwin")


def is_x86_64():
return platform.machine() == "x86_64"

Expand Down Expand Up @@ -183,10 +196,10 @@ def run_cmd(cmd, assert_success=False, environment=False, capture_output=False,
# Use the conda environment
if environment:
if is_windows():
conda_bat_path = os.path.join(script_dir, "installer_files", "conda", "condabin", "conda.bat")
conda_bat_path = os.path.join(script_dir, "installer_files", "conda_" + platform_name(), "condabin", "conda.bat")
cmd = f'"{conda_bat_path}" activate "{conda_env_path}" >nul && {cmd}'
else:
conda_sh_path = os.path.join(script_dir, "installer_files", "conda", "etc", "profile.d", "conda.sh")
conda_sh_path = os.path.join(script_dir, "installer_files", "conda_" + platform_name(), "etc", "profile.d", "conda.sh")
cmd = f'. "{conda_sh_path}" && conda activate "{conda_env_path}" && {cmd}'

# Set executable to None for Windows, bash for everything else
Expand Down
4 changes: 2 additions & 2 deletions start_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ esac

# config
INSTALL_DIR="$(pwd)/installer_files"
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda"
INSTALL_ENV_DIR="$(pwd)/installer_files/env"
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda_linux"
INSTALL_ENV_DIR="$(pwd)/installer_files/env_linux"
MINICONDA_DOWNLOAD_URL="https://repo.anaconda.com/miniconda/Miniconda3-py310_23.3.1-0-Linux-${OS_ARCH}.sh"
conda_exists="F"

Expand Down
4 changes: 2 additions & 2 deletions start_macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ esac

# config
INSTALL_DIR="$(pwd)/installer_files"
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda"
INSTALL_ENV_DIR="$(pwd)/installer_files/env"
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda_osx"
INSTALL_ENV_DIR="$(pwd)/installer_files/env_osx"
MINICONDA_DOWNLOAD_URL="https://repo.anaconda.com/miniconda/Miniconda3-py310_23.3.1-0-MacOSX-${OS_ARCH}.sh"
conda_exists="F"

Expand Down
4 changes: 2 additions & 2 deletions start_windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ set TEMP=%cd%\installer_files

@rem config
set INSTALL_DIR=%cd%\installer_files
set CONDA_ROOT_PREFIX=%cd%\installer_files\conda
set INSTALL_ENV_DIR=%cd%\installer_files\env
set CONDA_ROOT_PREFIX=%cd%\installer_files\conda_windows
set INSTALL_ENV_DIR=%cd%\installer_files\env_windows
set MINICONDA_DOWNLOAD_URL=https://repo.anaconda.com/miniconda/Miniconda3-py310_23.3.1-0-Windows-x86_64.exe
set MINICONDA_CHECKSUM=307194e1f12bbeb52b083634e89cc67db4f7980bd542254b43d3309eaf7cb358
set conda_exists=F
Expand Down
4 changes: 2 additions & 2 deletions update_wizard_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ if [[ "$(pwd)" =~ " " ]]; then echo This script relies on Miniconda which can no
{ conda deactivate && conda deactivate && conda deactivate; } 2> /dev/null

# config
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda"
INSTALL_ENV_DIR="$(pwd)/installer_files/env"
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda_linux"
INSTALL_ENV_DIR="$(pwd)/installer_files/env_linux"

# environment isolation
export PYTHONNOUSERSITE=1
Expand Down
4 changes: 2 additions & 2 deletions update_wizard_macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ if [[ "$(pwd)" =~ " " ]]; then echo This script relies on Miniconda which can no
{ conda deactivate && conda deactivate && conda deactivate; } 2> /dev/null

# config
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda"
INSTALL_ENV_DIR="$(pwd)/installer_files/env"
CONDA_ROOT_PREFIX="$(pwd)/installer_files/conda_osx"
INSTALL_ENV_DIR="$(pwd)/installer_files/env_osx"

# environment isolation
export PYTHONNOUSERSITE=1
Expand Down
4 changes: 2 additions & 2 deletions update_wizard_windows.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ set TEMP=%cd%\installer_files
(call conda deactivate && call conda deactivate && call conda deactivate) 2>nul

@rem config
set CONDA_ROOT_PREFIX=%cd%\installer_files\conda
set INSTALL_ENV_DIR=%cd%\installer_files\env
set CONDA_ROOT_PREFIX=%cd%\installer_files\conda_windows
set INSTALL_ENV_DIR=%cd%\installer_files\env_windows

@rem environment isolation
set PYTHONNOUSERSITE=1
Expand Down
4 changes: 2 additions & 2 deletions wsl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ if [[ ! $(realpath "$(pwd)/..") = /mnt/* ]]; then
INSTALL_DIR_PREFIX="$(realpath "$(pwd)/..")" && INSTALL_INPLACE=1
fi
INSTALL_DIR="$INSTALL_DIR_PREFIX/text-generation-webui"
CONDA_ROOT_PREFIX="$INSTALL_DIR/installer_files/conda"
INSTALL_ENV_DIR="$INSTALL_DIR/installer_files/env"
CONDA_ROOT_PREFIX="$INSTALL_DIR/installer_files/conda_linux"
INSTALL_ENV_DIR="$INSTALL_DIR/installer_files/env_linux"
MINICONDA_DOWNLOAD_URL="https://repo.anaconda.com/miniconda/Miniconda3-py310_23.3.1-0-Linux-x86_64.sh"
conda_exists="F"

Expand Down