Skip to content

Commit 5077875

Browse files
committed
Apply patch
1 parent fdb7f61 commit 5077875

24 files changed

Lines changed: 84 additions & 35 deletions

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
*.cmd text eol=crlf
99
# Make sure shell scripts have LF line endings, even when checked out on a Windows client with autocrlf=true
1010
*.sh text eol=lf
11+
*.whl filter=lfs diff=lfs merge=lfs -text

apps/omni.app.base.kit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ support_level = "Sample"
7171

7272
# Dev & Utils Windows
7373
"omni.kit.window.about" = {}
74-
"omni.kit.window.privacy" = {}
7574
"omni.kit.window.stats" = { order = 1000 }
7675
"omni.kit.window.script_editor" = {}
7776
"omni.kit.window.console" = {}

extern/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ set(KIT_SDK_ROOT "${NVIDIA_BUILD_DIR}/target-deps/kit-sdk")
207207
set(KIT_OMNI_UI_ROOT "${NVIDIA_BUILD_DIR}/target-deps/omni-ui")
208208
set(KIT_IMGUI_ROOT "${NVIDIA_BUILD_DIR}/target-deps/omni-kit-renderer-imgui")
209209
set(PYBIND11_ROOT "${NVIDIA_BUILD_DIR}/target-deps/pybind11")
210+
set(RTX_PLUGINS_ROOT "${NVIDIA_BUILD_DIR}/target-deps/rtx_plugins")
210211

