Upload 3 files

app.py

@@ -21,25 +21,11 @@ if os.path.exists(packages_dir):
 def check_complex_dependencies():
     """Check if complex dependencies are available"""
     try:
+        import torch_sparse
+        import torch_scatter
         import nvdiffrast
         import pytorch3d
-        # Check torch_sparse and torch_scatter separately as they might not be available
-        try:
-            import torch_sparse
-            import torch_scatter
-            return True
-        except ImportError:
-            # If torch_sparse/scatter not available, check if the code is configured to work without them
-            try:
-                with open("NeuralJacobianFields/PoissonSystem.py", 'r') as f:
-                    content = f.read()
-                if "USE_TORCH_SPARSE = False" in content:
-                    print("torch-sparse not available but code is configured to work without it")
-                    return True
-                else:
-                    return False
-            except:
-                return False
+        return True
     except ImportError:
         return False
 

post_install.py

@@ -22,80 +22,33 @@ def run_command(command, cwd=None):
     return True
 
 def install_torch_sparse():
-    """Install torch-sparse with the current PyTorch version"""
+    """Install torch-sparse with compatible PyTorch version"""
     print("Installing torch-sparse...")
     
-    # Get current PyTorch version
-    try:
-        import torch
-        torch_version = torch.__version__
-        print(f"Current PyTorch version: {torch_version}")
-        
-        # Extract major.minor version
-        version_parts = torch_version.split('.')
-        torch_major_minor = f"{version_parts[0]}.{version_parts[1]}"
-        
-        # Check CUDA version
-        cuda_version = "cu126"  # Default for PyTorch 2.7.1
-        if "+cu" in torch_version:
-            cuda_version = torch_version.split("+")[1]
-        
-        print(f"Detected CUDA version: {cuda_version}")
-        
-        # Try different CUDA versions for torch-sparse
-        cuda_versions_to_try = [cuda_version, "cu121", "cu118", "cu117"]
-        
-        for cuda_ver in cuda_versions_to_try:
-            print(f"Trying torch-sparse with CUDA {cuda_ver}...")
-            if run_command(f"pip install torch-sparse -f https://data.pyg.org/whl/torch-{torch_major_minor}+{cuda_ver}.html"):
-                print(f"Successfully installed torch-sparse with CUDA {cuda_ver}")
-                return True
-        
-        # If all pre-built wheels fail, try from source
-        print("All pre-built wheels failed, trying from source...")
-        if run_command("pip install torch-sparse"):
-            return True
-        
-        return False
-    except Exception as e:
-        print(f"Error installing torch-sparse: {e}")
+    # First, install a compatible PyTorch version
+    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"):
         return False
+    
+    # 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"):
+        print("Successfully installed torch-sparse")
+        return True
+    
+    return False
 
 def install_torch_scatter():
-    """Install torch-scatter with the current PyTorch version"""
+    """Install torch-scatter with compatible PyTorch version"""
     print("Installing torch-scatter...")
     
-    try:
-        import torch
-        torch_version = torch.__version__
-        version_parts = torch_version.split('.')
-        torch_major_minor = f"{version_parts[0]}.{version_parts[1]}"
-        
-        # Check CUDA version
-        cuda_version = "cu126"  # Default for PyTorch 2.7.1
-        if "+cu" in torch_version:
-            cuda_version = torch_version.split("+")[1]
-        
-        print(f"Detected CUDA version: {cuda_version}")
-        
-        # Try different CUDA versions for torch-scatter
-        cuda_versions_to_try = [cuda_version, "cu121", "cu118", "cu117"]
-        
-        for cuda_ver in cuda_versions_to_try:
-            print(f"Trying torch-scatter with CUDA {cuda_ver}...")
-            if run_command(f"pip install torch-scatter -f https://data.pyg.org/whl/torch-{torch_major_minor}+{cuda_ver}.html"):
-                print(f"Successfully installed torch-scatter with CUDA {cuda_ver}")
-                return True
-        
-        # If all pre-built wheels fail, try from source
-        print("All pre-built wheels failed, trying from source...")
-        if run_command("pip install torch-scatter"):
-            return True
-        
-        return False
-    except Exception as e:
-        print(f"Error installing torch-scatter: {e}")
-        return False
+    # 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"):
+        print("Successfully installed torch-scatter")
+        return True
+    
+    return False
 
 def install_nvdiffrast():
     """Install nvdiffrast"""
@@ -131,7 +84,9 @@ 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):
-        return False
+        # Try without FORCE_CUDA if it fails
+        if not run_command("pip install .", cwd=pytorch3d_dir):
+            return False
     
     return True
 
@@ -161,15 +116,13 @@ def main():
     print("Starting post-installation for Garment3DGen...")
     
     # Install complex dependencies
-    torch_sparse_success = install_torch_sparse()
-    if not torch_sparse_success:
-        print("Warning: Failed to install torch-sparse, will use PyTorch's built-in sparse operations")
-        # Disable torch-sparse in the code
-        disable_torch_sparse()
+    if not install_torch_sparse():
+        print("Failed to install torch-sparse")
+        sys.exit(1)
     
-    torch_scatter_success = install_torch_scatter()
-    if not torch_scatter_success:
-        print("Warning: Failed to install torch-scatter")
+    if not install_torch_scatter():
+        print("Failed to install torch-scatter")
+        sys.exit(1)
     
     if not install_nvdiffrast():
         print("Failed to install nvdiffrast")
@@ -184,28 +137,7 @@ def main():
         sys.exit(1)
     
     print("Post-installation completed successfully!")
-    if not torch_sparse_success:
-        print("Note: Using PyTorch's built-in sparse operations instead of torch-sparse")
     print("All dependencies are now available.")
 
-def disable_torch_sparse():
-    """Disable torch-sparse in the code by modifying the configuration"""
-    try:
-        # Modify the PoissonSystem.py to disable torch-sparse
-        poisson_file = "NeuralJacobianFields/PoissonSystem.py"
-        if os.path.exists(poisson_file):
-            with open(poisson_file, 'r') as f:
-                content = f.read()
-            
-            # Replace USE_TORCH_SPARSE = True with False
-            content = content.replace("USE_TORCH_SPARSE = True", "USE_TORCH_SPARSE = False")
-            
-            with open(poisson_file, 'w') as f:
-                f.write(content)
-            
-            print("Disabled torch-sparse in NeuralJacobianFields/PoissonSystem.py")
-    except Exception as e:
-        print(f"Warning: Could not disable torch-sparse: {e}")
-
 if __name__ == "__main__":
     main() 

requirements.txt

@@ -1,5 +1,7 @@
-# Core dependencies - compatible with HF Spaces PyTorch 2.7.1
-# PyTorch will be installed by HF Spaces automatically
+# Core dependencies - using compatible PyTorch version for HF Spaces
+torch==2.0.1
+torchvision==0.15.2
+torchaudio==2.0.2
 clip
 imageio
 cython