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

Jump to bottom

Add custom vcpkg ports #23456

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Add custom vcpkg ports #23456

merged 1 commit into from
Jan 22, 2025

Conversation

snnn
Copy link
Member

@snnn snnn commented Jan 22, 2025 •
edited
Loading

Description

Add custom vcpkg ports for the following packages:

  1. cpuinfo
  2. onnx
  3. pthreadpool
  4. xnnpack

Because:

  • The cpuinfo/pthreadpool/xnnpack packages in the official vcpkg repo are too old.
  • The onnx package in the official repo requires building python from source, which then requires a lot of additional dependencies to be installed. This PR removes them.
  • Added a disable_gcc_warning.patch file for xnnpack for addressing the issue reported in Build failure with GCC14 google/XNNPACK#7650. I will remove this patch when the issue is fully addressed.
  • Added " -DONNX_DISABLE_STATIC_REGISTRATION=ON" to ONNX's config options.

Motivation and Context

To make onnxruntime work better with vcpkg.
This PR is extracted from a bigger one to ease code review.

@snnn snnn merged commit 77adf4b into main Jan 22, 2025
98 checks passed
@snnn snnn deleted the snnn/vcpkg_ports branch January 22, 2025 19:49
ashrit-ms pushed a commit that referenced this pull request Jan 23, 2025
@snnn @ashrit-ms
Add custom vcpkg ports (#23456)
1336566 
### Description
Add custom vcpkg ports for the following packages:
1. cpuinfo
2. onnx 
3. pthreadpool  
4. xnnpack

Because:

- The cpuinfo/pthreadpool/xnnpack packages in the official vcpkg repo
are too old.
   - XNNPack's version is updated from 2022-12-22 to 2025-01-17
   - CPUINFO's version is updated from 2022-07-19 to 2024-12-09
- Pthreadpool's version is updated from 2020-04-10 to 2024-12-17, and
the source code location is changed from
https://github.com/Maratyszcza/pthreadpool to
https://github.com/google/pthreadpool
- The onnx package in the official repo requires building python from
source, which then requires a lot of additional dependencies to be
installed. This PR removes them.
- Added a disable_gcc_warning.patch file for xnnpack for addressing the
issue reported in google/XNNPACK#7650. I will
remove this patch when the issue is fully addressed.
- Added " -DONNX_DISABLE_STATIC_REGISTRATION=ON" to ONNX's config
options.
-
@ashrit-ms ashrit-ms mentioned this pull request Jan 23, 2025
Merged
ashrit-ms added a commit that referenced this pull request Jan 23, 2025
@ashrit-ms @adrianlizarraga
@justinchuby @fs-eire @edgchen1 @snnn @peishenyan @tianleiwu @HectorSVC @jchen351 @Zyrin @junchao-loongson @dependabot @sushraja-msft @Honry @qjia7 @carzh
Update win-ort-main to tip main 250123 (#23473)
4b5b5f7 
### Description
This PR is to update the win-ort-main branch to the tip main branch as
of 2025-01-23.

### PR List
ddf0d37 [QNN EP] Add LoggingManager::HasDefaultLogger() to provider
bridge API (#23467)
05fbbdf [QNN EP] Make QNN EP a shared library (#23120)
1336566 Add custom vcpkg ports (#23456)
2e1173c Update the compile flags for vcpkg packages (#23455)
1f628a9 [Mobile] Add BrowserStack Android MAUI Test (#23383)
009cae0 [js/webgpu] Optimize ConvTranspose (Continue) (#23429)
04a4a69 Use onnx_protobuf.h to suppress some GCC warnings (#23453)
2e3b62b Suppress some strict-aliasing related warnings in WebGPU EP
(#23454)
b708f9b Bump ruff from 0.9.1 to 0.9.2 (#23427)
c0afc66 [WebNN] Remove workarounds for TFLite backend (#23406)
8a821ff Bump vite from 6.0.7 to 6.0.11 in
/js/web/test/e2e/exports/testcases/vite-default (#23446)
220c1a2 Make ORT and Dawn use the same protobuf/abseil source code
(#23447)
b7b5792 Change MacOS-13 to ubuntu on for
android-java-api-aar-test.yml. (#23444)
19d0d2a WIP: Dp4MatMulNBits accuracy level 4 matmul for WebGPU EP
(#23365)
95b8eff [QNN EP]: Clean up QNN logging resources if an error occurs
during initialization (#23435)
626134c Bump clang-format from 19.1.6 to 19.1.7 (#23428)
0cf9753 Fix eigen external deps (#23439)
f9440ae Moving RN_CI Android Testing to Linux (#23422)
1aa5902 [QNN EP] workaround for QNN validation bug for Tanh with
uint16 quantized output (#23432)
7f5582a Seperate RN andriod and IOS into 2 separated Stages. (#23400)
73deac2 Implement some missing element wise Add/Sub/Mul/Div/Neg
operations for CPU and CUDA EPs (#23090)
949fe42 Upgrade Java version from react-native/android to Java 17
(#23066)
0892c23 Update Qnn SDK default version to 2.30 (#23411)
94c099b Fix type cast build error (#23423)
d633e57 [WebNN EP] Fix AddInitializersToSkip issues (#23354)
e988ef0 [QNN EP] Fix regression for MatMul with two quantized/dynamic
uint16 inputs (#23419)
7538795 Update onnxruntime binary size checks ci pipeline's docker
image (#23405)
6c5ea41 Revert "[QNN EP] Clean up correctly from a partial setup
(#23320)" (#23420)
e866804 Enable comprehension simplification in ruff rules (#23414)
0a5f1f3 bugfix: string_view of invalid memory (#23417)
4cc38e0 fix crash when first input of BatchNormalization is 1-D
(#23387)
0334414 Target py310 and modernize codebase with ruff (#23401)
87341ac [QNN EP] Fix segfault when unregistering HTP shared memory
handles (#23402)

### Motivation and Context
This update includes the change to make QNN-EP a shared library.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Adrian Lizarraga <[email protected]>
Co-authored-by: Justin Chu <[email protected]>
Co-authored-by: Yulong Wang <[email protected]>
Co-authored-by: Edward Chen <[email protected]>
Co-authored-by: Changming Sun <[email protected]>
Co-authored-by: Peishen Yan <[email protected]>
Co-authored-by: Tianlei Wu <[email protected]>
Co-authored-by: Hector Li <[email protected]>
Co-authored-by: Jian Chen <[email protected]>
Co-authored-by: Alexis Tsogias <[email protected]>
Co-authored-by: junchao-zhao <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: sushraja-msft <[email protected]>
Co-authored-by: Wanming Lin <[email protected]>
Co-authored-by: Jiajia Qin <[email protected]>
Co-authored-by: Caroline Zhu <[email protected]>
@luncliff luncliff mentioned this pull request Jan 31, 2025
Merged
snnn pushed a commit that referenced this pull request Jan 31, 2025
@luncliff
Use latest vcpkg commit in configuration, sync manifest with deps.txt (…
169917b 
…#23554)

### Description

`python3` dependency is removed in `onnx` port of
https://github.com/microsoft/vcpkg upstream.

* microsoft/vcpkg#43236
*
#23285 (comment)
(Previous work)

Removed `nsync`, and use ONNX 1.70.0+ in vcpkg.json(manifest)

### Motivation and Context

* Help #23158
* #23456
sfatimar pushed a commit to intel/onnxruntime that referenced this pull request Feb 5, 2025
@luncliff @jatinwadhwa921
Use latest vcpkg commit in configuration, sync manifest with deps.txt (…
644fe27 
…microsoft#23554)

### Description

`python3` dependency is removed in `onnx` port of
https://github.com/microsoft/vcpkg upstream.

* microsoft/vcpkg#43236
*
microsoft#23285 (comment)
(Previous work)

Removed `nsync`, and use ONNX 1.70.0+ in vcpkg.json(manifest)

### Motivation and Context

* Help microsoft#23158
* microsoft#23456
sfatimar pushed a commit to intel/onnxruntime that referenced this pull request Feb 5, 2025
@luncliff @jatinwadhwa921
Use latest vcpkg commit in configuration, sync manifest with deps.txt (…
7f7525a 
…microsoft#23554)

### Description

`python3` dependency is removed in `onnx` port of
https://github.com/microsoft/vcpkg upstream.

* microsoft/vcpkg#43236
*
microsoft#23285 (comment)
(Previous work)

Removed `nsync`, and use ONNX 1.70.0+ in vcpkg.json(manifest)

### Motivation and Context

* Help microsoft#23158
* microsoft#23456
ashrit-ms pushed a commit that referenced this pull request Feb 11, 2025
@luncliff @ashrit-ms
Use latest vcpkg commit in configuration, sync manifest with deps.txt (…
256c38c 
…#23554)

### Description

`python3` dependency is removed in `onnx` port of
https://github.com/microsoft/vcpkg upstream.

* microsoft/vcpkg#43236
*
#23285 (comment)
(Previous work)

Removed `nsync`, and use ONNX 1.70.0+ in vcpkg.json(manifest)

### Motivation and Context

* Help #23158
* #23456
guschmue pushed a commit that referenced this pull request Mar 6, 2025
@snnn @guschmue
Add custom vcpkg ports (#23456)
c11ebdc 
### Description
Add custom vcpkg ports for the following packages:
1. cpuinfo
2. onnx 
3. pthreadpool  
4. xnnpack

Because:

- The cpuinfo/pthreadpool/xnnpack packages in the official vcpkg repo
are too old.
   - XNNPack's version is updated from 2022-12-22 to 2025-01-17
   - CPUINFO's version is updated from 2022-07-19 to 2024-12-09
- Pthreadpool's version is updated from 2020-04-10 to 2024-12-17, and
the source code location is changed from
https://github.com/Maratyszcza/pthreadpool to
https://github.com/google/pthreadpool
- The onnx package in the official repo requires building python from
source, which then requires a lot of additional dependencies to be
installed. This PR removes them.
- Added a disable_gcc_warning.patch file for xnnpack for addressing the
issue reported in google/XNNPACK#7650. I will
remove this patch when the issue is fully addressed.
- Added " -DONNX_DISABLE_STATIC_REGISTRATION=ON" to ONNX's config
options.
-
guschmue pushed a commit that referenced this pull request Mar 6, 2025
@luncliff @guschmue
Use latest vcpkg commit in configuration, sync manifest with deps.txt (…
cb0aa0e 
…#23554)

### Description

`python3` dependency is removed in `onnx` port of
https://github.com/microsoft/vcpkg upstream.

* microsoft/vcpkg#43236
*
#23285 (comment)
(Previous work)

Removed `nsync`, and use ONNX 1.70.0+ in vcpkg.json(manifest)

### Motivation and Context

* Help #23158
* #23456
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jchen351 jchen351 jchen351 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@snnn @jchen351