Skip to content
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

Yifanl/pkg #23660

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Yifanl/pkg #23660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92da52f
test -mx=9
yf711 Feb 11, 2025
791a34e
CUDNN_FRONTEND_SKIP_JSON_LIB=OFF
yf711 Feb 12, 2025
b2adc2f
fix
yf711 Feb 12, 2025
a7c31b4
supress unused-function warning when cudnn_frontend skip_json_lib
yf711 Feb 12, 2025
56f4ebe
fix
yf711 Feb 12, 2025
d116b2a
Merge branch 'main' into yifanl/pkg
yf711 Feb 12, 2025
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
1 change: 1 addition & 0 deletions cmake/external/cudnn_frontend.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ onnxruntime_fetchcontent_declare(
EXCLUDE_FROM_ALL
)

set(CUDNN_FRONTEND_SKIP_JSON_LIB ON CACHE BOOL "" FORCE)
set(CUDNN_FRONTEND_BUILD_SAMPLES OFF CACHE BOOL "" FORCE)
set(CUDNN_FRONTEND_BUILD_UNIT_TESTS OFF CACHE BOOL "" FORCE)
set(CUDNN_FRONTEND_BUILD_PYTHON_BINDINGS OFF CACHE BOOL "" FORCE)
Expand Down
4 changes: 4 additions & 0 deletions cmake/onnxruntime_providers_cuda.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@
target_link_libraries(${target} PRIVATE ${ABSEIL_LIBS} ${ONNXRUNTIME_PROVIDERS_SHARED} Boost::mp11 safeint_interface CUDA::cudart)
else()
include(cudnn_frontend) # also defines CUDNN::*
if(NOT MSVC AND TARGET cudnn_frontend)
message(STATUS "Applying compile options to cudnn_frontend to suppress unused-function warning.")
target_compile_options(cudnn_frontend INTERFACE -Wno-error=unused-function)
endif()
if (onnxruntime_USE_CUDA_NHWC_OPS)
if(CUDNN_MAJOR_VERSION GREATER 8)
add_compile_definitions(ENABLE_CUDA_NHWC_OPS)
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/windows/bundle_dlls_gpu.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ FOR /R %%i IN (*.zip) do (
move onnxruntime-win-x64-tensorrt\lib\onnxruntime.dll !filename!\lib\onnxruntime.dll
move onnxruntime-win-x64-tensorrt\lib\onnxruntime.lib !filename!\lib\onnxruntime.lib
move onnxruntime-win-x64-tensorrt\lib\onnxruntime.pdb !filename!\lib\onnxruntime.pdb
7z a %%~ni.zip !filename!\lib
7z a -mx=9 %%~ni.zip !filename!\lib
)
)
2 changes: 1 addition & 1 deletion tools/ci_build/github/windows/bundle_nuget_with_native_headers.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ FOR /R %%i IN (*.nupkg) do (
set filename=%%~ni
IF NOT "!filename:~25,7!"=="Managed" (
mkdir build\native\include
7z a %%~ni.nupkg build
7z a -mx=9 %%~ni.nupkg build
)
)
Loading