Skip to content

Update CUDA build configs #6598

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

Merged
snnn merged 15 commits into from
Feb 9, 2021
Merged

Update CUDA build configs #6598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
145f88c
cuda11
Feb 6, 2021
9f7225e
a
Feb 6, 2021
09fc516
update
Feb 6, 2021
d775869
update
Feb 6, 2021
0f45ae7
Remove dep on C_API.md
Feb 6, 2021
5adf90a
update
Feb 6, 2021
9387864
update
Feb 6, 2021
77784f5
update
Feb 6, 2021
96b5ec4
Merge branch 'snnn/python_arm64' into snnn/cuda
Feb 7, 2021
65faca9
revert
Feb 7, 2021
6313dc8
update
Feb 8, 2021
e5a35ee
Merge remote-tracking branch 'origin/master' into snnn/cuda
Feb 8, 2021
92ccf1e
Merge remote-tracking branch 'origin/master' into snnn/cuda2
Feb 9, 2021
f61a522
revert changes
Feb 9, 2021
4442745
revert
Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ For production scenarios, it's strongly recommended to build only from an [offic
|API|Supported Versions|Samples|
|---|---|---|
[Python](https://aka.ms/onnxruntime-python)| 3.6, 3.7, 3.8, 3.9 (3.8/3.9 excludes Win GPU and Linux ARM)<br>[Python Dev Notes](./docs/Python_Dev_Notes.md)| [Samples](./samples#python)|
|[C#](docs/CSharp_API.md)| | [Samples](./samples#C)|
|[C#](https://www.onnxruntime.ai/docs/reference/api/csharp-api.html)| | [Samples](./samples#C)|
|[C++](./include/onnxruntime/core/session/onnxruntime_cxx_api.h)| |[Samples](./samples#CC)|
|[C](docs/C_API.md)| | [Samples](./samples#CC)|
|[WinRT](docs/WinRT_API.md) | [Windows.AI.MachineLearning](https://docs.microsoft.com/en-us/windows/ai/windows-ml/api-reference)| [Samples](https://github.com/microsoft/windows-Machine-Learning)|
|[Java](docs/Java_API.md)|8+|[Samples](./samples#Java)|
|[C](https://www.onnxruntime.ai/docs/reference/api/c-api.html)| | [Samples](./samples#CC)|
|[WinRT](https://www.onnxruntime.ai/docs/reference/api/winrt-api.html) | [Windows.AI.MachineLearning](https://docs.microsoft.com/en-us/windows/ai/windows-ml/api-reference)| [Samples](https://github.com/microsoft/windows-Machine-Learning)|
|[Java](https://www.onnxruntime.ai/docs/reference/api/java-api.html)|8+|[Samples](./samples#Java)|
[Ruby](https://github.com/ankane/onnxruntime) (external project)| 2.4-2.7| [Samples](https://ankane.org/tensorflow-ruby)|
|[Javascript (node.js)](./nodejs) |12.x | [Samples](./samples/nodejs) |
|[Javascript (node.js)](https://www.onnxruntime.ai/docs/reference/api/nodejs-api.html) |12.x | [Samples](./samples/nodejs) |

### Supported Accelerators

Expand Down
5 changes: 0 additions & 5 deletions csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,6 @@
Pack="true"
Visible="false"
/>
<None Include="$(OnnxRuntimeCsharpRoot)\..\docs\CSharp_API.md"
PackagePath="\README.md"
Pack="true"
Visible="false"
/>
<None Include="$(PackageId).targets"
PackagePath="\build\$(TargetFramework)"
Pack="true"
Expand Down
1 change: 0 additions & 1 deletion tools/ci_build/github/linux/copy_strip_binary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ cp $SOURCE_DIR/include/onnxruntime/core/session/onnxruntime_session_options_conf

# copy the README, licence and TPN
cp $SOURCE_DIR/README.md $BINARY_DIR/$ARTIFACT_NAME/README.md
cp $SOURCE_DIR/docs/C_API.md $BINARY_DIR/$ARTIFACT_NAME/C_API.md
cp $SOURCE_DIR/docs/Privacy.md $BINARY_DIR/$ARTIFACT_NAME/Privacy.md
cp $SOURCE_DIR/LICENSE $BINARY_DIR/$ARTIFACT_NAME/LICENSE
cp $SOURCE_DIR/ThirdPartyNotices.txt $BINARY_DIR/$ARTIFACT_NAME/ThirdPartyNotices.txt
Expand Down
11 changes: 0 additions & 11 deletions tools/ci_build/github/linux/docker/Dockerfile.centos_gpu
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda10_2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ENV LD_LIBRARY_PATH $DEVTOOLSET_ROOTPATH/usr/lib64:$DEVTOOLSET_ROOTPATH/usr/lib:
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig

COPY manylinux2014_build_scripts /manylinux2014_build_scripts
RUN bash /manylinux2014_build_scripts/build.sh 8 && rm -r manylinux2014_build_scripts
RUN bash /manylinux2014_build_scripts/build.sh 8 && rm -r manylinux2014_build_scripts && yum downgrade -y glibc-2.17-317.el7 glibc-common-2.17-317.el7 glibc-devel-2.17-317.el7 glibc-headers-2.17-317.el7

ENV SSL_CERT_FILE=/opt/_internal/certs.pem

Expand Down
2 changes: 1 addition & 1 deletion tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_gpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ENV LD_LIBRARY_PATH $DEVTOOLSET_ROOTPATH/usr/lib64:$DEVTOOLSET_ROOTPATH/usr/lib:
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig

COPY manylinux2014_build_scripts /manylinux2014_build_scripts
RUN bash /manylinux2014_build_scripts/build.sh 8 && rm -r manylinux2014_build_scripts
RUN bash /manylinux2014_build_scripts/build.sh 8 && rm -r manylinux2014_build_scripts && yum downgrade -y glibc-2.17-317.el7 glibc-common-2.17-317.el7 glibc-devel-2.17-317.el7 glibc-headers-2.17-317.el7

ENV SSL_CERT_FILE=/opt/_internal/certs.pem

Expand Down
5 changes: 1 addition & 4 deletions tools/nuget/generate_nuspec_for_native_nuget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,15 +424,12 @@ def generate_files(list, args):
files_list.append('<file src=' + '"' + target_targets + '" target="build\\native" />')
files_list.append('<file src=' + '"' + target_targets + '" target="build\\netstandard1.1" />')

# Process License, ThirdPartyNotices, Privacy, README
# Process License, ThirdPartyNotices, Privacy
files_list.append('<file src=' + '"' + os.path.join(args.sources_path, 'LICENSE.txt') + '" target="LICENSE.txt" />')
files_list.append('<file src=' + '"' + os.path.join(args.sources_path, 'ThirdPartyNotices.txt') +
'" target="ThirdPartyNotices.txt" />')
files_list.append('<file src=' + '"' + os.path.join(args.sources_path, 'docs', 'Privacy.md') +
'" target="Privacy.md" />')
files_list.append('<file src=' + '"' + os.path.join(args.sources_path, 'docs', 'C_API.md') +
'" target="README.md" />')

files_list.append('</files>')

list += files_list
Expand Down