-
-
Notifications
You must be signed in to change notification settings - Fork 279
Move to a pixi-based installation
#1244
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.
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
Open
hameerabbasi
wants to merge
29
commits into
Nerogar:master
Choose a base branch
from
hameerabbasi:modernize-install
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 16 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
5dd139e
Modernize `requirements*.txt`.
hameerabbasi 0b1c4c1
Move to `pixi` from `pip`.
hameerabbasi e2b5664
Move to `pyproject.toml` from `pixi.toml`.
hameerabbasi 46d7833
Make everything `pip`-installable.
hameerabbasi 6634864
Require minimum `pixi`.
hameerabbasi b41658e
Remove unnecessary parts.`
hameerabbasi 12b7309
Make it *actually* work without a `pixi.toml`.
hameerabbasi f7cb8c6
Add back `--extra-index-url`.
hameerabbasi b9c4bd6
Revert `requirements.txt`
hameerabbasi 0bffc86
Use `xft_*` build of `tk` to avoid font issues on Linux.
hameerabbasi 2c24690
Don't install unnecessary packages.
hameerabbasi 9426b27
Modify format of `requirements*.txt`.
hameerabbasi 00f6d52
Make `OneTrainer` package editable for easier dev.
hameerabbasi e76e790
Repeat git requirements in `requirements-global.txt`.
hameerabbasi 6fc0455
Update the Linux/macOS installation scripts.
hameerabbasi 0f7a373
Initial Windows 'it works' pixi scripts and bump min pixi version for…
O-J1 e6b83c3
Tweak platform_env
O-J1 101cc26
Fix still incorrect platform_env
O-J1 b897bcc
Fix Tensorboard breaking, swap to shutil.which
O-J1 fbeec51
Update `README.md` with new install instructions.
hameerabbasi 1c50e81
Further readme tweaks
O-J1 c040fb9
Add `run-cmd.ps1` and update `README.md` accordingly.
hameerabbasi afe6b42
Fix run-cmd.ps1 syntax
O-J1 fbc6991
Minimal Dockerfile.
hameerabbasi aa28f0b
Update torch version for ROCm.
hameerabbasi f582cbb
Merge remote-tracking branch 'origin/master' into modernize-install
hameerabbasi 0403b1e
Update lockfile.
hameerabbasi ea54713
Merge remote-tracking branch 'hameerabbasi/modernize-install' into mo…
hameerabbasi 543d410
Remove lazy update mentions and update dockerfiles.
hameerabbasi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| * text=auto eol=lf | ||
| *.bat text eol=crlf | ||
| pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,7 @@ | ||
| @echo off | ||
|
|
||
| REM Avoid footgun by explictly navigating to the directory containing the batch file | ||
| chcp 65001 >nul | ||
| cd /d "%~dp0" | ||
|
|
||
| REM Verify that OneTrainer is our current working directory | ||
| if not exist "scripts\train_ui.py" ( | ||
| echo Error: train_ui.py does not exist, you have done something very wrong. Reclone the repository. | ||
| goto :end | ||
| ) | ||
|
|
||
| if not defined PYTHON (set PYTHON=python) | ||
| if not defined VENV_DIR (set "VENV_DIR=%~dp0venv") | ||
|
|
||
| :check_venv | ||
| dir "%VENV_DIR%" >NUL 2>NUL | ||
| if not errorlevel 1 goto :activate_venv | ||
| echo venv not found, please run install.bat first | ||
| goto :end | ||
|
|
||
| :activate_venv | ||
| echo activating venv %VENV_DIR% | ||
| set PYTHON="%VENV_DIR%\Scripts\python.exe" -X utf8 | ||
| echo Using Python %PYTHON% | ||
|
|
||
| :launch | ||
| echo Generating debug report... | ||
| %PYTHON% scripts\generate_debug_report.py | ||
| if errorlevel 1 ( | ||
| echo Error: Debug report generation failed with code %ERRORLEVEL% | ||
| ) else ( | ||
| echo Now upload the debug report to your Github issue or post in Discord. | ||
| ) | ||
|
|
||
| :end | ||
| powershell -ExecutionPolicy Bypass -File "%~dp0scripts\powershell\export_debug.ps1" %* | ||
| set "_EXIT=%ERRORLEVEL%" | ||
| pause | ||
| exit /b %_EXIT% |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this line why I don't get a diff for the
pixi.lockfile when I update?when I make changes, I usually want to see what I did before I commit or push. Currently I can't.