Upload 4 files

app.py

@@ -35,7 +35,14 @@ if not check_complex_dependencies():
     try:
         import subprocess
         subprocess.run([sys.executable, "post_install.py"], check=True)
-        print("Post-install completed, restarting...")
+        print("Post-install completed successfully!")
+        
+        # Run test to verify installation
+        print("Running installation test...")
+        subprocess.run([sys.executable, "test_installation.py"], check=True)
+        print("Installation test passed!")
+        
+        print("Restarting to pick up new dependencies...")
         # Restart the process to pick up new dependencies
         os.execv(sys.executable, ['python'] + sys.argv)
     except Exception as e:

post_install.py

@@ -10,10 +10,10 @@ import subprocess
 import shutil
 from pathlib import Path
 
-def run_command(command, cwd=None):
+def run_command(command, cwd=None, env=None):
     """Run a shell command and return the result"""
     print(f"Running: {command}")
-    result = subprocess.run(command, shell=True, cwd=cwd, capture_output=True, text=True)
+    result = subprocess.run(command, shell=True, cwd=cwd, capture_output=True, text=True, env=env)
     if result.returncode != 0:
         print(f"Error running command: {command}")
         print(f"Error output: {result.stderr}")
@@ -21,18 +21,36 @@ def run_command(command, cwd=None):
     print(f"Success: {command}")
     return True
 
+def check_pytorch_cuda():
+    """Check if PyTorch is installed with correct CUDA version"""
+    try:
+        import torch
+        print(f"PyTorch version: {torch.__version__}")
+        print(f"CUDA available: {torch.cuda.is_available()}")
+        if torch.cuda.is_available():
+            print(f"CUDA version: {torch.version.cuda}")
+            print(f"cuDNN version: {torch.backends.cudnn.version()}")
+        return True
+    except Exception as e:
+        print(f"Error checking PyTorch: {e}")
+        return False
+
 def install_torch_sparse():
     """Install torch-sparse with compatible PyTorch version"""
     print("Installing torch-sparse...")
     
-    # First, install a compatible PyTorch version
+    # First, install a compatible PyTorch version with CUDA 11.7 (as expected by PyTorch3D)
     print("Installing compatible PyTorch version...")
-    if not run_command("pip install torch==2.0.1 torchvision==0.15.2 torchaudio==2.0.2 --index-url https://download.pytorch.org/whl/cu118"):
+    if not run_command("pip install torch==2.0.1 torchvision==0.15.2 torchaudio==2.0.2 --index-url https://download.pytorch.org/whl/cu117"):
         return False
     
+    # Check PyTorch installation
+    print("Checking PyTorch installation...")
+    check_pytorch_cuda()
+    
     # Now install torch-sparse with the compatible version
     print("Installing torch-sparse with PyTorch 2.0.1...")
-    if run_command("pip install torch-sparse -f https://data.pyg.org/whl/torch-2.0.1+cu118.html"):
+    if run_command("pip install torch-sparse -f https://data.pyg.org/whl/torch-2.0.1+cu117.html"):
         print("Successfully installed torch-sparse")
         return True
     
@@ -44,7 +62,7 @@ def install_torch_scatter():
     
     # Install torch-scatter with the compatible PyTorch version
     print("Installing torch-scatter with PyTorch 2.0.1...")
-    if run_command("pip install torch-scatter -f https://data.pyg.org/whl/torch-2.0.1+cu118.html"):
+    if run_command("pip install torch-scatter -f https://data.pyg.org/whl/torch-2.0.1+cu117.html"):
         print("Successfully installed torch-scatter")
         return True
     
@@ -83,12 +101,44 @@ def install_pytorch3d():
     
     # Install PyTorch3D with CUDA support
     pytorch3d_dir = packages_dir / "pytorch3d"
-    if not run_command("FORCE_CUDA=1 pip install .", cwd=pytorch3d_dir):
-        # Try without FORCE_CUDA if it fails
-        if not run_command("pip install .", cwd=pytorch3d_dir):
-            return False
     
-    return True
+    # Check what CUDA version is available
+    print("Checking available CUDA version...")
+    cuda_check = subprocess.run("nvcc --version", shell=True, capture_output=True, text=True)
+    if cuda_check.returncode == 0:
+        print(f"CUDA version info: {cuda_check.stdout}")
+    
+    # Try different CUDA configurations
+    cuda_configs = [
+        # Try with CUDA 11.7 first (as expected by PyTorch)
+        {'CUDA_HOME': '/usr/local/cuda-11.7', 'CUDA_VERSION': '11.7'},
+        # Try with system CUDA
+        {'CUDA_HOME': '/usr/local/cuda', 'CUDA_VERSION': '12.3'},
+        # Try without specifying CUDA_HOME
+        {}
+    ]
+    
+    for i, config in enumerate(cuda_configs):
+        env = os.environ.copy()
+        env['FORCE_CUDA'] = '1'
+        if config:
+            env['CUDA_HOME'] = config['CUDA_HOME']
+            env['CUDA_VERSION'] = config['CUDA_VERSION']
+            print(f"Trying PyTorch3D installation with {config}...")
+        else:
+            print("Trying PyTorch3D installation with default CUDA...")
+        
+        if run_command("pip install .", cwd=pytorch3d_dir, env=env):
+            print(f"Successfully installed PyTorch3D with config {i+1}")
+            return True
+    
+    # If all CUDA configs fail, try without FORCE_CUDA
+    print("Trying PyTorch3D installation without FORCE_CUDA...")
+    if run_command("pip install .", cwd=pytorch3d_dir):
+        print("Successfully installed PyTorch3D without CUDA forcing")
+        return True
+    
+    return False
 
 def install_fashion_clip():
     """Setup Fashion-CLIP"""
