switch setup-10

Dockerfile

@@ -28,17 +28,22 @@ RUN python3 -m pip install --upgrade pip && \
     python3 -m pip install \
         torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118
 
-# Build and install diffvg with Python 3.11 compatibility
-RUN git clone --depth 1 --recursive https://github.com/BachiLi/diffvg.git /tmp/diffvg \
- && rm -rf /tmp/diffvg/pybind11 \
- && git clone --depth 1 --branch v2.12.1 https://github.com/pybind/pybind11.git /tmp/diffvg/pybind11 \
- && sed -i 's/^\s*cmake_minimum_required(VERSION .*$/cmake_minimum_required(VERSION 3.5)/' /tmp/diffvg/pybind11/CMakeLists.txt \
- && mkdir /tmp/diffvg/build && cd /tmp/diffvg/build \
- && cmake .. \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_CXX_STANDARD=14 \
-      -DDIFFVG_CUDA=0 \
- && make -j$(nproc) \
- && cd /tmp/diffvg && python3 setup.py install \
- && rm -rf /tmp/diffvg
+RUN \
+    # Clone diffvg recursively so we get the thrust submodule too
+    git clone --depth 1 --recursive https://github.com/BachiLi/diffvg.git /tmp/diffvg && \
+    cd /tmp/diffvg && \
+    # Replace bundled pybind11 with the released v2.12.1
+    rm -rf pybind11 && \
+    git clone --depth 1 --branch v2.12.1 https://github.com/pybind/pybind11.git pybind11 && \
+    sed -i 's/^\s*cmake_minimum_required(VERSION .*$/cmake_minimum_required(VERSION 3.5)/' pybind11/CMakeLists.txt && \
+    # Configure & build without CUDA
+    mkdir build && cd build && \
+    cmake .. \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_CXX_STANDARD=14 \
+        -DDIFFVG_CUDA=0 && \
+    make -j$(nproc) && \
+    # Install and clean up
+    cd /tmp/diffvg && python3 setup.py install && \
+    rm -rf /tmp/diffvg