Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/core/cloudxr/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ if(NOT EXISTS "${CLOUDXR_SDK_PATH}")
endif()

set(CLOUDXR_NATIVE_AVAILABLE FALSE)
# Always create native dir for uniform package structure, even if the SDK tarball is not available
set(CLOUDXR_NATIVE_DIR "${CLOUDXR_PYTHON_DIR}/native")
add_custom_target(cloudxr_native_dir ALL
COMMAND ${CMAKE_COMMAND} -E make_directory "${CLOUDXR_NATIVE_DIR}"
COMMENT "Creating python_package/.../cloudxr/native/"
)
if(NOT EXISTS "${CLOUDXR_SDK_PATH}")
set(error_message "CloudXR SDK tarball is required. Place ${CLOUDXR_SDK_FILE} in "
"deps/cloudxr/ or run scripts/download_cloudxr_runtime_sdk.sh.")
Expand All @@ -67,15 +73,12 @@ if(NOT EXISTS "${CLOUDXR_SDK_PATH}")
endif()
else()
set(CLOUDXR_NATIVE_AVAILABLE TRUE)
set(CLOUDXR_NATIVE_DIR "${CLOUDXR_PYTHON_DIR}/native")
add_custom_target(cloudxr_native_dir ALL
COMMAND ${CMAKE_COMMAND} -E make_directory "${CLOUDXR_NATIVE_DIR}"
COMMENT "Creating python_package/.../cloudxr/native/"
)
add_custom_target(cloudxr_native_bundle ALL
COMMAND ${CMAKE_COMMAND} -E tar xzf "${CLOUDXR_SDK_PATH}"
COMMAND ${CMAKE_COMMAND} -E rm -rf "${CLOUDXR_NATIVE_DIR}/include"
COMMAND ${CMAKE_COMMAND} -E rm -rf "${CLOUDXR_NATIVE_DIR}/plugins"
WORKING_DIRECTORY "${CLOUDXR_NATIVE_DIR}"
COMMENT "Extracting CloudXR SDK tarball into python_package/.../cloudxr/native/"
COMMENT "Extracting CloudXR SDK tarball and keeping runtime core files (no plugins) in python_package/.../cloudxr/native/"
)
add_dependencies(cloudxr_native_bundle cloudxr_native_dir)

Expand Down Expand Up @@ -117,4 +120,6 @@ if(CLOUDXR_NATIVE_AVAILABLE)
else()
add_dependencies(cloudxr_python cloudxr_native_bundle)
endif()
else()
add_dependencies(cloudxr_python cloudxr_native_dir)
endif()
1 change: 1 addition & 0 deletions src/core/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ add_custom_target(python_package ALL
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/pyproject.toml" "${CMAKE_BINARY_DIR}/python_package/$<CONFIG>/"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/MANIFEST.in" "${CMAKE_BINARY_DIR}/python_package/$<CONFIG>/"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" "${CMAKE_BINARY_DIR}/python_package/$<CONFIG>/"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/README.md" "${CMAKE_BINARY_DIR}/python_package/$<CONFIG>/README.md"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt" "${CMAKE_BINARY_DIR}/python_package/$<CONFIG>/"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/requirements-dev.txt" "${CMAKE_BINARY_DIR}/python_package/$<CONFIG>/"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/requirements-ui.txt" "${CMAKE_BINARY_DIR}/python_package/$<CONFIG>/"
Expand Down
30 changes: 1 addition & 29 deletions src/core/python/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,29 +1 @@
include isaacteleop/*.so
include isaacteleop/*.pyd
include isaacteleop/*.pyi
include isaacteleop/py.typed
include isaacteleop/deviceio/*.so
include isaacteleop/deviceio/*.pyd
include isaacteleop/deviceio/*.pyi
include isaacteleop/oxr/*.so
include isaacteleop/oxr/*.pyd
include isaacteleop/oxr/*.pyi
include isaacteleop/plugin_manager/*.so
include isaacteleop/plugin_manager/*.pyd
include isaacteleop/plugin_manager/*.pyi
include isaacteleop/schema/*.so
include isaacteleop/schema/*.pyd
include isaacteleop/schema/*.pyi
include isaacteleop/retargeting_engine/*.py
include isaacteleop/retargeting_engine/interface/*.py
include isaacteleop/retargeting_engine/tensor_types/*.py
include isaacteleop/retargeting_engine/deviceio_source_nodes/*.py
include isaacteleop/retargeting_engine/retargeters/*.py
include isaacteleop/retargeting_engine/retargeters/G1/*.py
include isaacteleop/retargeting_engine/utilities/*.py
include isaacteleop/retargeting_engine_ui/*.py
include isaacteleop/teleop_session_manager/*.py
include isaacteleop/cloudxr/*.py
include isaacteleop/cloudxr/native/*.so
include isaacteleop/cloudxr/native/*.so.*
include isaacteleop/cloudxr/native/openxr_cloudxr.json
include README.md
Comment thread
aristarkhovNV marked this conversation as resolved.
7 changes: 4 additions & 3 deletions src/core/python/pyproject.toml.in
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@ packages = [
"isaacteleop.retargeting_engine.interface",
"isaacteleop.retargeting_engine.tensor_types",
"isaacteleop.retargeting_engine.deviceio_source_nodes",
"isaacteleop.retargeting_engine.utilities",
"isaacteleop.retargeters",
"isaacteleop.retargeters.G1",
"isaacteleop.retargeting_engine_ui",
"isaacteleop.teleop_session_manager",
"isaacteleop.cloudxr"
"isaacteleop.cloudxr",
]
Comment thread
aristarkhovNV marked this conversation as resolved.
include-package-data = true
include-package-data = false

[tool.setuptools.package-data]
isaacteleop = ["*.so", "*.pyd", "*.pyi", "py.typed"]
Expand All @@ -63,7 +64,7 @@ isaacteleop = ["*.so", "*.pyd", "*.pyi", "py.typed"]
"isaacteleop.oxr" = ["*.so", "*.pyd", "*.pyi"]
"isaacteleop.plugin_manager" = ["*.so", "*.pyd", "*.pyi"]
"isaacteleop.schema" = ["*.so", "*.pyd", "*.pyi"]
"isaacteleop.cloudxr" = ["*.py", "native/*.so", "native/*.so.*", "native/openxr_cloudxr.json"]
"isaacteleop.cloudxr" = ["native/*.so", "native/*.so.*", "native/openxr_cloudxr.json"]

[tool.uv]
# Only use managed Python installations (not system Python)
Expand Down
Loading