Skip to content

Commit

Permalink
Temporarily remove nvrtc and nvrtc-builtins from install
Browse files Browse the repository at this point in the history
  • Loading branch information
lilleyse committed Oct 2, 2023
1 parent a061ccc commit ea25a85
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
30 changes: 15 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -603,21 +603,21 @@ install(
COMPONENT library
EXCLUDE_FROM_ALL)

# Nothing links against nvrtc-builtins but if we don't include it we get a runtime crash.
# Unfortunately this means we have to bypass CMake's dependency system and install it manually here.
if(WIN32)
install(
FILES "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/bin/nvrtc-builtins64_118.dll"
DESTINATION "${KIT_EXTENSION_BIN_PATH}"
COMPONENT install)
else()
install(
FILES "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/lib64/libnvrtc-builtins.so"
"${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/lib64/libnvrtc-builtins.so.11.8"
"${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/lib64/libnvrtc-builtins.so.11.8.89"
DESTINATION "${KIT_EXTENSION_BIN_PATH}"
COMPONENT install)
endif()
# # Nothing links against nvrtc-builtins but if we don't include it we get a runtime crash.
# # Unfortunately this means we have to bypass CMake's dependency system and install it manually here.
# if(WIN32)
# install(
# FILES "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/bin/nvrtc-builtins64_118.dll"
# DESTINATION "${KIT_EXTENSION_BIN_PATH}"
# COMPONENT install)
# else()
# install(
# FILES "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/lib64/libnvrtc-builtins.so"
# "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/lib64/libnvrtc-builtins.so.11.8"
# "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/lib64/libnvrtc-builtins.so.11.8.89"
# DESTINATION "${KIT_EXTENSION_BIN_PATH}"
# COMPONENT install)
# endif()

install(
TARGETS CesiumOmniversePythonBindings
Expand Down
8 changes: 4 additions & 4 deletions exts/cesium.omniverse/config/extension.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ archiveDirs = ["vendor"]
[[native.plugin]]
path = "bin/cesium.omniverse.plugin"

[[native.library]]
"filter:platform"."windows-x86_64"."path" = "bin/${lib_prefix}nvrtc-builtins64_118${lib_ext}"
# [[native.library]]
# "filter:platform"."windows-x86_64"."path" = "bin/${lib_prefix}nvrtc-builtins64_118${lib_ext}"

[[native.library]]
"filter:platform"."linux-x86_64"."path" = "bin/${lib_prefix}nvrtc-builtins${lib_ext}"
# [[native.library]]
# "filter:platform"."linux-x86_64"."path" = "bin/${lib_prefix}nvrtc-builtins${lib_ext}"

[settings]
exts."cesium.omniverse".defaultAccessToken = ""
Expand Down
2 changes: 1 addition & 1 deletion src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ setup_lib(
omni_kit
omni_ui
cuda
nvrtc
# nvrtc
pybind11
python310
ADDITIONAL_LIBRARIES
Expand Down

0 comments on commit ea25a85

Please sign in to comment.