Fix some bugs.

README.md

@@ -15,5 +15,5 @@ Official demo for **[CityDreamer: Compositional Generative Model of Unbounded 3D
 - 🤗 Try CityDreamer to generate photolistic 3D cities.
 - ⚠️ Due to the limited computational resources at Hugging Face, this demo only generates **A SINGLE IMAGE** based on the New York City layout. If you wish to experience more comprehensive functionality, please visit the demo on [GitHub](https://github.com/hzxie/city-dreamer?tab=readme-ov-file#iterative-demo-%EF%B8%8F).
 
-❕IMPORTANT NOTE: We are working on migrating to ZeroGPU, so the demo might be temporarily unavailable.
+<p style="color:red">❕IMPORTANT NOTE: The HF team and we are currently working on migrating to ZeroGPU, so the demo may be temporarily unavailable.</p>
 

app.py

@@ -4,7 +4,7 @@
 # @Author: Haozhe Xie
 # @Date:   2024-03-02 16:30:00
 # @Last Modified by: Haozhe Xie
-# @Last Modified at: 2024-09-22 10:31:28
+# @Last Modified at: 2024-09-22 15:23:37
 # @Email:  [email protected]
 
 import gradio as gr
@@ -36,23 +36,43 @@ def _get_output(cmd):
     return None
 
 
+def install_cuda_toolkit():
+    # CUDA_TOOLKIT_URL = "https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run"
+    CUDA_TOOLKIT_URL = "https://developer.download.nvidia.com/compute/cuda/12.2.0/local_installers/cuda_12.2.0_535.54.03_linux.run"
+    CUDA_TOOLKIT_FILE = "/tmp/%s" % os.path.basename(CUDA_TOOLKIT_URL)
+    subprocess.call(["wget", "-q", CUDA_TOOLKIT_URL, "-O", CUDA_TOOLKIT_FILE])
+    subprocess.call(["chmod", "+x", CUDA_TOOLKIT_FILE])
+    subprocess.call([CUDA_TOOLKIT_FILE, "--silent", "--toolkit"])
+    
+    os.environ["CUDA_HOME"] = "/usr/local/cuda"
+    os.environ["PATH"] = "%s/bin:%s" % (os.environ["CUDA_HOME"], os.environ["PATH"])
+    os.environ["LD_LIBRARY_PATH"] = "%s/lib:%s" % (
+        os.environ["CUDA_HOME"],
+        "" if "LD_LIBRARY_PATH" not in os.environ else os.environ["LD_LIBRARY_PATH"],
+    )
+    # Fix: arch_list[-1] += '+PTX'; IndexError: list index out of range
+    os.environ["TORCH_CUDA_ARCH_LIST"] = "8.0;8.6"
+
+
 def setup_runtime_env():
     logging.info("Python Version: %s" % _get_output(["python", "--version"]))
     logging.info("CUDA Version: %s" % _get_output(["nvcc", "--version"]))
     logging.info("GCC Version: %s" % _get_output(["gcc", "--version"]))
+    logging.info("CUDA is available: %s" % torch.cuda.is_available())
+    logging.info("CUDA Device Capability: %s" % (torch.cuda.get_device_capability(),))
 
     # Install Pre-compiled CUDA extensions
-    ext_dir = os.path.join(os.path.dirname(__file__), "wheels")
-    for e in os.listdir(ext_dir):
-        logging.info("Installing Extensions from %s" % e)
-        subprocess.call(
-            ["pip", "install", os.path.join(ext_dir, e)], stderr=subprocess.STDOUT
-        )
-    # Compile CUDA extensions
-    # ext_dir = os.path.join(os.path.dirname(__file__), "citydreamer", "extensions")
+    # ext_dir = os.path.join(os.path.dirname(__file__), "wheels")
     # for e in os.listdir(ext_dir):
-    #     if os.path.isdir(os.path.join(ext_dir, e)):
-    #         subprocess.call(["pip", "install", "."], cwd=os.path.join(ext_dir, e))
+    #     logging.info("Installing Extensions from %s" % e)
+    #     subprocess.call(
+    #         ["pip", "install", os.path.join(ext_dir, e)], stderr=subprocess.STDOUT
+    #     )
+    # Compile CUDA extensions
+    ext_dir = os.path.join(os.path.dirname(__file__), "citydreamer", "extensions")
+    for e in os.listdir(ext_dir):
+        if os.path.isdir(os.path.join(ext_dir, e)):
+            subprocess.call(["pip", "install", "."], cwd=os.path.join(ext_dir, e))
 
     logging.info("Installed Python Packages: %s" % _get_output(["pip", "list"]))
 
@@ -134,6 +154,12 @@ if __name__ == "__main__":
     logging.basicConfig(
         format="[%(levelname)s] %(asctime)s %(message)s", level=logging.INFO
     )
+    if _get_output(["nvcc", "--version"]) is None:
+        logging.info("Installing CUDA toolkit...")
+        install_cuda_toolkit()
+    else:
+        logging.info("Detected CUDA: %s" % _get_output(["nvcc", "--version"]))
+
     logging.info("Compiling CUDA extensions...")
     setup_runtime_env()
 

build-cuda-ext.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# @File:   build-cuda-ext.sh
-# @Author: Haozhe Xie
-# @Date:   2024-09-22 10:43:34
-# @Last Modified by: Haozhe Xie
-# @Last Modified at: 2024-09-22 10:46:29
-# @Email:  [email protected]
-
-SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
-EXTENSIONS_DIR="$SCRIPT_DIR/citydreamer/extensions"
-WHEELS_DIR="$SCRIPT_DIR/wheels"
-
-mkdir -p "$WHEELS_DIR"
-
-for dir in "$EXTENSIONS_DIR"/*/; do
-  if [ -d "$dir" ]; then
-    echo "Processing $dir"
-    (cd "$dir" && pip wheel .)
-    mv "$dir"*.whl "$WHEELS_DIR"
-  fi
-done

citydreamer/extensions/extrude_tensor/setup.py

@@ -4,22 +4,26 @@
 # @Author: Haozhe Xie
 # @Date:   2023-03-24 20:35:43
 # @Last Modified by: Haozhe Xie
-# @Last Modified at: 2023-04-29 10:47:30
+# @Last Modified at: 2024-09-22 11:05:34
 # @Email:  [email protected]
 
 from setuptools import setup
 from torch.utils.cpp_extension import BuildExtension, CUDAExtension
 
+cxx_args = []
+nvcc_args = ["-O3", "--gpu-architecture=compute_86", "--gpu-code=sm_86,compute_86"]
+
 setup(
     name="extrude_tensor",
     version="1.0.0",
     ext_modules=[
         CUDAExtension(
             "extrude_tensor_ext",
-            [
+            sources=[
                 "bindings.cpp",
                 "extrude_tensor_ext.cu",
             ],
+            extra_compile_args={"cxx": cxx_args, "nvcc": nvcc_args},
         ),
     ],
     cmdclass={"build_ext": BuildExtension},

citydreamer/extensions/grid_encoder/setup.py

@@ -4,13 +4,22 @@
 # @Author: Jiaxiang Tang (@ashawkey)
 # @Date:   2023-04-15 10:33:32
 # @Last Modified by: Haozhe Xie
-# @Last Modified at: 2023-04-29 10:47:10
+# @Last Modified at: 2024-09-22 11:00:03
 # @Email:  [email protected]
 # @Ref: https://github.com/ashawkey/torch-ngp
 
 from setuptools import setup
 from torch.utils.cpp_extension import BuildExtension, CUDAExtension
 
+cxx_args = ["-O3", "-std=c++17"]
+nvcc_args = [
+    "-O3",
+    "-std=c++17",
+    "-U__CUDA_NO_HALF_OPERATORS__",
+    "-U__CUDA_NO_HALF_CONVERSIONS__",
+    "-U__CUDA_NO_HALF2_OPERATORS__",
+]
+
 setup(
     name="grid_encoder",
     version="1.0.0",
@@ -22,14 +31,8 @@ setup(
                 "bindings.cpp",
             ],
             extra_compile_args={
-                "cxx": ["-O3", "-std=c++17"],
-                "nvcc": [
-                    "-O3",
-                    "-std=c++17",
-                    "-U__CUDA_NO_HALF_OPERATORS__",
-                    "-U__CUDA_NO_HALF_CONVERSIONS__",
-                    "-U__CUDA_NO_HALF2_OPERATORS__",
-                ],
+                "cxx": cxx_args,
+                "nvcc": nvcc_args,
             },
         ),
     ],

wheels/extrude_tensor-1.0.0-cp310-cp310-linux_x86_64.whl

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c7e143d972796e4092b874de35bcca064885539352cfd9d3c652ad3a7a9ca40
-size 237842

wheels/grid_encoder-1.0.0-cp310-cp310-linux_x86_64.whl

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7de95ace4abdb055a0326538854eb1ce173440ac2b0be5fce1d4cfa81522ebc1
-size 2345063

wheels/voxrender-1.0.0-cp310-cp310-linux_x86_64.whl

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e56e7d57812d7778339e64b8bc2e14ea52eb37dead72c290650a163371a0cd4c
-size 593569