Commit Graph
323 Commits
Author SHA1 Message Date
John Pollock 6e5225e6c9 Increment revision to 2.5.9 2025-10-15 14:53:39 -05:00
John Pollock 7a3ca1c977 fix: restore global device state in wrapper overrides and checkpoint loader
Add runtime getters in __init__.py:

get_current_device()
get_current_text_encoder_device()
get_current_unet_offload_device()
Update wrappers.py to follow the wanvideo.py pattern: each override that sets a device now

captures the original device at runtime via the appropriate getter,
performs the existing override logic unchanged,
returns inside a try ... finally and restores the original device in finally.
Applies to DisTorch V2 factory override, GGUF legacy/V2 overrides, CLIP overrides, standard UNet/VAE wrappers and offload variants.
Fix checkpoint_multigpu.py to use getters (instead of reading globals directly) when capturing original devices before modifying them, and restore in the existing finally block.

Rationale: prevents MultiGPU nodes from leaving the ComfyUI global device context "stuck" to a non-default device. Changes are minimal and localized; no public API or functional behavior is altered except guaranteed restoration of global device state after node execution.
2025-10-15 14:23:23 -05:00
John Pollock 0a0716bec2 Merge pull request #128 from max-solo23/patch-2
Fix AttributeError for patchers missing model_patches_models() (GGUFModelPatcher, ModelPatcher)
2025-10-14 15:47:44 -05:00
John Pollockandmax-solo23 0473c2a72a PR #128 - Improving GGUF model compatibility with DisTorch2 - Bump revision to 2.5.8
Co-authored-by: max-solo23 <maksym.solomyanov@gmail.com>
2025-10-14 13:57:25 -05:00
John Pollockandmax-solo23 fa437d2dc3 Updating distorch_2.py:
1. Replacing ad-hoc print() with structured logging
2. Simplifying device detection (fail-fast approach)
3. Maintaining the implemented backward compatibility for GGUF/ModelPatcher by max-solo23
4. Following the repository's logging conventions

