Skip to content

Commit 6206a6d

Browse files
committed
Merge branch 'master' into dr-support-pip-cm
2 parents 7b9ad52 + 048f49a commit 6206a6d

File tree

8 files changed

+65
-6
lines changed

8 files changed

+65
-6
lines changed

.github/PULL_REQUEST_TEMPLATE/api-node.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ If **Need pricing update**:
1818
- [ ] **QA not required**
1919

2020
### Comms
21-
- [ ] Informed **@Kosinkadink**
21+
- [ ] Informed **Kosinkadink**

.github/workflows/api-node-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Append API Node PR template
22

33
on:
44
pull_request_target:
5-
types: [opened, reopened, synchronize, edited, ready_for_review]
5+
types: [opened, reopened, synchronize, ready_for_review]
66
paths:
77
- 'comfy_api_nodes/**' # only run if these files changed
88

.github/workflows/release-stable-all.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,23 @@ jobs:
4343
test_release: true
4444
secrets: inherit
4545

46+
release_nvidia_cu126:
47+
permissions:
48+
contents: "write"
49+
packages: "write"
50+
pull-requests: "read"
51+
name: "Release NVIDIA cu126"
52+
uses: ./.github/workflows/stable-release.yml
53+
with:
54+
git_tag: ${{ inputs.git_tag }}
55+
cache_tag: "cu126"
56+
python_minor: "12"
57+
python_patch: "10"
58+
rel_name: "nvidia"
59+
rel_extra_name: "_cu126"
60+
test_release: true
61+
secrets: inherit
62+
4663
release_amd_rocm:
4764
permissions:
4865
contents: "write"

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ Update your Nvidia drivers if it doesn't start.
183183

184184
[Experimental portable for AMD GPUs](https://github.com/comfyanonymous/ComfyUI/releases/latest/download/ComfyUI_windows_portable_amd.7z)
185185

186-
[Portable with pytorch cuda 12.8 and python 3.12](https://github.com/comfyanonymous/ComfyUI/releases/latest/download/ComfyUI_windows_portable_nvidia_cu128.7z) (Supports Nvidia 10 series and older GPUs).
186+
[Portable with pytorch cuda 12.8 and python 3.12](https://github.com/comfyanonymous/ComfyUI/releases/latest/download/ComfyUI_windows_portable_nvidia_cu128.7z).
187+
188+
[Portable with pytorch cuda 12.6 and python 3.12](https://github.com/comfyanonymous/ComfyUI/releases/latest/download/ComfyUI_windows_portable_nvidia_cu126.7z) (Supports Nvidia 10 series and older GPUs).
187189

188190
#### How do I share models between another UI and ComfyUI?
189191

comfy_extras/nodes_nop.py

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
from comfy_api.latest import ComfyExtension, io
2+
from typing_extensions import override
3+
# If you write a node that is so useless that it breaks ComfyUI it will be featured in this exclusive list
4+
5+
# "native" block swap nodes are placebo at best and break the ComfyUI memory management system.
6+
# They are also considered harmful because instead of users reporting issues with the built in
7+
# memory management they install these stupid nodes and complain even harder. Now it completely
8+
# breaks with some of the new ComfyUI memory optimizations so I have made the decision to NOP it
9+
# out of all workflows.
10+
class wanBlockSwap(io.ComfyNode):
11+
@classmethod
12+
def define_schema(cls):
13+
return io.Schema(
14+
node_id="wanBlockSwap",
15+
category="",
16+
description="NOP",
17+
inputs=[
18+
io.Model.Input("model"),
19+
],
20+
outputs=[
21+
io.Model.Output(),
22+
],
23+
is_deprecated=True,
24+
)
25+
26+
@classmethod
27+
def execute(cls, model) -> io.NodeOutput:
28+
return io.NodeOutput(model)
29+
30+
31+
class NopExtension(ComfyExtension):
32+
@override
33+
async def get_node_list(self) -> list[type[io.ComfyNode]]:
34+
return [
35+
wanBlockSwap
36+
]
37+
38+
async def comfy_entrypoint() -> NopExtension:
39+
return NopExtension()

comfyui_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# This file is automatically generated by the build process when version is
22
# updated in pyproject.toml.
3-
__version__ = "0.3.68"
3+
__version__ = "0.3.69"

nodes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2339,6 +2339,7 @@ async def init_builtin_extra_nodes():
23392339
"nodes_easycache.py",
23402340
"nodes_audio_encoder.py",
23412341
"nodes_rope.py",
2342+
"nodes_nop.py",
23422343
]
23432344

23442345
import_failed = []

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "ComfyUI"
3-
version = "0.3.68"
3+
version = "0.3.69"
44
readme = "README.md"
55
license = { file = "LICENSE" }
66
requires-python = ">=3.9"
@@ -24,7 +24,7 @@ lint.select = [
2424
exclude = ["*.ipynb", "**/generated/*.pyi"]
2525

2626
[tool.pylint]
27-
master.py-version = "3.9"
27+
master.py-version = "3.10"
2828
master.extension-pkg-allow-list = [
2929
"pydantic",
3030
]

0 commit comments

Comments
 (0)