speculative reorganization of the requirements & environment files

- This is only a test!
- The various environment*.yml and requirements*.txt files have all
  been moved into a directory named "environments-and-requirements".
- The idea is to clean up our root directory so that the github home
  page is tidy.
- The manual install instructions will start with the instructions to
  create a symbolic link from environment.yml to the appropriate file
  for OS and GPU.
- The 1-click installers have been updated to accommodate this change.
This commit is contained in:
Lincoln Stein 2022-11-09 14:09:36 +00:00
parent 10781e7dc4
commit 5702271991
14 changed files with 16 additions and 5 deletions

5
.gitignore vendored
View File

@ -219,3 +219,8 @@ models/gfpgan
# ignore initfile # ignore initfile
invokeai.init invokeai.init
# ignore environment.yml and requirements.txt
# these are to be copied from environments-and-requirements
environment.yml
requirements.txt

View File

@ -81,6 +81,7 @@ call conda activate
@rem create the environment @rem create the environment
call conda env remove -n invokeai call conda env remove -n invokeai
mklink environment.yml environments-and-requirements\environment-win-cuda.yml
call conda env create call conda env create
if "%ERRORLEVEL%" NEQ "0" ( if "%ERRORLEVEL%" NEQ "0" (
echo "" echo ""

View File

@ -94,14 +94,19 @@ CONDA_BASEPATH=$(conda info --base)
source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script) source "$CONDA_BASEPATH/etc/profile.d/conda.sh" # otherwise conda complains about 'shell not initialized' (needed when running in a script)
conda activate conda activate
if [ "$OS_NAME" == "mac" ]; then if [ "$OS_NAME" == "mac" ]; then
environment_file="environment-mac.yml" echo "Macintosh system detected. Installing MPS and CPU support."
ln -sf environments-and-requirements/environment-mac.yml environment.yml
else else
environment_file="environment.yml" if (lsmod | grep amdgpu) &>/dev/null ; then
echo "Linux system with AMD GPU driver detected. Installing ROCm and CPU support"
ln -sf environments-and-requirements/environment-lin-amd.yml environment.yml
else
echo "Linux system detected. Installing CUDA and CPU support."
ln -sf environments-and-requirements/environment-lin-cuda.yml environment.yml
fi
fi fi
conda env update
conda env update -f "${environment_file}"
status=$? status=$?