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

Specify deps in deps.txt and manifest #14530

Merged
merged 3 commits into from
Feb 2, 2023
Merged

Specify deps in deps.txt and manifest #14530

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
860a100
specify deps in deps.txt and manifest
RandyShuai Feb 1, 2023
cd428fe
add licenses into third-party-notice and extend cgmanifest with trito…
RandyShuai Feb 2, 2023
d807eaa
update mimalloc version
RandyShuai Feb 2, 2023
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
85 changes: 73 additions & 12 deletions cgmanifests/generated/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"component": {
"type": "git",
"git": {
"commitHash": "a902b39270841beafc307dfa709610aa1cac2f06",
"commitHash": "a20c65f2cd549445fda907f7b83894c8eb7427d6",
"repositoryUrl": "https://github.com/protocolbuffers/protobuf.git"
},
"comments": "git submodule at cmake/external/protobuf"
Expand Down Expand Up @@ -318,16 +318,6 @@
"comments": "onnx_tensorrt"
}
},
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this removal auto-generated?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes it is.

Copy link
Contributor Author

@RandySheriffH RandySheriffH Feb 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

restored remove part manually, let's keep it.

"component": {
"type": "git",
"git": {
"commitHash": "a20c65f2cd549445fda907f7b83894c8eb7427d6",
"repositoryUrl": "https://github.com/protocolbuffers/protobuf.git"
},
"comments": "protobuf"
}
},
{
"component": {
"type": "git",
Expand Down Expand Up @@ -407,6 +397,77 @@
},
"comments": "cutlass"
}
}
},
{
"component": {
"type": "git",
"git": {
"commitHash": "6f7ffeb18f99796233b958aaaf14ec7bd4fb64b2",
"repositoryUrl": "https://github.com/microsoft/vcpkg.git"
},
"comments": "vcpkg"
}
},
{
"component": {
"type": "git",
"git": {
"commitHash": "19cc035b6c6f2283573d29c7ea7f7d675cf750ce",
"repositoryUrl": "https://github.com/openssl/openssl.git"
},
"comments": "openssl"
}
},
{
"component": {
"type": "git",
"git": {
"commitHash": "f54b0e47a08782a6131cc3d60f94d038fa6e0a51",
"repositoryUrl": "https://github.com/Tencent/rapidjson.git"
},
"comments": "rapidjson"
}
},
{
"component": {
"type": "git",
"git": {
"commitHash": "da041154c6bac1a4aa98254a7d6819059e8ac0b0",
"repositoryUrl": "https://github.com/boostorg/boost.git"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment as server

},
"comments": "boost"
}
},
{
"component": {
"type": "git",
"git": {
"commitHash": "9a6546658657dbeb23245117b57f4e6cf6cdc3e6",
"repositoryUrl": "https://github.com/libb64/libb64.git"
},
"comments": "b64"
}
},
{
"component": {
"type": "git",
"git": {
"commitHash": "75a84807a019bf4961faf713df9d748f0fc83b47",
"repositoryUrl": "https://github.com/triton-inference-server/server.git"
Copy link
Contributor

@pranavsharma pranavsharma Feb 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The whole server is compiled into the triton client? We're not shipping the triton server.

},
"comments": "triton"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we also need to mention the other repos triton client depends on?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right - may be we should also add the client here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Client added.

}
},
{
"Component": {
"Type": "other",
"other": {
"Name": "pthread",
"Version": "3.0.0",
"DownloadUrl": "https://sourceforge.net/projects/pthreads4w/files/pthreads4w-code-v3.0.0.zip"
},
"comments": "posix pthread library"
}
},
]
}
9 changes: 9 additions & 0 deletions cmake/deps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,12 @@ re2;https://github.com/google/re2/archive/refs/tags/2022-06-01.zip;aa77313b76e91
safeint;https://github.com/dcleblanc/SafeInt/archive/ff15c6ada150a5018c5ef2172401cb4529eac9c0.zip;913a4046e5274d329af2806cb53194f617d8c0ab
tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381
cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v2.11.0.zip;be70c559f07251ba7f33c789dba98872b444c10f
# below are deps introduced by triton client, might remove after 1.14 release
vcpkg;https://github.com/microsoft/vcpkg/archive/refs/tags/2022.11.14.zip;3f983141351af5db2d6c3ca965959845f27d5d51
openssl;https://github.com/openssl/openssl/archive/refs/tags/openssl-3.0.7.zip;dda8fc81308555410505eb4a9eab3e1da0436a1d
rapidjson;https://github.com/Tencent/rapidjson/archive/refs/tags/v1.1.0.zip;0fe7b4f7b83df4b3d517f4a202f3a383af7a0818
boost;https://github.com/boostorg/boost/archive/refs/tags/boost-1.81.0.zip;f6ab0da855f825b4eb1abd949967d01a4c5e4e1b
b64;https://github.com/libb64/libb64/archive/refs/tags/v2.0.0.1.zip;815b6d31d50d9e63df55b25ce555e7b787153c28
pthread;https://sourceforge.net/projects/pthreads4w/files/pthreads4w-code-v3.0.0.zip;3b9e417e4474c34542b76ad40529e396ac109fb4
triton;https://github.com/triton-inference-server/server/archive/refs/tags/v2.28.0.zip;4b305570aa1e889946e20e36050b6770e4108fee
# above are deps introduced by triton client, might remove after 1.14 release
4 changes: 2 additions & 2 deletions tools/ci_build/github/azure-pipelines/templates/download-deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
packageType: upack
feed: '/7424c8e4-5c62-490e-95c4-79446f31017c'
definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0'
version: 1.0.25
version: 1.0.27
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the reason for this change?

Copy link
Contributor Author

@RandySheriffH RandySheriffH Feb 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is required by the OneNote page on deps.
The version is here.

downloadPath: $(Build.BinariesDirectory)/deps

# The private ADO project
Expand All @@ -22,7 +22,7 @@ steps:
packageType: upack
feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325'
definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a'
version: 1.0.25
version: 1.0.27
downloadPath: $(Build.BinariesDirectory)/deps

# You can add more ADO accounts at here.