Mergin rel-0.1.0 back to main #231
Merged
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
type: string - name: ep type: string - name: ort_version type: string - name: cuda_version type: string
This pull request mainly focuses on adding the `ThirdPartyNotices.txt` file to different parts of the codebase. Specifically, the changes involve including this file in the build artifacts, NuGet packages, and Python wheel build. Here are the most significant changes: * [`.pipelines/stages/jobs/capi-win-packaging-job.yml`](diffhunk://#diff-38b1b9a2465d43797e09697e900eba44936087f430fc3115b49209f5621b31b9R69): Added the `ThirdPartyNotices.txt` file to the list of files included in the build artifacts. * `nuget/Microsoft.ML.OnnxRuntimeGenAI.Managed.nuspec` and `nuget/Microsoft.ML.OnnxRuntimeGenAI.nuspec`: Included the `ThirdPartyNotices.txt` file in the NuGet packages. [[1]](diffhunk://#diff-01d2fd48e40c38ac82de2127f5fb24b552ed6d9716b495f3dd1cfbd0f900a87aR22) [[2]](diffhunk://#diff-3c5ea4681b1c3e5e5af7c7fc811052a2d530356e8fbfe244c5429077d36d5778R32) * [`src/python/CMakeLists.txt`](diffhunk://#diff-43c9042647d14a73e4061f77bba19ee368fd059a7e0c6086063f7646e2b2aabbR54): Added the `ThirdPartyNotices.txt` file to the Python wheel build.
Co-authored-by: Yufeng Li <[email protected]> Co-authored-by: Baiju Meswani <[email protected]>
cherry-pick from main --------- Co-authored-by: Yufeng Li <[email protected]> Co-authored-by: aciddelgado <[email protected]> Co-authored-by: Baiju Meswani <[email protected]> Co-authored-by: Ryan Hill <[email protected]> Co-authored-by: kunal-vaishnavi <[email protected]>
Co-authored-by: kunal-vaishnavi <[email protected]> Co-authored-by: Ryan Hill <[email protected]> Co-authored-by: Baiju Meswani <[email protected]> Co-authored-by: aciddelgado <[email protected]>
Co-authored-by: kunal-vaishnavi <[email protected]> Co-authored-by: Ryan Hill <[email protected]> Co-authored-by: Baiju Meswani <[email protected]> Co-authored-by: aciddelgado <[email protected]>
# Conflicts: # .pipelines/stages/jobs/steps/capi-linux-step.yml # .pipelines/stages/jobs/steps/nuget-win-step.yml # examples/csharp/Program.cs # examples/csharp/README.md # examples/python/README.md # examples/python/model-chat.py # test/csharp/TestOnnxRuntimeGenAIAPI.cs
baijumeswani
approved these changes
Mar 27, 2024
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.
No description provided.