Co-authored-by: max-solo23 <maksym.solomyanov@gmail.com>
2025-10-14 13:49:16 -05:00
Maksym Solomyanov 5912141732 Update distorch_2.py: Add compatibility for GGUFModelPatcher and ModelPatcher lacking model_patches_models attribute
Some model patchers define only model_patches_to() and not model_patches_models(), 
which ComfyUI expects for dependency discovery. 
This patch adds a targeted fallback for GGUFModelPatcher and ModelPatcher 
to prevent AttributeError when model_patches_models() is missing.
2025-10-14 13:28:27 +02:00
John Pollock a24f0a6e87 hotfix: Corrects for corner case when DisTorch VirtualVRAM=0.0 GB (previous refactor shunted to standard loader. This replicates that required logic across all nodes using DisTorch2 for allocations. Next time I will wait for the final test work flow to finish VAE conversion (where is the only place I test this.) 2025-10-13 22:08:05 -05:00
John Pollock e40de4ce99 Merge pull request #127 from pollockjj/issue/#125
Issue/#125
2025-10-13 19:50:18 -05:00
John Pollock 6c3e938f32 chore: dead code clean-up 2025-10-13 19:46:40 -05:00
John Pollock edd1bbf8f4 Prepare for #125 release 2025-10-13 19:37:24 -05:00
John Pollock 8952ea3d2b future ci work 2025-10-13 19:30:13 -05:00
John Pollock 1951513e92 refactor: migrate DisTorch2 allocation tracking to per-model metadata
- Replace global safetensor_allocation_store/safetensor_settings_store and create_safetensor_model_hash
  with a per-model annotation (_distorch_v2_meta) stored directly on the inner model object.
- Update distorch_2 to remove global stores and hash creation; parse and consume allocation strings
  from inner_model._distorch_v2_meta during model registration and loading.
- Update wrappers, checkpoint_multigpu, device_utils, and __init__ to set and read the new metadata
  instead of writing/reading global stores.
- Simplify detection of DisTorch-managed models (check inner_model._distorch_v2_meta) and adjust
  logging to surface inner model ids and allocation info.
- Clean up related imports and dead code paths.

Files changed: distorch_2.py, wrappers.py, checkpoint_multigpu.py, device_utils.py, model_management_mgpu.py, __init__.py
2025-10-13 19:00:59 -05:00
John Pollockandmax-solo23 bdd612c619 hotfix: #124 - fix for CLIPTextEncode error: ‘GGUFModelPatcher’ object has no attribute ‘model_patches_models’.
Co-authored-by: max-solo23
2025-10-13 13:44:34 -05:00
John Pollock 2143a281b7 hotfix: WanVideoWrapper Wan2.2 I2V workflow corrections 2025-10-13 03:59:45 -05:00
John Pollock 0d6eba79d7 Close #123, Merge pull request #126 from pollockjj/ew 2025-10-13 03:16:17 -05:00
John PollockandCopilot 5d61440f0a Update example_workflows/wan2_2 t2v lightx2v lora distorch2.json
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-10-13 03:13:58 -05:00
John PollockandCopilot b6ab751f4c Update example_workflows/wan2_2 t2i lightx2v lora distorch2.json
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-10-13 03:13:44 -05:00
John PollockandCopilot eeed32ba1b Update example_workflows/qwen_image_edit_2509 unet clip distorch2.json
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-10-13 03:13:23 -05:00
John Pollock ef07c0f41e Documentation clean-up 2025-10-13 02:41:07 -05:00
John Pollock 5310d4a28d Update documentation and example workflows to match Comfy guidelines 2025-10-13 02:16:52 -05:00
John Pollock fd60ae6f65 Add MultiGPU support for various model loaders and encoders 2025-10-13 02:10:41 -05:00
John Pollock 01b41f4514 Update workflow examples to match Comfy Core guidelines 2025-10-13 01:52:20 -05:00
John Pollock 161174266c Add UNet offload device support, and enhance Florence2 model loading with safetensors conversion option. 2025-10-12 04:35:43 -05:00
John Pollock 0d6dfc7524 rename directory to comfy expected 2025-10-11 07:42:09 -05:00
John Pollock d6137f39d0 Merge pull request #122 from pollockjj/wvw
Pull Request: Refresh WanVideoWrapper MultiGPU support to latest upstream
2025-10-10 15:21:11 -05:00
John Pollock c77a4b2063 Add support for secure connections in ComfyWorkflowRunner 2025-10-10 15:20:07 -05:00
John Pollock 830342453c Update from Pull Request #122 review 2025-10-10 15:11:25 -05:00
John Pollock e4c2006c44 Merge commit 'da6b605' into wvw 2025-10-10 14:31:18 -05:00
John Pollock e31ba04f20 WanVideoWrapper updates to reflect reported changes (#118, #90) in the ComfyUI-WanVideoWrapper code base. Breaking changes. See example workflows. 2025-10-10 14:28:11 -05:00
John Pollock 55096eef4b Pre-release cleanup 2025-10-10 14:24:21 -05:00
John Pollock 40d40ef9b6 Finished implementation of wanvideowrapper nodes, updated example workflows, added some benchmarking files for reference. 2025-10-10 13:40:37 -05:00
John Pollock db931d66c3 Add WanVideoControlnetLoader class for loading ControlNet models 2025-10-10 09:30:46 -05:00
John Pollock faef324975 correcting implementation of salvagable nodes and obiliterating one abomination 2025-10-10 09:28:58 -05:00
John Pollock 610c2102dd Add multi-GPU support for remaining planned WanVideo model loaders 2025-10-10 04:35:16 -05:00
John Pollock 375cbd093c Add LoadWanVideoClipTextEncoder and WanVideoClipVisionEncode for multi-GPU support 2025-10-09 19:05:28 -05:00
John Pollock 2f605e0db3 Add WanVideoVACEEncode and enhance WanVideoEncode for multi-GPU support
- Implemented WanVideoVACEEncode class for encoding with VACE, including input parameters for width, height, number of frames, and strength.
- Enhanced WanVideoEncode class to support multi-GPU encoding, with additional parameters for noise augmentation and latent strength.
- Updated device management to ensure proper device context during encoding processes.
2025-10-09 14:41:53 -05:00
John Pollock ba0a3a6e21 improve documentation on supporting ROCm cuda-enumerated GPUs. 2025-10-09 13:01:20 -05:00
John Pollock b04ae1e378 Coverted WanVideoImageToVideoEncode to shim 2025-10-09 12:32:29 -05:00
John Pollock f0313e49aa WanVideoDecode cleanup 2025-10-09 08:12:26 -05:00
John Pollock 15ff29c63b methodological convergence and cleanup 2025-10-09 03:06:25 -05:00
John Pollock 7c87983d72 WIP 2025-10-08 23:06:54 -05:00
John Pollock 04013c3ee5 feat: add WanVideoTextEncodeCached and WanVideoTextEncodeSingle classes for enhanced text encoding functionality 2025-10-08 06:08:16 -05:00
John Pollock b0930e284a Merge pull request #120 from xmodo99/patch-1
fix dead link
2025-10-08 02:30:03 -05:00
xmodo99 da6b605de6 fix dead link 2025-10-07 18:57:44 -07:00
John Pollock d300c12e9f feat: add WanVideoBlockSwap class and integrate into MultiGPU node mappings 2025-10-07 14:22:01 -05:00
John Pollock 27cfb83733 feat: add MultiGPU logging enhancements and new CI scripts for workflow execution and log summarization, WanVidwoWrapper Model Loader/Sampler re-implemented 2025-10-07 13:19:09 -05:00
John Pollock b034901a05 Housecleaning 2025-10-07 04:00:12 -05:00
John Pollock 616a89c23f feat: add multi-GPU WanVideo VAE loader, encode, and decode nodes
- Added imports and registrations for WanVideoVAELoader, WanVideoTinyVAELoader,
  WanVideoImageToVideoEncode, and WanVideoDecode in multi-GPU versions.
2025-10-06 05:53:23 -05:00
John Pollock cfe6ebc70f Re-coded T5 loader and WanVideo Text Encoder 2/24 complete 2025-10-06 00:55:34 -05:00
John Pollock ddfc95d4a6 Deprecate HunyuanVideoWrapper support
Re-synchronize first node for WanVideoWrapper - LoadWanVideoT5TextEncoder
2025-10-05 23:54:41 -05:00