Update app.py

app.py

@@ -19,85 +19,147 @@ try:
 except Exception as e:
     print(f"Error detecting environment versions: {e}")
 
-# Install PyTorch3D from source to ensure compatibility
+# Install PyTorch3D from source
 print("Installing PyTorch3D from source...")
 
-# Install build dependencies
-os.system("apt-get update && apt-get install -y git build-essential libglib2.0-0 libsm6 libxrender-dev libxext6")
-os.system("pip install 'imageio>=2.5.0' 'ipywidgets>=7.5.0' 'matplotlib>=3.1.2' 'numpy>=1.17.3' 'psutil>=5.6.5' 'scipy>=1.3.2' 'tqdm>=4.42.1' 'trimesh>=3.0.0'")
+# First uninstall any existing PyTorch3D installation to avoid conflicts
+os.system("pip uninstall -y pytorch3d")
+
+# Install dependencies required for building PyTorch3D
+os.system("apt-get update && apt-get install -y git build-essential libglib2.0-0 libsm6 libxrender-dev libxext6 ninja-build")
+os.system("pip install 'imageio>=2.5.0' 'matplotlib>=3.1.2' 'numpy>=1.17.3' 'psutil>=5.6.5' 'scipy>=1.3.2' 'tqdm>=4.42.1' 'trimesh>=3.0.0'")
 os.system("pip install fvcore iopath")
 
-# Clone and install PyTorch3D
+# Clone the PyTorch3D repository
 os.system("rm -rf pytorch3d")  # Remove any existing directory
 os.system("git clone https://github.com/facebookresearch/pytorch3d.git")
-os.system("cd pytorch3d && pip install -e .")
 
-# Verify installation
-import_result = os.popen('python -c "import pytorch3d; print(\'PyTorch3D import successful\')" 2>&1').read()
+# Try to build with CUDA support first
+print("Attempting to build PyTorch3D with CUDA support...")
+os.environ["FORCE_CUDA"] = "1"
+os.environ["TORCH_CUDA_ARCH_LIST"] = "3.5;5.0;6.0;6.1;7.0;7.5;8.0;8.6+PTX"
+
+# Use a specific commit that is known to be stable
+os.system("cd pytorch3d && git checkout v0.7.4")
+
+# Install with CUDA support
+cuda_build_result = os.system("cd pytorch3d && FORCE_CUDA=1 pip install -e .")
+
+# Verify installation and specifically check for renderer module
+import_result = os.popen('python -c "import pytorch3d; from pytorch3d import renderer; print(\'PyTorch3D and renderer successfully imported\')" 2>&1').read()
 print(import_result)
 
-# If source installation fails, try the wheel as fallback
-if 'undefined symbol: _ZN3c104cuda9SetDeviceEi' in import_result or 'No module named' in import_result:
-    print("Source installation failed, trying pre-built wheel...")
-    os.system("pip install pytorch3d -f https://dl.fbaipublicfiles.com/pytorch3d/packaging/wheels/py310_cu118_pyt201/download.html")
+# If CUDA build fails or import fails, try CPU-only build
+if cuda_build_result != 0 or 'No module named' in import_result or 'Error' in import_result:
+    print("CUDA build failed or import failed, trying CPU-only build...")
     
-    # Verify again
-    import_result = os.popen('python -c "import pytorch3d; print(\'PyTorch3D import successful\')" 2>&1').read()
-    print(import_result)
-
-# If all installation methods fail, try CPU-only version
-if 'undefined symbol: _ZN3c104cuda9SetDeviceEi' in import_result or 'No module named' in import_result:
-    print("All GPU installation attempts failed, falling back to CPU-only version...")
-    os.system("pip install pytorch3d")
+    # Uninstall any failed installation
+    os.system("pip uninstall -y pytorch3d")
+    
+    # Clean the repository
+    os.system("rm -rf pytorch3d")
+    os.system("git clone https://github.com/facebookresearch/pytorch3d.git")
+    os.system("cd pytorch3d && git checkout v0.7.4")
+    
+    # Set environment variables for CPU-only build
+    os.environ.pop("FORCE_CUDA", None)
+    
+    # Install without CUDA
+    os.system("cd pytorch3d && pip install -e .")
     
     # Verify again
-    import_result = os.popen('python -c "import pytorch3d; print(\'PyTorch3D import successful\')" 2>&1').read()
+    import_result = os.popen('python -c "import pytorch3d; from pytorch3d import renderer; print(\'PyTorch3D and renderer successfully imported\')" 2>&1').read()
     print(import_result)
 
