diff --git a/nodes/gpu/__init__.py b/nodes/gpu/__init__.py new file mode 100644 index 00000000..fa381aa1 --- /dev/null +++ b/nodes/gpu/__init__.py @@ -0,0 +1,8 @@ +from . import remeshing_gpu + +NODE_CLASS_MAPPINGS = {} +NODE_DISPLAY_NAME_MAPPINGS = {} +NODE_CLASS_MAPPINGS.update(remeshing_gpu.NODE_CLASS_MAPPINGS) +NODE_DISPLAY_NAME_MAPPINGS.update(remeshing_gpu.NODE_DISPLAY_NAME_MAPPINGS) + +__all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS'] diff --git a/nodes/gpu/comfy-env.toml b/nodes/gpu/comfy-env.toml new file mode 100644 index 00000000..a525267c --- /dev/null +++ b/nodes/gpu/comfy-env.toml @@ -0,0 +1,12 @@ +[cuda] +packages = ["cumesh", "torch", "torchvision"] + +[pypi-dependencies] +numpy = "*" +trimesh = { version = ">=4.0.0", extras = ["easy"] } + +[target.win-64.pypi-dependencies] +msvc-runtime = "*" + +[env_vars] +KMP_DUPLICATE_LIB_OK = "TRUE" diff --git a/nodes/main/remeshing_gpu/__init__.py b/nodes/gpu/remeshing_gpu/__init__.py similarity index 100% rename from nodes/main/remeshing_gpu/__init__.py rename to nodes/gpu/remeshing_gpu/__init__.py diff --git a/nodes/main/remeshing_gpu/remesh.py b/nodes/gpu/remeshing_gpu/remesh.py similarity index 100% rename from nodes/main/remeshing_gpu/remesh.py rename to nodes/gpu/remeshing_gpu/remesh.py diff --git a/nodes/main/__init__.py b/nodes/main/__init__.py index e7bc425e..1477c1c8 100644 --- a/nodes/main/__init__.py +++ b/nodes/main/__init__.py @@ -27,9 +27,6 @@ from . import reconstruction_cgal from . import remeshing_cgal from . import repair_cgal -# GPU nodes (moved from nodes/gpu/) -from . import remeshing_gpu - # Collect all node class mappings NODE_CLASS_MAPPINGS = {} NODE_CLASS_MAPPINGS.update(io.NODE_CLASS_MAPPINGS) @@ -50,7 +47,6 @@ NODE_CLASS_MAPPINGS.update(boolean.NODE_CLASS_MAPPINGS) NODE_CLASS_MAPPINGS.update(reconstruction_cgal.NODE_CLASS_MAPPINGS) NODE_CLASS_MAPPINGS.update(remeshing_cgal.NODE_CLASS_MAPPINGS) NODE_CLASS_MAPPINGS.update(repair_cgal.NODE_CLASS_MAPPINGS) -NODE_CLASS_MAPPINGS.update(remeshing_gpu.NODE_CLASS_MAPPINGS) # Collect all display name mappings NODE_DISPLAY_NAME_MAPPINGS = {} @@ -72,6 +68,5 @@ NODE_DISPLAY_NAME_MAPPINGS.update(boolean.NODE_DISPLAY_NAME_MAPPINGS) NODE_DISPLAY_NAME_MAPPINGS.update(reconstruction_cgal.NODE_DISPLAY_NAME_MAPPINGS) NODE_DISPLAY_NAME_MAPPINGS.update(remeshing_cgal.NODE_DISPLAY_NAME_MAPPINGS) NODE_DISPLAY_NAME_MAPPINGS.update(repair_cgal.NODE_DISPLAY_NAME_MAPPINGS) -NODE_DISPLAY_NAME_MAPPINGS.update(remeshing_gpu.NODE_DISPLAY_NAME_MAPPINGS) __all__ = ['NODE_CLASS_MAPPINGS', 'NODE_DISPLAY_NAME_MAPPINGS'] diff --git a/nodes/main/comfy-env.toml b/nodes/main/comfy-env.toml index db1b0fed..17eeb127 100644 --- a/nodes/main/comfy-env.toml +++ b/nodes/main/comfy-env.toml @@ -4,9 +4,6 @@ packages = ["libgl1-mesa-glx", "libgl1", "libopengl0", "libglu1-mesa"] [dependencies] cgal = "*" -[cuda] -packages = ["cumesh", "torch", "torchvision"] - [pypi-dependencies] numpy = "*" scipy = ">=1.7.0"