@@ -136,8 +186,35 @@ def main():
         print("Failed to install Fashion-CLIP")
         sys.exit(1)
     
-    print("Post-installation completed successfully!")
-    print("All dependencies are now available.")
+    # Final verification
+    print("\n=== Final Verification ===")
+    print("Checking all dependencies...")
+    
+    try:
+        import torch
+        print(f"✓ PyTorch {torch.__version__} - CUDA: {torch.cuda.is_available()}")
+        
+        import torch_sparse
+        print("✓ torch-sparse")
+        
+        import torch_scatter
+        print("✓ torch-scatter")
+        
+        import nvdiffrast
+        print("✓ nvdiffrast")
+        
+        import pytorch3d
+        print("✓ PyTorch3D")
+        
+        print("\nPost-installation completed successfully!")
+        print("All dependencies are now available.")
+        
+    except ImportError as e:
+        print(f"✗ Import error: {e}")
+        sys.exit(1)
+    except Exception as e:
+        print(f"✗ Verification error: {e}")
+        sys.exit(1)
 
 if __name__ == "__main__":
     main() 

requirements.txt

@@ -1,7 +1,4 @@
-# Core dependencies - using compatible PyTorch version for HF Spaces
-torch==2.0.1
-torchvision==0.15.2
-torchaudio==2.0.2
+# Core dependencies - PyTorch will be installed by post_install.py with correct CUDA version
 clip
 imageio
 cython

test_installation.py

@@ -0,0 +1,107 @@
+#!/usr/bin/env python3
+"""
+Test script to verify all dependencies are working correctly
+"""
+
+import sys
+import traceback
+
+def test_imports():
+    """Test importing all required dependencies"""
+    print("Testing imports...")
+    
+    try:
+        import torch
+        print(f"✓ PyTorch {torch.__version__}")
+        print(f"  CUDA available: {torch.cuda.is_available()}")
+        if torch.cuda.is_available():
+            print(f"  CUDA version: {torch.version.cuda}")
+            print(f"  GPU count: {torch.cuda.device_count()}")
+    except Exception as e:
+        print(f"✗ PyTorch import failed: {e}")
+        return False
+    
+    try:
+        import torch_sparse
+        print("✓ torch-sparse")
+    except Exception as e:
+        print(f"✗ torch-sparse import failed: {e}")
+        return False
+    
+    try:
+        import torch_scatter
+        print("✓ torch-scatter")
+    except Exception as e:
+        print(f"✗ torch-scatter import failed: {e}")
+        return False
+    
+    try:
+        import nvdiffrast
+        print("✓ nvdiffrast")
+    except Exception as e:
+        print(f"✗ nvdiffrast import failed: {e}")
+        return False
+    
+    try:
+        import pytorch3d
+        print("✓ PyTorch3D")
+    except Exception as e:
+        print(f"✗ PyTorch3D import failed: {e}")
+        return False
+    
+    try:
+        import clip
+        print("✓ CLIP")
+    except Exception as e:
+        print(f"✗ CLIP import failed: {e}")
+        return False
+    
+    return True
+
+def test_basic_functionality():
+    """Test basic functionality of key components"""
+    print("\nTesting basic functionality...")
+    
+    try:
+        import torch
+        import torch_sparse
+        import torch_scatter
+        
+        # Test basic tensor operations
+        x = torch.randn(10, 10)
+        y = torch.randn(10, 10)
+        z = x + y
+        print("✓ Basic tensor operations")
+        
+        # Test sparse operations
+        indices = torch.randint(0, 10, (2, 20))
+        values = torch.randn(20)
+        sparse_tensor = torch.sparse_coo_tensor(indices, values, (10, 10))
+        print("✓ Sparse tensor creation")
+        
+    except Exception as e:
+        print(f"✗ Basic functionality test failed: {e}")
+        traceback.print_exc()
+        return False
+    
+    return True
+
+def main():
+    """Main test function"""
+    print("=== Garment3DGen Dependency Test ===\n")
+    
+    # Test imports
+    if not test_imports():
+        print("\n❌ Import tests failed!")
+        sys.exit(1)
+    
+    # Test basic functionality
+    if not test_basic_functionality():
+        print("\n❌ Functionality tests failed!")
+        sys.exit(1)
+    
+    print("\n✅ All tests passed! Dependencies are working correctly.")
+    print("The Garment3DGen application should be ready to run.")
+
+if __name__ == "__main__":
+    main()