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.

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

Change native folder name for java macos arm64 #12335

Merged
merged 1 commit into from
Jul 27, 2022
Merged

Change native folder name for java macos arm64 #12335

merged 1 commit into from
Jul 27, 2022

Conversation

snnn
Copy link
Member

@snnn snnn commented Jul 27, 2022

Description:

Change native folder name for java macos arm64

Motivation and Context

  • Why is this change required? What problem does it solve?

see : #12325 #12324

  • If it fixes an open issue, please link to the issue here.

@snnn
Copy link
Member Author

snnn commented Jul 27, 2022

I'm testing the change. It should only affect the "Zip-Nuget-Java-Nodejs Packaging Pipeline".

@snnn
Copy link
Member Author

snnn commented Jul 27, 2022

This PR is ready for review. I have manually checked the content of a newly generated jar, I believe it is right.

@Craigacp
Copy link
Contributor

Could you paste the folder structure of the jar in the ai/onnxruntime/native folder? It should have linux-aarch64, linux-x64, osx-x64, osx-aarch64, win-x64 folders with the appropriately named native binaries for (lib)onnxruntime and (lib)onnxruntime4j_jni in them along with the debug symbols on Windows & macOS platforms I think.

@snnn
Copy link
Member Author

snnn commented Jul 27, 2022

Files under the native folder:

├───linux-aarch64
│       libonnxruntime.so
│       libonnxruntime4j_jni.so
│
├───linux-x64
│       libonnxruntime.so
│       libonnxruntime4j_jni.so
│
├───osx-aarch64
│   │   libonnxruntime.dylib
│   │   libonnxruntime4j_jni.dylib
│   │
│   ├───libonnxruntime.dylib.dSYM
│   │   └───Contents
│   │       │   Info.plist
│   │       │
│   │       └───Resources
│   │           └───DWARF
│   │                   libonnxruntime.dylib
│   │
│   └───libonnxruntime4j_jni.dylib.dSYM
│       └───Contents
│           │   Info.plist
│           │
│           └───Resources
│               └───DWARF
│                       libonnxruntime4j_jni.dylib
│
├───osx-x64
│   │   libonnxruntime.dylib
│   │   libonnxruntime4j_jni.dylib
│   │
│   ├───libonnxruntime.dylib.dSYM
│   │   └───Contents
│   │       │   Info.plist
│   │       │
│   │       └───Resources
│   │           └───DWARF
│   │                   libonnxruntime.dylib
│   │
│   └───libonnxruntime4j_jni.dylib.dSYM
│       └───Contents
│           │   Info.plist
│           │
│           └───Resources
│               └───DWARF
│                       libonnxruntime4j_jni.dylib
│
└───win-x64
        onnxruntime.dll
        onnxruntime.pdb
        onnxruntime4j_jni.dll
        onnxruntime4j_jni.pdb

@Craigacp
Copy link
Contributor

Looks good. Sorry for the trouble I should have looked at the RC jar more closely to catch the packaging issue.

@snnn
Copy link
Member Author

snnn commented Jul 27, 2022

No worries.

@snnn snnn merged commit e6bb447 into master Jul 27, 2022
@snnn snnn deleted the snnn-patch-6 branch July 27, 2022 22:13
@pwittchen
Copy link

Thanks for the fix. When can I expect a new release with that fix?

RandySheriffH added a commit that referenced this pull request Aug 3, 2022
* update package version

* Prevent unbounded growth of command allocator memory (#12114)

Prevent unbounded growth of command allocator memory

* Update supported ops md for NNAPI/CoreML EP (#12245)

* update supported ops md

* address pr comments

* address pr comments

* wording

* Change native folder name for java macos arm64 (#12335)

* Bump async from 2.6.3 to 2.6.4 in /js/react_native/e2e (#11280)

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](caolan/async@v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [js/rn] upgrade dependencies for e2e test (#11863)

* [js/rn] upgrade dependencies for e2e test

* use JDK11 only for gradle

* expand variable

* [js/rn] upgrade package react-native@^0.69.1 (#12155)

* [js/rn] upgrade package react-native@^0.69.1

* upgrade compile sdk to v31

* update ios version requirement

* update pod path for onnxruntime-react-native

* add missing build_java in Android testing stage. (#12187)

add missing build_java in testing

* Use specific Android NDK version in CI builds. (#12350)

Current builds use a NDK version that happens to be on the build machine. The build machine environment may change in ways that are outside of our control.
This change installs a specific version of NDK (the current LTS version 25.0.8775105) and uses it.

* Remove preview keyword from DirectML pacakge (#12368)

Remove preview keyword

Co-authored-by: Sumit Agarwal <[email protected]>

* Scope CreateFileMapping2 to valid API partitions (#12374)

* Fix TRT custom op issue (#12283)

* Pass schema registry on CreateModel.

* Fix ORT_MINIMAL_BUILD.

* Fix build issue.

* Manually add optimization flag for Android Release builds. (#12390)

With recent versions of NDK (since 23), the `-O` optimization level compile flag is not being passed when building in the "Release" configuration.
More details here: android/ndk#1740

Our "Release" Android builds have been built without the optimization flag since we upgraded from NDK 21.

This change is a workaround to manually add `-O3` for "Release" Android builds.

* resolve conflicts in tensorRT related changes

* Enable support of multi-level nested control flow ops model for TRT EP (#12147)

* Make multiple-level nested control flow op model work

* find correct input index

* find correct input index (cont.)

* enable nested layer unit tests for TRT EP

* add comment

* add Scan op to current workaround support of control flow op

Co-authored-by: Jeff Bloomfield <[email protected]>
Co-authored-by: Rachel Guo <[email protected]>
Co-authored-by: Changming Sun <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yulong Wang <[email protected]>
Co-authored-by: Yi Zhang <[email protected]>
Co-authored-by: Edward Chen <[email protected]>
Co-authored-by: sumitsays <[email protected]>
Co-authored-by: Sumit Agarwal <[email protected]>
Co-authored-by: Justin Stoecker <[email protected]>
Co-authored-by: Yateng Hong <[email protected]>
Co-authored-by: Chi Lo <[email protected]>
@RandySheriffH
Copy link
Contributor

RandySheriffH commented Aug 3, 2022

@pwittchen
Copy link

pwittchen commented Aug 4, 2022

Thanks. I checked library from this patch in my project on Mac with M1 and it works fine. It works on Linux too.

bratseth added a commit to vespa-engine/vespa that referenced this pull request Aug 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants