Skip to content

Commit

Permalink
Cleanup old torch1 code
Browse files Browse the repository at this point in the history
  • Loading branch information
@bmaltais
bmaltais committed Dec 5, 2023
1 parent c74f929 commit 638ec29
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 128 deletions.
5 changes: 0 additions & 5 deletions requirements_windows_torch1.txt
View file

This file was deleted.

216 changes: 93 additions & 123 deletions setup/setup_windows.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
import setup_common

errors = 0 # Define the 'errors' variable before using it
log = logging.getLogger('sd')
log = logging.getLogger("sd")

# ANSI escape code for yellow color
YELLOW = '\033[93m'
RESET_COLOR = '\033[0m'
YELLOW = "\033[93m"
RESET_COLOR = "\033[0m"


def cudann_install():
cudnn_src = os.path.join(
os.path.dirname(os.path.realpath(__file__)), '..\cudnn_windows'
os.path.dirname(os.path.realpath(__file__)), "..\cudnn_windows"
)
cudnn_dest = os.path.join(sysconfig.get_paths()['purelib'], 'torch', 'lib')
cudnn_dest = os.path.join(sysconfig.get_paths()["purelib"], "torch", "lib")

log.info(f'Checking for CUDNN files in {cudnn_dest}...')
log.info(f"Checking for CUDNN files in {cudnn_dest}...")
if os.path.exists(cudnn_src):
if os.path.exists(cudnn_dest):
# check for different files
Expand All @@ -34,9 +34,9 @@ def cudann_install():
shutil.copy2(src_file, cudnn_dest)
else:
shutil.copy2(src_file, cudnn_dest)
log.info('Copied CUDNN 8.6 files to destination')
log.info("Copied CUDNN 8.6 files to destination")
else:
log.warning(f'Destination directory {cudnn_dest} does not exist')
log.warning(f"Destination directory {cudnn_dest} does not exist")
else:
log.error(f'Installation Failed: "{cudnn_src}" could not be found.')

