mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-07-02 03:55:34 +00:00
Update abseil to a release tag and register neural_speed (#19255)
### Description Update abseil to a release tag and register neural_speed to CG. ### Motivation and Context Now we are using a non-relesed version of abseil. Using a tag is better.
This commit is contained in:
Changming Sun
GitHub
parent
a28abeb241
commit
bc54ad3f03
6 changed files with 24 additions and 16 deletions
|
|
@ -36,7 +36,7 @@
|
|||
"component": {
|
||||
"type": "git",
|
||||
"git": {
|
||||
"commitHash": "dcd5bd5fd593e31465af3d9ef291d26c646b0a4f",
|
||||
"commitHash": "4a2c63365eff8823a5221db86ef490e828306f9d",
|
||||
"repositoryUrl": "https://github.com/abseil/abseil-cpp.git"
|
||||
},
|
||||
"comments": "abseil_cpp"
|
||||
|
|
@ -192,6 +192,16 @@
|
|||
"comments": "mp11"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "git",
|
||||
"git": {
|
||||
"commitHash": "c11386eb632eec7c1c2aa323142f73519f946e2a",
|
||||
"repositoryUrl": "https://github.com/intel/neural-speed.git"
|
||||
},
|
||||
"comments": "neural_speed"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "git",
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
# NOTE: You must run deps_update_and_upload.py and generate_cgmanifest.py when ready to test your changes in a CI.
|
||||
# See https://microsoft.sharepoint.com/teams/ONNX2/_layouts/OneNote.aspx?id=%2Fteams%2FONNX2%2FShared%20Documents%2FNotebooks%2FONNX%20Ecosystem%20Team%20Notebook&wd=target%28Development.one%7C63D3AB47-51D1-4A62-9965-66882234BD44%2FAdd%20or%20update%20a%20dependency%20in%20deps.txt%7C0E9ED71D-89D5-40FA-B05F-C0123289C591%2F%29
|
||||
#
|
||||
abseil_cpp;https://github.com/abseil/abseil-cpp/archive/dcd5bd5fd593e31465af3d9ef291d26c646b0a4f.zip;6cc204586014e189f5c0fe3274f83162fa7c700c
|
||||
abseil_cpp;https://github.com/abseil/abseil-cpp/archive/refs/tags/20240116.0.zip;bc2cec6baaad67fcb6c0c38972b687d4797927e9
|
||||
cxxopts;https://github.com/jarro2783/cxxopts/archive/3c73d91c0b04e2b59462f0a741be8c07024c1bc0.zip;6c6ca7f8480b26c8d00476e0e24b7184717fe4f0
|
||||
date;https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.1.zip;2dac0c81dc54ebdd8f8d073a75c053b04b56e159
|
||||
dlpack;https://github.com/dmlc/dlpack/archive/refs/tags/v0.6.zip;4d565dd2e5b31321e5549591d78aa7f377173445
|
||||
|
|
@ -34,6 +34,7 @@ microsoft_gsl;https://github.com/microsoft/GSL/archive/refs/tags/v4.0.0.zip;cf36
|
|||
microsoft_wil;https://github.com/microsoft/wil/archive/refs/tags/v1.0.230629.1.zip;e4a542a323c070376f7c2d1973d0f7ddbc1d2fa5
|
||||
mimalloc;https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.1.zip;d5ee7d34223d0567892db5179849939c8769dc41
|
||||
mp11;https://github.com/boostorg/mp11/archive/refs/tags/boost-1.82.0.zip;9bc9e01dffb64d9e0773b2e44d2f22c51aace063
|
||||
neural_speed;https://github.com/intel/neural-speed/archive/refs/tags/bestlav0.1.1.zip;65b0f7a0d04f72f0d5a8d48af70f0366f2ab3939
|
||||
onnx;https://github.com/onnx/onnx/archive/refs/tags/v1.15.0.zip;54c3f960a0541c5d8d3e60c2933e11f5d3688a11
|
||||
#use the commit of supporting all the plugins and TRT 8.6-GA (https://github.com/onnx/onnx-tensorrt/commit/0462dc31ae78f48744b6141ae376df1f96d3f459)
|
||||
onnx_tensorrt;https://github.com/onnx/onnx-tensorrt/archive/a43ce67187bab219520fd80f21af8bbd4354bc8c.zip;572535aefef477050f86744dfab1fef840198035
|
||||
|
|
|
|||
2
cmake/external/abseil-cpp.cmake
vendored
2
cmake/external/abseil-cpp.cmake
vendored
|
|
@ -19,7 +19,7 @@ if(WIN32 AND NOT Patch_FOUND)
|
|||
set(ABSL_ENABLE_INSTALL ON)
|
||||
endif()
|
||||
# NB! Advancing Abseil version changes its internal namespace,
|
||||
# currently absl::lts_20230125 which affects abseil-cpp.natvis debugger
|
||||
# currently absl::lts_20240116 which affects abseil-cpp.natvis debugger
|
||||
# visualization file, that must be adjusted accordingly, unless we eliminate
|
||||
# that namespace at build time.
|
||||
FetchContent_Declare(
|
||||
|
|
|
|||
10
cmake/external/abseil-cpp.natvis
vendored
10
cmake/external/abseil-cpp.natvis
vendored
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
|
||||
<Type Name="absl::lts_20230802::InlinedVector<*>">
|
||||
<Type Name="absl::lts_20240116::InlinedVector<*>">
|
||||
<Intrinsic Name="_size" Expression="storage_.metadata_.value >> 1"/>
|
||||
<Intrinsic Name="_is_allocated" Expression="(storage_.metadata_.value & 1) == 1"/>
|
||||
<Intrinsic Name="_inlined_data" Expression="($T1*)storage_.data_.inlined.inlined_data"/>
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
</Expand>
|
||||
</Type>
|
||||
<!-- Should handle both flat hash_set and hash_map -->
|
||||
<Type Name="absl::lts_20230802::container_internal::raw_hash_set<*>">
|
||||
<Type Name="absl::lts_20240116::container_internal::raw_hash_set<*>">
|
||||
<Intrinsic Name="_commonfields" Expression="settings_.value"/>
|
||||
<Intrinsic Name="_size" Expression="settings_.value.compressed_tuple_.value"/>
|
||||
<Intrinsic Name="_capacity" Expression="_commonfields().capacity_"/>
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
</Type>
|
||||
|
||||
<!-- Primitive types stored as a value -->
|
||||
<Type Name="absl::lts_20230802::container_internal::Storage<*,*,0>">
|
||||
<Type Name="absl::lts_20240116::container_internal::Storage<*,*,0>">
|
||||
<DisplayString IncludeView="noparens">*($T1 *){value}</DisplayString>
|
||||
<DisplayString ExcludeView="noparens">(*($T1 *){value})</DisplayString>
|
||||
<Expand>
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
</Type>
|
||||
|
||||
<!-- For storage inherited from the type -->
|
||||
<Type Name="absl::lts_20230802::container_internal::Storage<*,*,1>">
|
||||
<Type Name="absl::lts_20240116::container_internal::Storage<*,*,1>">
|
||||
<DisplayString IncludeView="noparens">*($T1 *)this</DisplayString>
|
||||
<DisplayString ExcludeView="noparens">(*($T1 *)this)</DisplayString>
|
||||
<Expand>
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
</Expand>
|
||||
</Type>
|
||||
|
||||
<Type Name="absl::lts_20230802::container_internal::map_slot_type<*>">
|
||||
<Type Name="absl::lts_20240116::container_internal::map_slot_type<*>">
|
||||
<DisplayString IncludeView="noparens">{value.first}, {value.second}</DisplayString>
|
||||
<DisplayString ExcludeView="noparens">({value.first}, {value.second})</DisplayString>
|
||||
<Expand>
|
||||
|
|
|
|||
9
cmake/external/neural_speed.cmake
vendored
9
cmake/external/neural_speed.cmake
vendored
|
|
@ -7,12 +7,9 @@ endif()
|
|||
if(USE_NEURAL_SPEED)
|
||||
FetchContent_Declare(
|
||||
neural_speed
|
||||
URL https://github.com/intel/neural-speed/archive/refs/tags/bestlav0.1.1.zip
|
||||
URL_HASH SHA1=65b0f7a0d04f72f0d5a8d48af70f0366f2ab3939
|
||||
URL ${DEP_URL_neural_speed}
|
||||
URL_HASH SHA1=${DEP_SHA1_neural_speed}
|
||||
)
|
||||
set(BTLA_USE_OPENMP OFF)
|
||||
FetchContent_MakeAvailable(neural_speed)
|
||||
if(NOT neural_speed_POPULATED)
|
||||
FetchContent_Populate(neural_speed)
|
||||
endif()
|
||||
onnxruntime_fetchcontent_makeavailable(neural_speed)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ steps:
|
|||
packageType: upack
|
||||
feed: '/7424c8e4-5c62-490e-95c4-79446f31017c'
|
||||
definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0'
|
||||
version: 1.0.129
|
||||
version: 1.0.132
|
||||
downloadPath: $(Build.BinariesDirectory)/deps
|
||||
|
||||
# The private ADO project
|
||||
|
|
@ -22,7 +22,7 @@ steps:
|
|||
packageType: upack
|
||||
feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325'
|
||||
definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a'
|
||||
version: 1.0.129
|
||||
version: 1.0.132
|
||||
downloadPath: $(Build.BinariesDirectory)/deps
|
||||
|
||||
# You can add more ADO accounts at here.
|
||||
|
|
|
|||
Loading…
Reference in a new issue