Skip to content

Commit

Permalink
update compute
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mike-Leo-Smith
Mike-Leo-Smith committed May 22, 2024
1 parent 490051a commit 26f6ba4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
[submodule "src/compute"]
path = src/compute
url = https://github.com/LuisaGroup/LuisaCompute.git
branch = next
branch = stable
[submodule "src/ext/json"]
path = src/ext/json
url = https://github.com/nlohmann/json.git
20 changes: 1 addition & 19 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,7 @@ endif ()
option(LUISA_RENDER_BUILD_TESTS "Build tests for LuisaRender" ${LUISA_RENDER_MASTER_PROJECT})
option(LUISA_RENDER_ENABLE_UNITY_BUILD "Enable unity build to speed up compilation" OFF)

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")

get_cmake_property(LUISA_RENDERIS_MULTI_CONFIG GENERATOR_IS_MULTI_CONFIG)
if (LUISA_RENDERIS_MULTI_CONFIG)
foreach (config ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER ${config} CONFIG_UPPER)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONFIG_UPPER} "${CMAKE_BINARY_DIR}/bin/${config}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_UPPER} "${CMAKE_BINARY_DIR}/bin/${config}")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_UPPER} "${CMAKE_BINARY_DIR}/lib/${config}")
set(CMAKE_PDB_OUTPUT_DIRECTORY_${CONFIG_UPPER} "${CMAKE_BINARY_DIR}/lib/${config}")
endforeach ()
else ()
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif ()
endif ()
include(src/compute/scripts/setup_output_dirs.cmake)

# rpath
set(CMAKE_MACOSX_RPATH ON)
Expand Down
2 changes: 1 addition & 1 deletion src/compute
Submodule compute updated 89 files
+1 −2 .clangd
+6 −6 .github/workflows/build-cmake.yml
+4 −4 .github/workflows/build-wheels.yml
+1 −1 .github/workflows/build-xmake.yml
+4 −2 .vscode/settings.json.for_xmake
+1 −0 CMakeLists.txt
+6 −4 README.md
+4 −2 config/xmake_rules.lua
+1 −0 include/luisa/ast/member_reflect.inl.h
+3 −0 include/luisa/core/concepts.h
+1 −1 include/luisa/dsl/resource.h
+1 −1 include/luisa/runtime/device.h
+1 −2 include/luisa/runtime/shader.h
+1 −0 scripts/.gitignore
+0 −2 scripts/download_sdk.cmake
+53 −0 scripts/download_sdks.cmake
+4 −5 scripts/lib.lua
+0 −20 scripts/setup_compilation.cmake
+19 −0 scripts/setup_output_dirs.cmake
+29 −0 scripts/validate_options.cmake
+99 −83 scripts/xmake_func.lua
+137 −0 src/backends/common/cast.h
+4 −5 src/backends/common/hlsl/builtin/accel_process
+1 −1 src/backends/common/hlsl/builtin/accel_process.cpp
+1 −1 src/backends/common/hlsl/builtin/bc6_encode_block
+1 −1 src/backends/common/hlsl/builtin/bc6_encode_block.cpp
+1 −0 src/backends/common/hlsl/builtin/bc6_header
+1 −1 src/backends/common/hlsl/builtin/bc6_header.cpp
+1 −1 src/backends/common/hlsl/builtin/bc6_trymode_g10cs
+1 −1 src/backends/common/hlsl/builtin/bc6_trymode_g10cs.cpp
+1 −1 src/backends/common/hlsl/builtin/bc6_trymode_le10cs
+1 −1 src/backends/common/hlsl/builtin/bc6_trymode_le10cs.cpp
+1 −1 src/backends/common/hlsl/builtin/bc7_encode_block
+1 −1 src/backends/common/hlsl/builtin/bc7_encode_block.cpp
+1 −0 src/backends/common/hlsl/builtin/bc7_header
+1 −1 src/backends/common/hlsl/builtin/bc7_header.cpp
+1 −1 src/backends/common/hlsl/builtin/bc7_trymode_02cs
+1 −1 src/backends/common/hlsl/builtin/bc7_trymode_02cs.cpp
+1 −1 src/backends/common/hlsl/builtin/bc7_trymode_137cs
+1 −1 src/backends/common/hlsl/builtin/bc7_trymode_137cs.cpp
+1 −1 src/backends/common/hlsl/builtin/bc7_trymode_456cs
+1 −1 src/backends/common/hlsl/builtin/bc7_trymode_456cs.cpp
+10 −10 src/backends/common/hlsl/builtin/hlsl_builtin.hpp
+1 −1 src/backends/common/hlsl/hlsl_codegen.h
+6 −3 src/backends/common/shader_print_formatter.h
+1 −1 src/backends/common/xmake.lua
+1 −1 src/backends/cpu/xmake.lua
+1 −1 src/backends/cuda/cuda_accel.cpp
+2 −1 src/backends/cuda/cuda_codegen_ast.cpp
+7 −7 src/backends/cuda/cuda_command_encoder.cpp
+3 −2 src/backends/cuda/cuda_device.cpp
+1 −0 src/backends/cuda/extensions/cuda_dstorage.cpp
+1 −0 src/backends/cuda/optix_api.cpp
+7 −1 src/backends/dx/CMakeLists.txt
+9 −6 src/backends/dx/DXApi/LCCmdBuffer.cpp
+1 −0 src/backends/dx/DXApi/LCCmdBuffer.h
+2 −0 src/backends/dx/DXApi/ext.cpp
+2 −2 src/backends/dx/Resource/GpuAllocator.cpp
+75 −74 src/backends/dx/Resource/TopAccel.cpp
+12 −2 src/backends/dx/Resource/TopAccel.h
+2 −2 src/backends/dx/Shader/BuiltinKernel.cpp
+3 −2 src/backends/metal/metal_device.cpp
+3 −2 src/backends/metal/metal_dstorage.cpp
+1 −1 src/backends/validation/rw_resource.h
+16 −10 src/clangcxx/src/llvm/ASTConsumer.cpp
+3 −3 src/clangcxx/src/llvm/TypeDatabase.cpp
+17 −16 src/clangcxx/xmake.lua
+3 −1 src/core/dynamic_module.cpp
+1 −1 src/ext/EASTL
+1 −1 src/ext/imgui
+1 −1 src/ext/magic_enum
+1 −1 src/ext/spdlog
+10 −0 src/ext/stb/xmake.lua
+1 −1 src/ext/xxHash
+34 −4 src/py/export_runtime.cpp
+0 −0 src/pydsl_v2/luisa_dsl/__init__.py
+8 −0 src/pydsl_v2/luisa_dsl/ir.py
+2 −0 src/pydsl_v2/luisa_dsl/parse.py
+8 −9 src/runtime/byte_buffer.cpp
+1 −3 src/rust/luisa_compute_backend_impl/src/lib.rs
+1 −2 src/tests/test_copy.cpp
+58 −28 src/tests/test_denoiser.cpp
+18 −10 src/tests/test_helloworld.cpp
+6 −3 src/tests/test_texture_compress.cpp
+0 −10 src/tests/test_type.cpp
+1 −13 src/tests/xmake.lua
+1 −0 src/vstl/xmake.lua
+1 −1 src/xmake.lua
+5 −0 xmake.lua

0 comments on commit 26f6ba4

Please sign in to comment.