Expand All @@ -50,18 +50,16 @@ def sync_bits_and_bytes_files():
"""

# Only execute on Windows
if os.name != 'nt':
print('This function is only applicable to Windows OS.')
if os.name != "nt":
print("This function is only applicable to Windows OS.")
return

try:
log.info(f'Copying bitsandbytes files...')
log.info(f"Copying bitsandbytes files...")
# Define source and destination directories
source_dir = os.path.join(os.getcwd(), 'bitsandbytes_windows')
source_dir = os.path.join(os.getcwd(), "bitsandbytes_windows")

dest_dir_base = os.path.join(
sysconfig.get_paths()['purelib'], 'bitsandbytes'
)
dest_dir_base = os.path.join(sysconfig.get_paths()["purelib"], "bitsandbytes")

# Clear file comparison cache
filecmp.clear_cache()
Expand All @@ -71,8 +69,8 @@ def sync_bits_and_bytes_files():
source_file_path = os.path.join(source_dir, file)

# Decide the destination directory based on file name
if file in ('main.py', 'paths.py'):
dest_dir = os.path.join(dest_dir_base, 'cuda_setup')
if file in ("main.py", "paths.py"):
dest_dir = os.path.join(dest_dir_base, "cuda_setup")
else:
dest_dir = dest_dir_base

Expand All @@ -83,158 +81,130 @@ def sync_bits_and_bytes_files():
source_file_path, dest_file_path
):
log.debug(
f'Skipping {source_file_path} as it already exists in {dest_dir}'
f"Skipping {source_file_path} as it already exists in {dest_dir}"
)
else:
# Copy file from source to destination, maintaining original file's metadata
log.debug(f'Copy {source_file_path} to {dest_dir}')
log.debug(f"Copy {source_file_path} to {dest_dir}")
shutil.copy2(source_file_path, dest_dir)

except FileNotFoundError as fnf_error:
log.error(f'File not found error: {fnf_error}')
log.error(f"File not found error: {fnf_error}")
except PermissionError as perm_error:
log.error(f'Permission error: {perm_error}')
log.error(f"Permission error: {perm_error}")
except Exception as e:
log.error(f'An unexpected error occurred: {e}')


# def install_kohya_ss_torch1():
# setup_common.check_repo_version()
# setup_common.check_python()

# # Upgrade pip if needed
# setup_common.install('--upgrade pip')

# if setup_common.check_torch() == 2:
# input(
# f'{YELLOW}\nTorch 2 is already installed in the venv. To install Torch 1 delete the venv and re-run setup.bat\n\nHit enter to continue...{RESET_COLOR}'
# )
# return

# # setup_common.install(
# # 'torch==1.12.1+cu116 torchvision==0.13.1+cu116 --index-url https://download.pytorch.org/whl/cu116',
# # 'torch torchvision'
# # )
# # setup_common.install(
# # 'https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl -U -I --no-deps',
# # 'xformers-0.0.14'
# # )
# setup_common.install_requirements('requirements_windows_torch1.txt', check_no_verify_flag=False)
# sync_bits_and_bytes_files()
# setup_common.configure_accelerate(run_accelerate=True)
# # run_cmd(f'accelerate config')
log.error(f"An unexpected error occurred: {e}")


def install_kohya_ss_torch2():
setup_common.check_repo_version()
setup_common.check_python()

# Upgrade pip if needed
setup_common.install('--upgrade pip')

# if setup_common.check_torch() == 1:
# input(
# f'{YELLOW}\nTorch 1 is already installed in the venv. To install Torch 2 delete the venv and re-run setup.bat\n\nHit any key to acknowledge.{RESET_COLOR}'
# )
# return

# setup_common.install(
# 'torch==2.0.1+cu118 torchvision==0.15.2+cu118 --index-url https://download.pytorch.org/whl/cu118',
# 'torch torchvision'
# )
setup_common.install_requirements('requirements_windows_torch2.txt', check_no_verify_flag=False)
# install('https://huggingface.co/r4ziel/xformers_pre_built/resolve/main/triton-2.0.0-cp310-cp310-win_amd64.whl', 'triton', reinstall=reinstall)
setup_common.install("--upgrade pip")

setup_common.install_requirements(
"requirements_windows_torch2.txt", check_no_verify_flag=False
)

sync_bits_and_bytes_files()
setup_common.configure_accelerate(run_accelerate=True)

# run_cmd(f'accelerate config')


def install_bitsandbytes_0_35_0():
log.info('Installing bitsandbytes 0.35.0...')
setup_common.install('--upgrade bitsandbytes==0.35.0', 'bitsandbytes 0.35.0', reinstall=True)
log.info("Installing bitsandbytes 0.35.0...")
setup_common.install(
"--upgrade bitsandbytes==0.35.0", "bitsandbytes 0.35.0", reinstall=True
)
sync_bits_and_bytes_files()


def install_bitsandbytes_0_40_1():
log.info('Installing bitsandbytes 0.40.1...')
setup_common.install('--upgrade https://github.com/jllllll/bitsandbytes-windows-webui/releases/download/wheels/bitsandbytes-0.40.1.post1-py3-none-win_amd64.whl', 'bitsandbytes 0.40.1', reinstall=True)
log.info("Installing bitsandbytes 0.40.1...")
setup_common.install(
"--upgrade https://github.com/jllllll/bitsandbytes-windows-webui/releases/download/wheels/bitsandbytes-0.40.1.post1-py3-none-win_amd64.whl",
"bitsandbytes 0.40.1",
reinstall=True,
)


def install_bitsandbytes_0_41_1():
log.info('Installing bitsandbytes 0.41.1...')
setup_common.install('--upgrade https://github.com/jllllll/bitsandbytes-windows-webui/releases/download/wheels/bitsandbytes-0.41.1-py3-none-win_amd64.whl', 'bitsandbytes 0.41.1', reinstall=True)
log.info("Installing bitsandbytes 0.41.1...")
setup_common.install(
"--upgrade https://github.com/jllllll/bitsandbytes-windows-webui/releases/download/wheels/bitsandbytes-0.41.1-py3-none-win_amd64.whl",
"bitsandbytes 0.41.1",
reinstall=True,
)


def main_menu():
setup_common.clear_screen()
while True:
print('\nKohya_ss GUI setup menu:\n')
print('1. Install kohya_ss gui')
print('2. (Optional) Install cudann files (avoid unless you really need it)')
print('3. (Optional) Install specific bitsandbytes versions')
print('4. (Optional) Manually configure accelerate')
print('5. (Optional) Start Kohya_ss GUI in browser')
print('6. Quit')

choice = input('\nEnter your choice: ')
print('')

if choice == '1':
print("\nKohya_ss GUI setup menu:\n")
print("1. Install kohya_ss gui")
print("2. (Optional) Install cudann files (avoid unless you really need it)")
print("3. (Optional) Install specific bitsandbytes versions")
print("4. (Optional) Manually configure accelerate")
print("5. (Optional) Start Kohya_ss GUI in browser")
print("6. Quit")

choice = input("\nEnter your choice: ")
print("")

if choice == "1":
install_kohya_ss_torch2()
# while True:
# print('1. Torch 1 (legacy, no longer supported. Will be removed in v21.9.x)')
# print('2. Torch 2 (recommended)')
# print('3. Cancel')
# choice_torch = input('\nEnter your choice: ')
# print('')

# if choice_torch == '1':
# install_kohya_ss_torch1()
# break
# elif choice_torch == '2':
# install_kohya_ss_torch2()
# break
# elif choice_torch == '3':
# break
# else:
# print('Invalid choice. Please enter a number between 1-3.')
elif choice == '2':
elif choice == "2":
cudann_install()
elif choice == '3':
elif choice == "3":
while True:
print('1. (Optional) Force installation of bitsandbytes 0.35.0')
print('2. (Optional) Force installation of bitsandbytes 0.40.1 for new optimizer options support and pre-bugfix results')
print('3. (Optional) Force installation of bitsandbytes 0.41.1 for new optimizer options support')
print('4. (Danger) Install bitsandbytes-windows (this package has been reported to cause issues for most... avoid...)')
print('5. Cancel')
choice_torch = input('\nEnter your choice: ')
print('')

if choice_torch == '1':
print("1. (Optional) Force installation of bitsandbytes 0.35.0")
print(
"2. (Optional) Force installation of bitsandbytes 0.40.1 for new optimizer options support and pre-bugfix results"
)
print(
"3. (Optional) Force installation of bitsandbytes 0.41.1 for new optimizer options support"
)
print(
"4. (Danger) Install bitsandbytes-windows (this package has been reported to cause issues for most... avoid...)"
)
print("5. Cancel")
choice_torch = input("\nEnter your choice: ")
print("")

if choice_torch == "1":
install_bitsandbytes_0_35_0()
break
elif choice_torch == '2':
elif choice_torch == "2":
install_bitsandbytes_0_40_1()
break
elif choice_torch == '3':
elif choice_torch == "3":
install_bitsandbytes_0_41_1()
break
elif choice_torch == '4':
setup_common.install('--upgrade bitsandbytes-windows', reinstall=True)
elif choice_torch == "4":
setup_common.install(
"--upgrade bitsandbytes-windows", reinstall=True
)
break
elif choice_torch == '5':
elif choice_torch == "5":
break
else:
print('Invalid choice. Please enter a number between 1-3.')
elif choice == '4':
setup_common.run_cmd('accelerate config')
elif choice == '5':
subprocess.Popen('start cmd /k .\gui.bat --inbrowser', shell=True) # /k keep the terminal open on quit. /c would close the terminal instead
elif choice == '6':
print('Quitting the program.')
print("Invalid choice. Please enter a number between 1-3.")
elif choice == "4":
setup_common.run_cmd("accelerate config")
elif choice == "5":
subprocess.Popen(
"start cmd /k .\gui.bat --inbrowser", shell=True
) # /k keep the terminal open on quit. /c would close the terminal instead
elif choice == "6":
print("Quitting the program.")
break
else:
print('Invalid choice. Please enter a number between 1-5.')
print("Invalid choice. Please enter a number between 1-5.")


if __name__ == '__main__':
if __name__ == "__main__":
setup_common.ensure_base_requirements()
setup_common.setup_logging()
main_menu()

0 comments on commit 638ec29

Please sign in to comment.