211212
set(NVIDIA_USD_LIBRARIES
212213
usd_ar
@@ -352,6 +353,16 @@ add_prebuilt_project(
352353
)
353354
# cmake-format: on
354355

356+
# cmake-format: off
357+
# rtx_plugins contains carb/imaging headers needed by omni.ui
358+
add_prebuilt_project_header_only(
359+
INCLUDE_DIR
360+
"${RTX_PLUGINS_ROOT}/include"
361+
TARGET_NAME
362+
rtx_plugins
363+
)
364+
# cmake-format: on
365+
355366
# cmake-format: off
356367
add_prebuilt_project_header_only(
357368
INCLUDE_DIR

extern/nvidia/deps/kit-sdk.packman.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<project toolsVersion="5.6">
22
<dependency name="kit-kernel" linkPath="../_build/target-deps/kit-sdk/">
3-
<package name="kit-kernel" version="107.0.3+feature.180676.45352709.gl.${platform}.release"/>
3+
<package name="kit-kernel" version="107.3.0+feature.199947.b0a86421.gl.${platform}.release"/>
44
</dependency>
55
<!-- build-time dependencies -->
66
<!-- the versions MUST correspond to the versions pulled in by kit-kernel during extension precaching-->
@@ -15,11 +15,9 @@
1515
-->
1616
<!--TODO: update these-->
1717
<dependency name="omni-ui" linkPath="../_build/target-deps/omni-ui/">
18-
<package name="omni.ui" version="0731e3357092fe79" platforms="linux-x86_64"/>
19-
<package name="omni.ui" version="8023ee171a9c720f" platforms="windows-x86_64"/>
18+
<package name="omni.ui" version="8cfe2dbd9d3266b6" platforms="linux-x86_64 manylinux_2_35_x86_64"/>
2019
</dependency>
2120
<dependency name="omni-kit-renderer-imgui" linkPath="../_build/target-deps/omni-kit-renderer-imgui/">
22-
<package name="omni.kit.renderer.imgui" version="61a6e663a4d57772" platforms="linux-x86_64" />
23-
<package name="omni.kit.renderer.imgui" version="e78ad49422b0302a" platforms="windows-x86_64" />
21+
<package name="omni.kit.renderer.imgui" version="617e1ab163fd09a2" platforms="linux-x86_64 manylinux_2_35_x86_64" />
2422
</dependency>
2523
</project>

extern/nvidia/deps/target-deps.packman.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
<filter include="usd-release"/>
66
<filter include="carb_sdk_plugins"/>
77
<filter include="pybind11"/>
8+
<filter include="rtx_plugins"/>
89
</import>
910
<!-- Override the link paths to point to the correct locations. -->
1011
<dependency name="python" linkPath="../_build/target-deps/python"/>
1112
<dependency name="usd-release" linkPath="../_build/target-deps/usd/release"/>
1213
<dependency name="carb_sdk_plugins" linkPath="../_build/target-deps/carb_sdk_plugins"/>
1314
<dependency name="pybind11" linkPath="../_build/target-deps/pybind11/pybind11"/>
15+
<dependency name="rtx_plugins" linkPath="../_build/target-deps/rtx_plugins"/>
1416
</project>

exts/cesium.omniverse/cesium/omniverse/install/vendor_install.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@ def perform_vendor_install():
1111
vendor_wheels: List[WheelInfo] = [
1212
WheelInfo(
1313
module="lxml",
14-
windows_whl="lxml-4.9.2-cp310-cp310-win_amd64.whl",
15-
linux_x64_whl=(
16-
"lxml-4.9.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl"
17-
),
18-
linux_aarch_whl=(
19-
"lxml-4.9.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl"
20-
),
14+
windows_whl="lxml-4.9.2-cp311-cp311-win_amd64.whl",
15+
linux_x64_whl="lxml-4.9.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl",
16+
linux_aarch_whl="lxml-4.9.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl",
2117
)
2218
]
2319

exts/cesium.omniverse/cesium/omniverse/install/wheel_installer.py

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ class WheelInfo:
1414
"""
1515

1616
module: str
17-
windows_whl: str
18-
linux_x64_whl: str
19-
linux_aarch_whl: str
17+
windows_whl: str = ""
18+
linux_x64_whl: str = ""
19+
linux_aarch_whl: str = ""
2020

2121

2222
class WheelInstaller:
@@ -34,34 +34,36 @@ def __init__(self, info: WheelInfo, extension_module="cesium.omniverse"):
3434
:raises ValueError: If any arguments are null or empty strings.
3535
"""
3636
self._logger = logging.getLogger(__name__)
37-
38-
if (
39-
str_is_empty_or_none(info.windows_whl)
40-
or str_is_empty_or_none(info.linux_x64_whl)
41-
or str_is_empty_or_none(info.linux_aarch_whl)
42-
):
43-
raise ValueError(f"One or more wheels is missing for {info.module}.")
44-
4537
self._info = info
4638

4739
manager = app.get_app().get_extension_manager()
4840
ext_id = manager.get_extension_id_by_module(extension_module)
4941
self._vendor_directory_path = Path(manager.get_extension_path(ext_id)).joinpath("vendor")
5042

43+
def _get_wheel_for_platform(self) -> str:
44+
"""
45+
Gets the appropriate wheel filename for the current platform.
46+
"""
47+
if platform.system() == "Windows":
48+
return self._info.windows_whl
49+
50+
machine = platform.machine()
51+
if machine.startswith("arm") or machine.startswith("aarch"):
52+
return self._info.linux_aarch_whl
53+
54+
return self._info.linux_x64_whl
55+
5156
def install(self) -> bool:
5257
"""
5358
Installs the correct wheel for the current platform.
5459
5560
:return: ``True`` if the installation was successful.
5661
"""
57-
58-
if platform.system() == "Windows":
59-
return self._perform_install(self._info.windows_whl)
60-
else:
61-
machine = platform.machine()
62-
if machine.startswith("arm") or machine.startswith("aarch"):
63-
return self._perform_install(self._info.linux_aarch_whl)
64-
return self._perform_install(self._info.linux_x64_whl)
62+
wheel = self._get_wheel_for_platform()
63+
if str_is_empty_or_none(wheel):
64+
self._logger.error(f"No wheel available for {self._info.module} on this platform")
65+
return False
66+
return self._perform_install(wheel)
6567

6668
def _perform_install(self, wheel_file_name: str) -> bool:
6769
"""
Binary file not shown.

0 commit comments

Comments
 (0)