Rework the native library usage so that a pre-built ORT native package can be easily used #22345
+447
−575
Conversation
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
…e can be easily used. The same native libraries were being included by almost every project, but the native library is only needed to run tests. Due to the multiple inclusions attempting to use a pre-built package was clashing with any local builds that were available. Create a helper file to include either a local built of a pre-built package and include that in the two test projects. Cleanup various miscellaous things.
skottmckay
commented
Oct 8, 2024
| @@ -64,13 +64,6 @@ CMake creates a target to this project | |||
| <Error Text="Building via this file is not supported. Please build using the appropriate .sln file in this directory." /> | |||
| </Target> | |||
|
|
|||
| <Target Name="RunTest"> | |||
| <Message Importance="High" Text="Running CSharp tests..." /> | |||
| <Exec Command="$(DotNetExe) test test\Microsoft.ML.OnnxRuntime.Tests\Microsoft.ML.OnnxRuntime.Tests.csproj -c $(Configuration) --no-build --blame -v n" ConsoleToMSBuild="true"> | |||
There was a problem hiding this comment.
This project doesn't exist anymore so nothing is using this target.
| <Message Text="OrtConstants='$(OrtConstants)' " /> | ||
| <Message Text="TargetFrameworks='$(TargetFrameworks)' " /> | ||
| </Target> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="$(OnnxRuntimeCsharpRoot)\..\include\onnxruntime\core\session\onnxruntime_*.h" | ||
| PackagePath="\build\native\include" | ||
| Pack="false" |
There was a problem hiding this comment.
Not clear if any of these are needed given they're excluded from being packed into the managed nuget package, and \tools\nuget\generate_nuspec_for_native_nuget.py takes care of everything that goes into the native package.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The local build of the native library was being included by almost every project, but is only needed to run tests. Due to the multiple inclusions attempting to use a pre-built package was clashing with any local builds that were available.
Create a helper file to include either a local built of a pre-built package and include that in the two test projects.
Cleanup various miscellaous things.
Motivation and Context
Create setup to simplify running on-device tests with the nuget packages.