Skip to content

fix (unified installer): various fixes#1506

Merged
damian0815 merged 1 commit into
invoke-ai:developmentfrom
tildebyte:fix-install-various
Nov 18, 2022
Merged

fix (unified installer): various fixes#1506
damian0815 merged 1 commit into
invoke-ai:developmentfrom
tildebyte:fix-install-various

Conversation

@tildebyte
Copy link
Copy Markdown
Contributor

This list makes it look like there's lot going on for a single commit, but the changes are actually pretty small

  • 'install'/'invoke' scripts:
    • use venv's 'activate' script instead of hacking PATH
    • 'deactivate' before exiting, so we don't leave a confusing environment hanging around
  • 'setup.py':
    • make 'install_requires" an accurate list of our direct dependencies, as it should be
    • add more info/details for eventual use in pypi
  • 'invoke' scripts: "developer console" invocation simplified/better logging (it's now much more obvious from inspection what the "developer console" actually is)
  • 'requirements.in':
    • move 'clipseg' package out of installer and into requirements where it should be
    • bump/pin 'accelerate' package to 0.14.0 to bypass torch 1.13 SIGKILL issue on Windows (prep for when we decide to upgrade)
    • pin 'torch' as well as 'torchvision', to reduce pip-compile's confusion
  • notebooks: delete unused/deprecated notebook installer

Signed-off-by: Ben Alkov ben.alkov@gmail.com

@damian0815
Copy link
Copy Markdown
Contributor

does this include my fixes for macos building greenlet or is that somewhere separate?

@tildebyte
Copy link
Copy Markdown
Contributor Author

does this include my fixes for macos building greenlet or is that somewhere separate?

Separate, and I'd like to merge #1488 first, then rebase

@tildebyte tildebyte changed the title fix(install): various fixes fix (unified installer): various fixes Nov 17, 2022
Copy link
Copy Markdown
Contributor

@damian0815 damian0815 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems ok other than the two comments i left on the things that seemed maybe off

Comment thread installer/py3.10-darwin-arm64-mps-reqs.txt
Comment thread installer/py3.10-linux-x86_64-cuda-reqs.txt Outdated
@damian0815 damian0815 self-requested a review November 17, 2022 21:28
Copy link
Copy Markdown
Contributor

@damian0815 damian0815 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good now, thanks

- 'install'/'invoke' scripts: use venv 'activate' script
- 'setup.py':
  - make  'install_requires" accurate
  - add more details for eventual use in pypi
- 'invoke' scripts: "developer" console invocation simplified/better logging
- requirements:
  - move 'clipseg' package out of installer and into requirements where it should be
  - bump/pin 'accelerate' package to 0.14.0 to bypass torch 1.13 SIGKILL issue on Windows (prep for when we decide to upgrade)
- 'requirements.in': pin torch as well to reduce pip-compile's confusion
- notebooks: delete unused/deprecated notebook installer

Signed-off-by: Ben Alkov <ben.alkov@gmail.com>
@damian0815
Copy link
Copy Markdown
Contributor

should i press merge then?

Copy link
Copy Markdown
Collaborator

@lstein lstein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've reviewed the code and it looks good.

@damian0815 damian0815 merged commit b4eaf8b into invoke-ai:development Nov 18, 2022
@tildebyte tildebyte deleted the fix-install-various branch November 18, 2022 18:53
@psychedelicious psychedelicious mentioned this pull request Nov 19, 2022
lstein pushed a commit that referenced this pull request Nov 20, 2022
'requirements.in':
  - add picklescan
  - finally find a good compromise for torch (==1.12.0) and
    torchvision (==0.13.0) across all platforms
'invoke.sh: hotfix for MacOS - add `export PYTORCH_ENABLE_MPS_FALLBACK=1`

Signed-off-by: Ben Alkov <ben.alkov@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants