Merge remote-tracking branch 'origin/dev-fallback-backend' into dev-xir

LuisaGroup · Nov 25, 2024 · d8436d6 · d8436d6
2 parents bb2886c + 070e3d7
commit d8436d6
Show file tree

Hide file tree

Showing 72 changed files with 26,043 additions and 10,898 deletions.
diff --git a/.github/workflows/build-xmake.yml b/.github/workflows/build-xmake.yml
@@ -55,15 +55,20 @@ jobs:
           submodules: recursive
       - name: "Install Dependencies"
         run: |
-          brew install llvm molten-vk ninja cmake xmake
+          if [ "${{ matrix.compiler }}" = "homebrew-clang" ]; then
+            brew install llvm
+          fi
+          brew install molten-vk ninja cmake xmake
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
       - name: "Configure and Build"
         run: |
+          xmake lua setup.lua
           if [ "${{ matrix.compiler }}" = "homebrew-clang" ]; then
             export PATH=/usr/local/opt/llvm/bin:$PATH
+            xmake f -p macosx --toolchain=llvm -m ${{ matrix.config }} --mm=clang --mxx=clang++ --metal_backend=true --enable_dsl=true --enable_gui=true --enable_unity_build=false --enable_tests=true --enable_mimalloc=false --check -c -y
+          else
+            xmake f -p macosx --toolchain=clang -m ${{ matrix.config }} --mm=clang --mxx=clang++ --metal_backend=true --enable_dsl=true --enable_gui=true --enable_unity_build=false --enable_tests=true --enable_mimalloc=false --check -c -y
           fi
-          xmake lua setup.lua
-          xmake f -p macosx --toolchain=llvm -m ${{ matrix.config }} --mm=clang --mxx=clang++ --metal_backend=true --enable_dsl=true --enable_gui=true --enable_unity_build=false --enable_tests=true --enable_mimalloc=false --check -c -y
           xmake -v
 
   build-windows:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,12 +29,13 @@ if (NOT SKBUILD AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.cmake")
 else ()
     option(LUISA_COMPUTE_ENABLE_DSL "Enable C++ DSL" ON)
     option(LUISA_COMPUTE_ENABLE_TENSOR "Enable C++ DSL tensor extension" ON)
-    option(LUISA_COMPUTE_ENABLE_DX "Enable DirectX backend" ON)
-    option(LUISA_COMPUTE_ENABLE_METAL "Enable Metal backend" ON)
+    option(LUISA_COMPUTE_ENABLE_DX "Enable DirectX backend" OFF)
+    option(LUISA_COMPUTE_ENABLE_METAL "Enable Metal backend" OFF)
     option(LUISA_COMPUTE_ENABLE_CUDA "Enable CUDA backend" ON)
     option(LUISA_COMPUTE_ENABLE_CUDA_EXT_LCUB "Enable CUDA extension: LCUB" OFF)
-    option(LUISA_COMPUTE_ENABLE_VULKAN "Enable Vulkan backend" ON)
-    option(LUISA_COMPUTE_ENABLE_CPU "Enable CPU backend" ON)
+    option(LUISA_COMPUTE_ENABLE_VULKAN "Enable Vulkan backend" OFF)
+    option(LUISA_COMPUTE_ENABLE_CPU "Enable CPU backend" OFF)
+    option(LUISA_COMPUTE_ENABLE_FALLBACK "Enable Fallback backend" ON)
     option(LUISA_COMPUTE_ENABLE_REMOTE "Enable Remote backend" ON)
     option(LUISA_COMPUTE_ENABLE_GUI "Enable GUI support" ON)
     option(LUISA_COMPUTE_ENABLE_CLANG_CXX "Enable ClangTooling-based C++ shading language" OFF)