Skip to content

[build] disable vcpkg for Dawn temporarily #24822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fs-eire wants to merge 1 commit into from
+19 −2
Closed

[build] disable vcpkg for Dawn temporarily #24822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion cmake/external/onnxruntime_external_deps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,11 @@ endif()


if (onnxruntime_USE_WEBGPU)
if (onnxruntime_USE_VCPKG AND NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")

# the following code is used to disable building Dawn using vcpkg temporarily
# until we figure out how to resolve the packaging pipeline failures
if (FALSE)
# if (onnxruntime_USE_VCPKG AND NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
# vcpkg does not support Emscripten yet
find_package(dawn REQUIRED)
else()
Expand Down
2 changes: 1 addition & 1 deletion cmake/onnxruntime_providers_webgpu.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
list(APPEND onnxruntime_DELAYLOAD_FLAGS "/DELAYLOAD:webgpu_dawn.dll")
endif()

if (onnxruntime_USE_VCPKG)
if (onnxruntime_USE_VCPKG AND FALSE) # temporarily disable this until we can fix the vcpkg build issue
# Fix Dawn vcpkg build issue (missing IMPORTED_IMPLIB and IMPORTED_LOCATION for target dawn::webgpu_dawn)
get_target_property(webgpu_dawn_target_IMPORTED_IMPLIB dawn::webgpu_dawn IMPORTED_IMPLIB)
if (NOT webgpu_dawn_target_IMPORTED_IMPLIB)
Expand Down
13 changes: 13 additions & 0 deletions cmake/patches/dawn/dawn_fix_copy_dxil_dll.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index cdfde38819..fc5ff76421 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -352,6 +352,8 @@ function(AddSubdirectoryDXC)
TARGET copy_dxil_dll
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DXIL_DLL_PATH} $<TARGET_FILE_DIR:dxcompiler>
COMMENT "Copying ${DXIL_DLL_PATH} to $<TARGET_FILE_DIR:dxcompiler>")
+ # Ensure folder "$<TARGET_FILE_DIR:dxcompiler>" exists when copying the dll
+ add_dependencies(copy_dxil_dll dxcompiler)
# Make dxc target depend on copy_dxil_dll
add_dependencies(dxc copy_dxil_dll)
endif()
Loading