updated

README.md

@@ -40,8 +40,8 @@ This application uses:
 
 ## Implementation Notes
 
-- PyTorch 2.0.1 compatibility is ensured through a comprehensive custom patch (torch_patch.py) that enables latest diffusers versions to work with PyTorch 2.0.1
-- The patch creates placeholder implementations for PyTorch features introduced in 2.1+ (like float8 types, torch.compile, and torch._dynamo)
-- This approach allows using the latest diffusers version without downgrading, while maintaining full compatibility with ZeroGPU
+- The application uses PyTorch 2.1+ which provides native support for the features required by the latest diffusers library
+- This ensures full compatibility with the latest versions of all dependencies while maintaining ZeroGPU support
+- All components are configured for optimal performance on the ZeroGPU platform
 
 Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference

app.py

@@ -7,8 +7,6 @@ from PIL import Image
 from omegaconf import OmegaConf
 from pytorch_lightning import seed_everything
 from huggingface_hub import hf_hub_download
-# Import our torch patch before diffusers
-import torch_patch
 from diffusers import DiffusionPipeline, EulerAncestralDiscreteScheduler
 from einops import rearrange
 from shap_e.diffusion.sample import sample_latents

app2.py

@@ -7,7 +7,7 @@ from PIL import Image
 from omegaconf import OmegaConf
 from pytorch_lightning import seed_everything
 from huggingface_hub import hf_hub_download
-""||||||||||||||||||||"from diffusers import DiffusionPipeline, EulerAncestralDiscreteScheduler
+from diffusers import DiffusionPipeline, EulerAncestralDiscreteScheduler
 from einops import rearrange
 from shap_e.diffusion.sample import sample_latents
 from shap_e.diffusion.gaussian_diffusion import diffusion_from_config

requirements.txt

@@ -1,5 +1,5 @@
-torch==2.0.1
-torchvision==0.15.2
+torch>=2.1.0
+torchvision>=0.16.0
 gradio>=4.13.0,<5.0.0
 diffusers
 transformers

requirements2.txt

