Merge branch 'next' of github.com:LuisaGroup/LuisaCompute into next

LuisaGroup · Jul 27, 2023 · cda373d · cda373d
2 parents 12e08cf + ebcaf1e
commit cda373d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/include/luisa/core/dll_export.h b/include/luisa/core/dll_export.h
@@ -64,7 +64,6 @@
 #define LC_TENSOR_API __declspec(dllimport)
 #endif
 
-
 #ifdef LC_OSL_EXPORT_DLL
 #define LC_OSL_API __declspec(dllexport)
 #else
@@ -101,6 +100,7 @@
 #define LC_AST_API
 #define LC_RUNTIME_API
 #define LC_DSL_API
+#define LC_TENSOR_API
 #define LC_OSL_API
 #define LC_IR_API
 #define LC_SERDE_LIB_API

diff --git a/include/luisa/tensor/tensor.h b/include/luisa/tensor/tensor.h
@@ -1,4 +1,5 @@
 #pragma
+#include <luisa/core/dll_export.h>
 #include <luisa/core/stl/memory.h>
 #include <luisa/dsl/syntax.h>
 namespace luisa::compute::tensor {

diff --git a/src/py/CMakeLists.txt b/src/py/CMakeLists.txt
@@ -24,7 +24,6 @@ if (WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     target_compile_options(lcapi PRIVATE -Wa,-mbig-obj)
 endif ()
 target_link_libraries(lcapi PRIVATE luisa::compute)
-
 target_precompile_headers(lcapi PRIVATE pch.h)
 
 install(DIRECTORY luisa

diff --git a/src/tests/test_binding_group.cpp b/src/tests/test_binding_group.cpp
@@ -38,7 +38,7 @@ LUISA_BINDING_GROUP_TEMPLATE(TEMPLATE_T, TArgumentsView<T>, image, resolution) {
 };
 LUISA_BINDING_GROUP_TEMPLATE(TEMPLATE_T, TNestedArguments<T>, args, image) {
     void blit(const UInt2 &coord) noexcept {
-        auto color = args.image.read(coord).xyz();
+        auto color = this->args.image.read(coord).xyz();
         this->image->write(coord, make_float4(1.f - color, 1.f));
     }
 };

diff --git a/src/vstl/CMakeLists.txt b/src/vstl/CMakeLists.txt
@@ -25,4 +25,4 @@ else ()
 endif ()
 
 luisa_compute_install(vstl SOURCES ${LUISA_COMPUTE_VSTL_SOURCES})
-target_precompile_headers(luisa-compute-vstl PRIVATE pch.h)
+target_precompile_headers(luisa-compute-vstl PRIVATE pch.h)