Skip to content

Commit

Permalink
add missing pyproject dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike-Leo-Smith committed Jan 24, 2023
1 parent cc06371 commit ba1ea85
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 54 deletions.
11 changes: 9 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
[build-system]
requires = ["pybind11", "scikit-build-core"]
requires = [
"pybind11",
"scikit-build-core",
"distlib",
"pyproject-metadata",
"pathspec"
]
build-backend = "scikit_build_core.build"

[project]
name = "luisa"
version = "0.1.4"
version = "0.1.5"
description = "A High-Performance Rendering Framework with Layered and Unified Interfaces on Stream Architectures"
readme = "README_Python_en.md"
authors = [
Expand All @@ -22,6 +28,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
]
dependencies = [
"pybind11",
"dearpygui",
"sourceinspect",
"numpy",
Expand Down
2 changes: 1 addition & 1 deletion src/ext/EASTL
2 changes: 1 addition & 1 deletion src/ext/glfw
2 changes: 1 addition & 1 deletion src/ext/xxHash
Submodule xxHash updated 2 files
+1 −1 .github/workflows/ci.yml
+143 −93 xxhash.h
53 changes: 9 additions & 44 deletions src/py/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,50 +10,15 @@ 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)
add_custom_target(lcapi-copy)
add_custom_command(TARGET lcapi-copy
DEPENDS test.py
COMMENT "Copying Python test"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_CURRENT_SOURCE_DIR}/tests/test.py"
"$<TARGET_FILE_DIR:luisa-compute-core>/test.py"
VERBATIM)
add_custom_command(TARGET lcapi-copy
DEPENDS test_sdf_render.py
COMMENT "Copying Python test"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_CURRENT_SOURCE_DIR}/tests/test_sdf_render.py"
"$<TARGET_FILE_DIR:luisa-compute-core>/test_sdf_render.py"
VERBATIM)
add_custom_command(TARGET lcapi-copy
DEPENDS test_sdf_render.py
COMMENT "Copying Python test"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_CURRENT_SOURCE_DIR}/tests/test_path_tracing.py"
"$<TARGET_FILE_DIR:luisa-compute-core>/test_path_tracing.py"
VERBATIM)
add_custom_command(TARGET lcapi-copy
DEPENDS test_sdf_render.py
COMMENT "Copying Python test"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_CURRENT_SOURCE_DIR}/tests/test_rtx.py"
"$<TARGET_FILE_DIR:luisa-compute-core>/test_rtx.py"
VERBATIM)
add_custom_command(TARGET lcapi-copy
DEPENDS test_sdf_render.py
COMMENT "Copying Python test"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_CURRENT_SOURCE_DIR}/tests/cornell_box.py"
"$<TARGET_FILE_DIR:luisa-compute-core>/cornell_box.py"
VERBATIM)
add_custom_command(TARGET lcapi-copy
DEPENDS luisa
COMMENT "Copying Python package"
COMMAND ${CMAKE_COMMAND} -E copy_directory
"${CMAKE_CURRENT_SOURCE_DIR}/luisa"
"$<TARGET_FILE_DIR:luisa-compute-core>/luisa"
VERBATIM)
add_dependencies(lcapi-copy lcapi)
#add_custom_target(lcapi-copy ALL)
#add_custom_command(TARGET lcapi-copy
# DEPENDS luisa
# COMMENT "Copying Python package"
# COMMAND ${CMAKE_COMMAND} -E copy_directory
# "${CMAKE_CURRENT_SOURCE_DIR}/luisa"
# "$<TARGET_FILE_DIR:luisa-compute-core>/luisa"
# VERBATIM)
#add_dependencies(lcapi-copy lcapi)

file(GLOB PYTHONSRC "${CMAKE_CURRENT_SOURCE_DIR}/luisa/*"
LIST_DIRECTORIES false)
Expand Down

0 comments on commit ba1ea85

Please sign in to comment.