@@ -0,0 +1,253 @@
+absl-py==2.1.0
+accelerate==0.21.0
+aiofiles==23.2.1
+aiohappyeyeballs==2.4.0
+aiohttp==3.10.5
+aiosignal==1.3.1
+altair==5.4.1
+annotated-types==0.7.0
+antlr4-python3-runtime==4.9.3
+anyio==4.4.0
+args==0.1.0
+asttokens @ file:///home/conda/feedstock_root/build_artifacts/asttokens_1698341106958/work
+async-timeout==4.0.3
+asyncer==0.0.8
+attrs==24.2.0
+beautifulsoup4==4.12.3
+bitsandbytes==0.43.3
+blendertoolbox==0.0.3
+blinker==1.9.0
+blobfile==3.0.0
+bpy==4.0.0
+braceexpand==0.1.7
+cachetools==5.5.0
+certifi==2024.8.30
+charset-normalizer==3.3.2
+-e git+ssh://[email protected]/GaParmar/clean-fid.git@bd44693af04626963af76e94bdb1d4529a76bd11#egg=clean_fid
+click==8.1.7
+clint==0.5.1
+clip @ git+https://github.com/openai/CLIP.git@dcba3cb2e2827b402d2701e7e1c7d9fed8a20ef1
+coloredlogs==15.0.1
+comm @ file:///home/conda/feedstock_root/build_artifacts/comm_1710320294760/work
+ConfigArgParse==1.7
+contourpy==1.3.0
+cycler==0.12.1
+Cython==3.0.11
+dash==2.18.2
+dash-core-components==2.0.0
+dash-html-components==2.0.0
+dash-table==5.0.0
+dataclasses-json==0.6.7
+debugpy @ file:///home/conda/feedstock_root/build_artifacts/debugpy_1725269181790/work
+decorator @ file:///home/conda/feedstock_root/build_artifacts/decorator_1641555617451/work
+Deprecated==1.2.14
+diffusers==0.19.3
+dill==0.3.7
+einops==0.8.0
+embedding-reader==1.7.0
+exceptiongroup @ file:///home/conda/feedstock_root/build_artifacts/exceptiongroup_1720869315914/work
+executing @ file:///home/conda/feedstock_root/build_artifacts/executing_1725214404607/work
+fairscale==0.4.13
+fastapi==0.115.9
+fastjsonschema==2.21.1
+ffmpy==0.4.0
+filelock==3.16.0
+filetype==1.2.0
+fire==0.7.0
+Flask==3.0.3
+flatbuffers==24.3.25
+fonttools==4.53.1
+frozenlist==1.4.1
+fsspec==2023.10.0
+ftfy==6.3.0
+gdown==5.2.0
+GPUtil==1.4.0
+gradio==3.50.0
+gradio_client==0.6.1
+groovy==0.1.2
+grpcio==1.66.1
+h11==0.14.0
+-e git+https://github.com/tgxs002/HPSv2.git@866735ecaae999fa714bd9edfa05aa2672669ee3#egg=hpsv2
+httpcore==1.0.5
+httpx==0.27.2
+huggingface-hub==0.25.0
+humanfriendly==10.0
+humanize==4.11.0
+idna==3.8
+image-reward==1.5
+imageio==2.35.1
+imageio-ffmpeg==0.5.1
+importlib_metadata==8.4.0
+importlib_resources==6.4.5
+iniconfig==2.0.0
+inquirerpy==0.3.4
+iopath==0.1.10
+ipykernel @ file:///home/conda/feedstock_root/build_artifacts/ipykernel_1719845459717/work
+ipympl==0.9.4
+ipython @ file:///home/conda/feedstock_root/build_artifacts/ipython_1725050136642/work
+ipython-genutils==0.2.0
+ipywidgets==8.1.5
+itsdangerous==2.2.0
+jedi @ file:///home/conda/feedstock_root/build_artifacts/jedi_1696326070614/work
+Jinja2==3.1.4
+joblib==1.4.2
+jsonschema==4.23.0
+jsonschema-specifications==2023.12.1
+jupyter_client @ file:///home/conda/feedstock_root/build_artifacts/jupyter_client_1726610684920/work
+jupyter_core @ file:///home/conda/feedstock_root/build_artifacts/jupyter_core_1710257277185/work
+jupyterlab_widgets==3.0.13
+kiui==0.2.13
+kiwisolver==1.4.7
+lazy_loader==0.4
+lightning-utilities==0.11.7
+llvmlite==0.43.0
+loguru==0.7.2
+lxml==5.3.0
+Markdown==3.7
+markdown-it-py==3.0.0
+MarkupSafe==2.1.5
+marshmallow==3.22.0
+matplotlib==3.9.2
+matplotlib-inline @ file:///home/conda/feedstock_root/build_artifacts/matplotlib-inline_1713250518406/work
+mdurl==0.1.2
+mmh3==5.0.1
+mpmath==1.3.0
+multidict==6.1.0
+multiprocess==0.70.15
+mypy-extensions==1.0.0
+narwhals==1.6.4
+nbformat==5.10.4
+nest_asyncio @ file:///home/conda/feedstock_root/build_artifacts/nest-asyncio_1705850609492/work
+networkx==3.3
+ninja==1.11.1.1
+numba==0.60.0
+numpy==1.26.4
+nvdiffrast @ git+https://github.com/NVlabs/nvdiffrast/@c5caf7bdb8a2448acc491a9faa47753972edd380
+nvidia-cublas-cu12==12.1.3.1
+nvidia-cuda-cupti-cu12==12.1.105
+nvidia-cuda-nvrtc-cu12==12.1.105
+nvidia-cuda-runtime-cu12==12.1.105
+nvidia-cudnn-cu12==9.1.0.70
+nvidia-cufft-cu12==11.0.2.54
+nvidia-curand-cu12==10.3.2.106
+nvidia-cusolver-cu12==11.4.5.107
+nvidia-cusparse-cu12==12.1.0.106
+nvidia-ml-py==12.535.161
+nvidia-nccl-cu12==2.20.5
+nvidia-nvjitlink-cu12==12.6.68
+nvidia-nvtx-cu12==12.1.105
+nvitop==1.3.2
+objaverse==0.1.7
+objprint==0.2.3
+omegaconf==2.3.0
+onnxruntime==1.19.2
+open3d==0.19.0
+open_clip_torch==2.30.0
+opencv-python-headless==4.10.0.84
+OpenEXR==3.3.2
+orjson==3.10.7
+packaging @ file:///home/conda/feedstock_root/build_artifacts/packaging_1718189413536/work
+pandas==2.2.2
+parso @ file:///home/conda/feedstock_root/build_artifacts/parso_1712320355065/work
+pexpect @ file:///home/conda/feedstock_root/build_artifacts/pexpect_1706113125309/work
+pfzy==0.3.4
+pickleshare @ file:///home/conda/feedstock_root/build_artifacts/pickleshare_1602536217715/work
+pillow==10.4.0
+platformdirs==4.3.2
+plotly==5.24.1
+pluggy==1.5.0
+plyfile==1.1
+pooch==1.8.2
+portalocker==2.10.1
+prompt_toolkit @ file:///home/conda/feedstock_root/build_artifacts/prompt-toolkit_1718047967974/work
+protobuf==3.20.3
+psutil @ file:///home/conda/feedstock_root/build_artifacts/psutil_1725737838492/work
+ptyprocess @ file:///home/conda/feedstock_root/build_artifacts/ptyprocess_1609419310487/work/dist/ptyprocess-0.7.0-py2.py3-none-any.whl
+pure_eval @ file:///home/conda/feedstock_root/build_artifacts/pure_eval_1721585709575/work
+pyarrow==15.0.2
+pyarrow-hotfix==0.6
+pycryptodomex==3.20.0
+pydantic==2.9.1
+pydantic_core==2.23.3
+pydub==0.25.1
+pygltflib==1.16.2
+Pygments @ file:///home/conda/feedstock_root/build_artifacts/pygments_1714846767233/work
+PyMatting==1.1.12
+PyMCubes==0.1.6
+pyparsing==3.1.4
+pyquaternion==0.9.9
+PySocks==1.7.1
+pytest==7.2.0
+pytest-split==0.8.0
+python-dateutil @ file:///home/conda/feedstock_root/build_artifacts/python-dateutil_1709299778482/work
+python-multipart==0.0.20
+-e git+ssh://[email protected]/mseitzer/pytorch-fid.git@b9c18118d082cbd263c1b8963fc4221dc1cbb659#egg=pytorch_fid
+pytorch-lightning==2.1.2
+pytorch3d @ git+https://github.com/facebookresearch/pytorch3d.git@fca83e6369e62de2736763372a2de949d56d5a74
+pytz==2024.1
+PyYAML==6.0.2
+pyzmq @ file:///home/conda/feedstock_root/build_artifacts/pyzmq_1725430379702/work
+referencing==0.35.1
+regex==2024.7.24
+rembg==2.0.59
+requests==2.32.3
+retrying==1.3.4
+rich==13.9.4
+rpds-py==0.20.0
+ruff==0.9.9
+safehttpx==0.1.6
+safetensors==0.4.5
+scikit-image==0.24.0
+scikit-learn==1.6.1
+scipy==1.14.1
+seaborn==0.13.2
+semantic-version==2.10.0
+sentencepiece==0.2.0
+-e git+ssh://[email protected]/Fortunanto/shap-d-edit.git@f58bede0bf8b32ddda9d69af1df15ecc6b8912c2#egg=shap_e
+shellingham==1.5.4
+six @ file:///home/conda/feedstock_root/build_artifacts/six_1620240208055/work
+sniffio==1.3.1
+soupsieve==2.6
+stack-data @ file:///home/conda/feedstock_root/build_artifacts/stack_data_1669632077133/work
+starlette==0.45.3
+sympy==1.13.2
+tenacity==9.0.0
+tensorboard==2.17.1
+tensorboard-data-server==0.7.2
+termcolor==2.4.0
+threadpoolctl==3.5.0
+tifffile==2024.8.30
+timm==0.6.13
+tokenizers==0.13.3
+tomli==2.1.0
+tomlkit==0.13.2
+torch==2.4.1
+torchaudio==2.4.1
+torchmetrics==1.4.1
+torchvision==0.19.1
+tornado @ file:///home/conda/feedstock_root/build_artifacts/tornado_1724960687225/work
+tqdm==4.66.5
+traitlets @ file:///home/conda/feedstock_root/build_artifacts/traitlets_1713535121073/work
+transformers==4.30.2
+trimesh==4.4.9
+triton==3.0.0
+typer==0.15.2
+typing-inspect==0.9.0
+typing_extensions @ file:///home/conda/feedstock_root/build_artifacts/typing_extensions_1717802530399/work
+tzdata==2024.1
+urllib3==2.2.2
+uvicorn==0.30.6
+varname==0.13.3
+watchdog==5.0.3
+wcwidth @ file:///home/conda/feedstock_root/build_artifacts/wcwidth_1704731205417/work
+webdataset==0.2.100
+websockets==11.0.3
+Werkzeug==3.0.4
+widgetsnbextension==4.0.13
+wrapt==1.16.0
+xatlas==0.0.9
+xxhash==3.5.0
+yarl==1.11.1
+-e git+ssh://[email protected]/huanngzh/render-toolbox.git@bae8224d09a4aa2302b7e3cd3622079b84e5d193#egg=your_package
+zipp==3.20.1
+zstandard==0.23.0

