From e4a2ca69a6827ca55e2ffeec31abec12fc3eb14b Mon Sep 17 00:00:00 2001 From: JT Date: Mon, 4 Nov 2024 21:01:59 -0800 Subject: [PATCH 1/2] Merge pull request #875 from ionite34/no-more-binary don't use binary search & fix some other misc errors (cherry picked from commit 7ae0a975851da5a1cac0e8ec9ba876398e0b88c4) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 45 +++++++++++++++++++ .../CivitAiBrowserViewModel.cs | 2 +- .../Models/Packages/A3WebUI.cs | 4 +- .../Models/Packages/OneTrainer.cs | 3 +- 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54924c3d..61ca7e7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,49 @@ All notable changes to Stability Matrix will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html). +<<<<<<< HEAD +======= +## v2.13.0-dev.3 +### Added +- Added more base model types to the CivitAI Model Browser & Checkpoint Manager +### Fixed +- Fixed some instances of Civitai model browser not loading new results +- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111 + +## v2.13.0-dev.2 +### Added +- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution! +- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution! +- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once +- Added "Search by Creator" command to Civitai browser context menu +- Added Beta scheduler to the scheduler selector in Inference +- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support +- Added max concurrent downloads option & download queueing for most downloads +### Changed +- (Internal) Updated to Avalonia 11.1.4 +- Adjusted the Branch/Release toggle during package install flow to be a little more obvious +- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels +### Fixed +- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference +- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update +- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch. +- Fixed minimize button not working on macOS +- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions +- Fixed text alignment issues in the Downloads tab for certain long names / progress infos +### Supporters +#### Visionaries +- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable! + +## v2.13.0-dev.1 +### Added +- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder` +- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️) +- Added InvokeAI model sharing option +### Supporters +#### Visionaries +- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey! + +>>>>>>> 7ae0a975 (Merge pull request #875 from ionite34/no-more-binary) ## v2.12.3 ### Added - Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution! @@ -14,6 +57,8 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2 - Fixed some cases of FileTransferExists error when running re/Forge or Automatic1111 - Fixed update check not happening on startup for some users - Fixed error when installing Automatic1111 on macOS +- Fixed some instances of Civitai model browser not loading new results +- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111 ## v2.12.2 ### Added diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs index a7cf3aa8..e08626b6 100644 --- a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs +++ b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs @@ -162,7 +162,7 @@ or nameof(HideEarlyAccessModels) ) .DisposeMany() .Filter(filterPredicate) - .SortAndBind(ModelCards, sortPredicate, new SortAndBindOptions { UseBinarySearch = true }) + .SortAndBind(ModelCards, sortPredicate) .Subscribe(); settingsManager.RelayPropertyFor( diff --git a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs index 9382c003..e357e16a 100644 --- a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs +++ b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs @@ -212,7 +212,7 @@ public override async Task InstallPackage( var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion(); var requirements = new FilePath(installLocation, "requirements_versions.txt"); - var pipArgs = options.PythonOptions.TorchIndex switch + var pipArgs = torchVersion switch { TorchIndex.Mps => new PipInstallArgs() @@ -227,7 +227,7 @@ await requirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false), .WithTorch("==2.1.2") .WithTorchVision("==0.16.2") .WithTorchExtraIndex( - options.PythonOptions.TorchIndex switch + torchVersion switch { TorchIndex.Cpu => "cpu", TorchIndex.Cuda => "cu121", diff --git a/StabilityMatrix.Core/Models/Packages/OneTrainer.cs b/StabilityMatrix.Core/Models/Packages/OneTrainer.cs index 4c26d503..34b503dc 100644 --- a/StabilityMatrix.Core/Models/Packages/OneTrainer.cs +++ b/StabilityMatrix.Core/Models/Packages/OneTrainer.cs @@ -57,7 +57,8 @@ public override async Task InstallPackage( await using var venvRunner = await SetupVenvPure(installLocation).ConfigureAwait(false); progress?.Report(new ProgressReport(-1f, "Installing requirements", isIndeterminate: true)); - var requirementsFileName = options.PythonOptions.TorchIndex switch + var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion(); + var requirementsFileName = torchVersion switch { TorchIndex.Cuda => "requirements-cuda.txt", TorchIndex.Rocm => "requirements-rocm.txt", From 761097c5bdbfdba5802730ddbcf36841cec935dc Mon Sep 17 00:00:00 2001 From: JT Date: Mon, 4 Nov 2024 21:05:38 -0800 Subject: [PATCH 2/2] Update chagenlog --- CHANGELOG.md | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61ca7e7f..624d794d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,49 +5,6 @@ All notable changes to Stability Matrix will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html). -<<<<<<< HEAD -======= -## v2.13.0-dev.3 -### Added -- Added more base model types to the CivitAI Model Browser & Checkpoint Manager -### Fixed -- Fixed some instances of Civitai model browser not loading new results -- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111 - -## v2.13.0-dev.2 -### Added -- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution! -- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution! -- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once -- Added "Search by Creator" command to Civitai browser context menu -- Added Beta scheduler to the scheduler selector in Inference -- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support -- Added max concurrent downloads option & download queueing for most downloads -### Changed -- (Internal) Updated to Avalonia 11.1.4 -- Adjusted the Branch/Release toggle during package install flow to be a little more obvious -- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels -### Fixed -- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference -- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update -- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch. -- Fixed minimize button not working on macOS -- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions -- Fixed text alignment issues in the Downloads tab for certain long names / progress infos -### Supporters -#### Visionaries -- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable! - -## v2.13.0-dev.1 -### Added -- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder` -- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️) -- Added InvokeAI model sharing option -### Supporters -#### Visionaries -- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey! - ->>>>>>> 7ae0a975 (Merge pull request #875 from ionite34/no-more-binary) ## v2.12.3 ### Added - Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!