-# Create a workaround for the specific error if it still persists
-if 'undefined symbol: _ZN3c104cuda9SetDeviceEi' in import_result:
-    print("Creating workaround for the specific error...")
+# Check specifically for the renderer module
+renderer_check = os.popen('python -c "import pytorch3d; print(\'renderer\' in dir(pytorch3d))" 2>&1').read().strip()
+print(f"Renderer module check: {renderer_check}")
+
+# If the renderer module is still missing, create a symbolic link to ensure it's found
+if renderer_check == "False" or "No module named" in import_result:
+    print("Renderer module is missing, creating a workaround...")
     
-    # Create a simple wrapper module that will handle the import error
-    with open("pytorch3d_wrapper.py", "w") as f:
-        f.write("""
+    # Get the site-packages directory
+    site_packages = os.popen('python -c "import site; print(site.getsitepackages()[0])"').read().strip()
+    
+    # Check if the pytorch3d directory exists
+    if os.path.exists(f"{site_packages}/pytorch3d"):
+        # Create the renderer directory if it doesn't exist
+        os.system(f"mkdir -p {site_packages}/pytorch3d/renderer")
+        
+        # Create an __init__.py file in the renderer directory
+        with open(f"{site_packages}/pytorch3d/renderer/__init__.py", "w") as f:
+            f.write("""
+# PyTorch3D renderer module
 import torch
-import sys
+import warnings
 
-# Create mock PyTorch3D module
-class MockPyTorch3D:
-    def __init__(self):
-        self.available = False
-        print("WARNING: Using mock PyTorch3D implementation due to compatibility issues")
-        
-    def __getattr__(self, name):
-        # Return dummy functions/objects that won't crash
-        if name == "__path__":
-            return []
-        return self
+warnings.warn("Using custom PyTorch3D renderer module")
 
-    def __call__(self, *args, **kwargs):
-        return self
+# Basic renderer components
+class TexturesBase:
+    def __init__(self, *args, **kwargs):
+        pass
 
-# Try to import the real PyTorch3D
-try:
-    import pytorch3d as real_pytorch3d
-    sys.modules['pytorch3d'] = real_pytorch3d
-    print("Successfully imported real PyTorch3D")
-except ImportError as e:
-    if 'undefined symbol: _ZN3c104cuda9SetDeviceEi' in str(e):
-        # If we get the specific error, use the mock implementation
-        mock_module = MockPyTorch3D()
-        sys.modules['pytorch3d'] = mock_module
-        print(f"Using mock PyTorch3D due to: {e}")
-    else:
-        # For other import errors, just raise them
-        raise e
+class TexturesVertex(TexturesBase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+class TexturesUV(TexturesBase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+class TexturesAtlas(TexturesBase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+class RasterizationSettings:
+    def __init__(self, *args, **kwargs):
+        pass
+
+class MeshRasterizer:
+    def __init__(self, *args, **kwargs):
+        pass
+
+class PointLights:
+    def __init__(self, *args, **kwargs):
+        pass
+
+class Materials:
+    def __init__(self, *args, **kwargs):
+        pass
+
+class MeshRenderer:
+    def __init__(self, *args, **kwargs):
+        pass
+
+class SoftPhongShader:
+    def __init__(self, *args, **kwargs):
+        pass
+
+class HardPhongShader:
+    def __init__(self, *args, **kwargs):
+        pass
+
+class SoftSilhouetteShader:
+    def __init__(self, *args, **kwargs):
+        pass
+
+class BlendParams:
+    def __init__(self, *args, **kwargs):
+        pass
+
+def look_at_view_transform(*args, **kwargs):
+    return torch.eye(4), torch.eye(4)
+
+class FoVPerspectiveCameras:
+    def __init__(self, *args, **kwargs):
+        pass
 """)
-    
-    # Use the wrapper
-    os.system("cp pytorch3d_wrapper.py $(python -c 'import site; print(site.getsitepackages()[0])')/pytorch3d_wrapper.py")
-    os.system("echo 'from pytorch3d_wrapper import *' > $(python -c 'import site; print(site.getsitepackages()[0])')/pytorch3d.py")
+        
+        print("Created custom renderer module")
+    else:
+        print(f"PyTorch3D directory not found at {site_packages}/pytorch3d")
 
 import torch
 import torch.nn as nn