torch_patch.py

@@ -1,66 +0,0 @@
-"""
-Patch for torch module to make it compatible with newer diffusers versions 
-while using PyTorch 2.0.1
-"""
-import torch
-import sys
-import warnings
-import types
-import functools
-
-# Check if the attributes already exist
-if not hasattr(torch, 'float8_e4m3fn'):
-    # Add missing attributes for compatibility
-    # These won't actually function, but they'll allow imports to succeed
-    torch.float8_e4m3fn = torch.float16  # Use float16 as a placeholder type
-    warnings.warn(
-        "Added placeholder for torch.float8_e4m3fn. Actual 8-bit operations won't work, "
-        "but imports should succeed. Using PyTorch 2.0.1 with newer diffusers."
-    )
-
-if not hasattr(torch, 'float8_e5m2'):
-    torch.float8_e5m2 = torch.float16  # Use float16 as a placeholder type
-
-# Add other missing torch types that might be referenced
-for type_name in ['bfloat16', 'bfloat8', 'float8_e4m3fnuz']:
-    if not hasattr(torch, type_name):
-        setattr(torch, type_name, torch.float16)
-        
-# Create a placeholder for torch._dynamo if it doesn't exist
-if not hasattr(torch, '_dynamo'):
-    torch._dynamo = types.ModuleType('torch._dynamo')
-    sys.modules['torch._dynamo'] = torch._dynamo
-    
-    # Add common attributes/functions used by torch._dynamo
-    torch._dynamo.config = types.SimpleNamespace(suppress_errors=True)
-    torch._dynamo.optimize = lambda *args, **kwargs: lambda f: f
-    torch._dynamo.disable = lambda: None
-    torch._dynamo.reset_repro_cache = lambda: None
-
-# Add torch.compile if it doesn't exist
-if not hasattr(torch, 'compile'):
-    # Just return the function unchanged
-    torch.compile = lambda fn, **kwargs: fn
-
-# Create a placeholder for torch.cuda.amp if it doesn't exist
-if not hasattr(torch.cuda, 'amp'):
-    torch.cuda.amp = types.ModuleType('torch.cuda.amp')
-    sys.modules['torch.cuda.amp'] = torch.cuda.amp
-    
-    # Mock autocast
-    class MockAutocast:
-        def __init__(self, *args, **kwargs):
-            pass
-        def __enter__(self):
-            return self
-        def __exit__(self, *args):
-            pass
-        def __call__(self, func):
-            @functools.wraps(func)
-            def wrapper(*args, **kwargs):
-                return func(*args, **kwargs)
-            return wrapper
-    
-    torch.cuda.amp.autocast = MockAutocast
-
-print("PyTorch patched for compatibility with newer diffusers - using latest diffusers with PyTorch 2.0.1") 

zero123plus/model.py

@@ -9,10 +9,6 @@ from huggingface_hub import hf_hub_download
 from omegaconf import OmegaConf
 from transformers import CLIPImageProcessor, CLIPTextModel, CLIPTokenizer
 
-# Import torch patch before diffusers
-import sys
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-import torch_patch
 from diffusers import DiffusionPipeline, EulerAncestralDiscreteScheduler, DDPMScheduler, UNet2DConditionModel
 from tqdm import tqdm
 from torchvision.transforms import v2

zero123plus/pipeline.py

@@ -1,9 +1,4 @@
 from typing import Any, Dict, Optional
-import os
-import sys
-# Add parent directory to path and import torch patch before diffusers
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-import torch_patch
 from diffusers.models import AutoencoderKL, UNet2DConditionModel
 from diffusers.schedulers import KarrasDiffusionSchedulers