-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into hari/optional_fix_1
- Loading branch information
Showing
410 changed files
with
18,705 additions
and
8,036 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="python" version="3.7.9" targetFramework="native" /> | ||
| <package id="Microsoft.AI.DirectML" version="1.8.2" targetFramework="native" /> | ||
| <package id="Microsoft.AI.DirectML.Preview" version="1.9.0-devb9b146539f535988728c8eb4791840db54add4a7" targetFramework="native" /> | ||
| <package id="Microsoft.Windows.CppWinRT" version="2.0.201201.7" targetFramework="native" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="pythonx86" version="3.7.9" targetFramework="native" /> | ||
| <package id="Microsoft.AI.DirectML" version="1.8.2" targetFramework="native" /> | ||
| <package id="Microsoft.AI.DirectML.Preview" version="1.9.0-devb9b146539f535988728c8eb4791840db54add4a7" targetFramework="native" /> | ||
| <package id="Microsoft.Windows.CppWinRT" version="2.0.201201.7" targetFramework="native" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule onnx
updated
1757 files
Submodule onnx-tensorrt
updated
29 files
| +2 −1 | CMakeLists.txt | |
| +21 −8 | ConditionalHelpers.cpp | |
| +5 −4 | ConditionalHelpers.hpp | |
| +110 −0 | ImporterContext.cpp | |
| +49 −55 | ImporterContext.hpp | |
| +30 −0 | LICENSE | |
| +42 −61 | ModelImporter.cpp | |
| +23 −2 | NvOnnxParser.h | |
| +1 −1 | OnnxAttrs.cpp | |
| +7 −7 | README.md | |
| +43 −13 | ShapeTensor.cpp | |
| +17 −3 | ShapeTensor.hpp | |
| +4 −113 | ShapedWeights.cpp | |
| +8 −5 | ShapedWeights.hpp | |
| +5 −0 | TensorOrWeights.hpp | |
| +294 −191 | builtin_op_importers.cpp | |
| +0 −5 | common.hpp | |
| +16 −2 | docs/Changelog.md | |
| +6 −6 | docs/faq.md | |
| +19 −4 | docs/operators.md | |
| +42 −0 | half.h | |
| +3,094 −0 | ieee_half.h | |
| +7 −3 | onnx2trt.hpp | |
| +1 −2 | onnx2trt_common.hpp | |
| +52 −121 | onnx2trt_utils.cpp | |
| +70 −15 | onnx2trt_utils.hpp | |
| +1 −1 | onnx_tensorrt/__init__.py | |
| +4 −4 | onnx_utils.hpp | |
| +1 −1 | third_party/onnx |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| set(XNNPACK_DIR external/XNNPACK) | ||
| set(XNNPACK_INCLUDE_DIR ${XNNPACK_DIR}/include) | ||
| set(XNNPACK_USE_SYSTEM_LIBS ON CACHE INTERNAL "") | ||
| set(XNNPACK_BUILD_TESTS OFF CACHE INTERNAL "") | ||
| set(XNNPACK_BUILD_BENCHMARKS OFF CACHE INTERNAL "") | ||
| set(FP16_BUILD_TESTS OFF CACHE INTERNAL "") | ||
| set(FP16_BUILD_BENCHMARKS OFF CACHE INTERNAL "") | ||
| set(CLOG_SOURCE_DIR "${PYTORCH_CPUINFO_DIR}/deps/clog") | ||
| set(CPUINFO_SOURCE_DIR ${PYTORCH_CPUINFO_DIR}) | ||
|
|
||
| if (onnxruntime_BUILD_WEBASSEMBLY) | ||
| execute_process(COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/xnnpack/AddEmscriptenSupport.patch WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/${XNNPACK_DIR}) | ||
| endif() | ||
|
|
||
| add_subdirectory(external/FP16) | ||
| add_subdirectory(external/pthreadpool) | ||
| add_subdirectory(external/XNNPACK) | ||
|
|
||
| set_target_properties(fp16 PROPERTIES FOLDER "External/Xnnpack") | ||
| set_target_properties(pthreadpool PROPERTIES FOLDER "External/Xnnpack") | ||
| set_target_properties(XNNPACK PROPERTIES FOLDER "External/Xnnpack") | ||
|
|
||
| set(onnxruntime_EXTERNAL_LIBRARIES_XNNPACK XNNPACK pthreadpool) | ||
| list(APPEND onnxruntime_EXTERNAL_LIBRARIES ${onnxruntime_EXTERNAL_LIBRARIES_XNNPACK}) | ||
|
|
||
| # the XNNPACK CMake setup doesn't include the WASM kernels so we have to manually set those up | ||
| if (onnxruntime_BUILD_WEBASSEMBLY) | ||
| if (onnxruntime_ENABLE_WEBASSEMBLY_THREADS) | ||
| target_compile_options(XNNPACK PRIVATE "-pthread") | ||
| endif() | ||
|
|
||
| message("Adding WebAssembly Source Files to XNNPACK") | ||
| set(wasm_src_patterns "${XNNPACK_DIR}/src/wasm-*.c" | ||
| "${XNNPACK_DIR}/src/*-wasm-*.c" | ||
| "${XNNPACK_DIR}/src/*-wasm.c") | ||
| set(wasm32_asm_src_patterns "${XNNPACK_DIR}/src/wasm_shr_*.S") | ||
|
|
||
| file(GLOB_RECURSE XNNPACK_WASM_MICROKERNEL_SRCS CONFIGURE_DEPENDS ${wasm_src_patterns}) | ||
| file(GLOB_RECURSE XNNPACK_WASM32_ASM_MICROKERNEL_SRCS CONFIGURE_DEPENDS ${wasm32_asm_src_patterns}) | ||
|
|
||
| message(DEBUG "XNNPACK_WASM_MICROKERNEL_SRCS:${XNNPACK_WASM_MICROKERNEL_SRCS}") | ||
| message(DEBUG "XNNPACK_WASM32_ASM_MICROKERNEL_SRCS:${XNNPACK_WASM32_ASM_MICROKERNEL_SRCS}") | ||
|
|
||
| target_sources(XNNPACK PRIVATE ${XNNPACK_WASM_MICROKERNEL_SRCS} | ||
| ${XNNPACK_WASM32_ASM_MICROKERNEL_SRCS}) | ||
|
|
||
| if (onnxruntime_ENABLE_WEBASSEMBLY_SIMD) | ||
| target_compile_options(XNNPACK PRIVATE "-msimd128") | ||
|
|
||
| set(wasmsimd_src_patterns "${XNNPACK_DIR}/src/wasmsimd-*.c" | ||
| "${XNNPACK_DIR}/src/*-wasmsimd-*.c" | ||
| "${XNNPACK_DIR}/src/*-wasmsimd.c" | ||
| "${XNNPACK_DIR}/src/*/wasmsimd.c") | ||
|
|
||
| file(GLOB_RECURSE XNNPACK_WASMSIMD_MICROKERNEL_SRCS CONFIGURE_DEPENDS ${wasmsimd_src_patterns}) | ||
| message(DEBUG "XNNPACK_WASMSIMD_MICROKERNEL_SRCS:${XNNPACK_WASMSIMD_MICROKERNEL_SRCS}") | ||
|
|
||
| target_sources(XNNPACK PRIVATE ${XNNPACK_WASMSIMD_MICROKERNEL_SRCS}) | ||
| endif() | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.