fix build

LuisaGroup · Mar 25, 2024 · c5ac28f · c5ac28f
1 parent 66049e0
commit c5ac28f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/include/luisa/core/fiber.h b/include/luisa/core/fiber.h
@@ -91,7 +91,7 @@ class future {
 public:
     future() noexcept : _future{sizeof(T)} {}
     [[nodiscard]] T &wait() noexcept {
-        return *reinterpret_cast<T *>(_future.wait());
+        return *static_cast<T *>(_future.wait());
     }
     template<typename... Args>
         requires(std::is_constructible_v<T, Args && ...>)
@@ -104,7 +104,7 @@ class future {
                 reinterpret_cast<T *>(ptr)->~T();
             });
     }
-    [[nodiscard]] bool test() const noexcept { _future.test(); }
+    [[nodiscard]] bool test() const noexcept { return _future.test(); }
     void clear() const noexcept { _future.clear(); }
 private:
     detail::typeless_future _future;

diff --git a/src/ext/CMakeLists.txt b/src/ext/CMakeLists.txt
@@ -152,12 +152,6 @@ target_include_directories(half INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOUR
 target_link_libraries(luisa-compute-ext INTERFACE half)
 luisa_compute_install_extension(half HEADER_FILES half/include/half.hpp)
 
-add_subdirectory(marl)
-set_target_properties(marl PROPERTIES OUTPUT_NAME lc-ext-marl)
-target_link_libraries(marl PUBLIC EASTL)
-target_link_libraries(luisa-compute-ext INTERFACE marl)
-luisa_compute_install_extension(marl INCLUDE marl/include/marl)
-
 # reproc
 set(REPROC_DEVELOP OFF CACHE BOOL "" FORCE)
 set(REPROC_TEST OFF CACHE BOOL "" FORCE)
@@ -207,6 +201,13 @@ if (SKBUILD OR LUISA_COMPUTE_FORCE_PYTHON_BINDINGS)
     add_subdirectory(pybind11)
 endif ()
 
+set(BUILD_SHARED_LIBS OFF) # Maxwell has exploded marl with shared libraries
+add_subdirectory(marl)
+set_target_properties(marl PROPERTIES OUTPUT_NAME lc-ext-marl)
+target_link_libraries(marl PUBLIC EASTL)
+target_link_libraries(luisa-compute-ext INTERFACE marl)
+luisa_compute_install_extension(marl INCLUDE marl/include/marl)
+
 install(TARGETS luisa-compute-ext EXPORT LuisaComputeTargets)
 
 # for rust bindings