saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-25 02:50:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update onnx (#893)

Browse source
This commit is contained in:
Changming Sun 2019-04-24 04:31:49 -07:00 committed by Scott McKay
parent 9d89b23d81
commit 1f066d4dc4
6 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cgmanifest.json
View file

@ -49,7 +49,7 @@
"component":{
"type":"git",
"git":{
"commitHash":"83dd62659fc07d5b7fa93b5d1c1879f93509c7db",
"commitHash":"27d4b617e7097cda7d0d4c45ff2b09d248f33179",
"repositoryUrl":"https://github.com/onnx/onnx.git"
}
}

2
cmake/external/onnx vendored

@ -1 +1 @@
Subproject commit 0e8d2bc5e51455c70ef790b9f65aa632ed9bc8a7
Subproject commit 27d4b617e7097cda7d0d4c45ff2b09d248f33179

3
onnxruntime/test/python/onnx_backend_test_series.py
View file

@ -96,6 +96,9 @@ backend_test.exclude(r'('
'|^test_mod_float_mixed_sign_example.*'
'|^test_mod_fmod_mixed_sign_example.*'
'|^test_mod_int64_mixed_sign_example.*'
'|^test_reversesequence_batch_cpu.*'
'|^test_reversesequence_time_cpu.*'
'|^test_roialign_cpu.*'
')')
# import all test cases at global scope to make

4
tools/ci_build/github/linux/docker/scripts/install_deps.sh
View file

@ -38,8 +38,8 @@ else
#5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3
#bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0
#9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1
#0e8d2bc5e51455c70ef790b9f65aa632ed9bc8a7 is v1.4.1 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "0e8d2bc5e51455c70ef790b9f65aa632ed9bc8a7"; do
#27d4b617e7097cda7d0d4c45ff2b09d248f33179 is v1.4.1 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "27d4b617e7097cda7d0d4c45ff2b09d248f33179"; do
if [ -z ${lastest_onnx_version+x} ]; then
echo "first pass";
else

4
tools/ci_build/github/linux/docker/scripts/install_deps_x86.sh
View file

@ -32,8 +32,8 @@ else
#5af210ca8a1c73aa6bae8754c9346ec54d0a756e is v1.2.3
#bae6333e149a59a3faa9c4d9c44974373dcf5256 is v1.3.0
#9e55ace55aad1ada27516038dfbdc66a8a0763db is v1.4.1
#0e8d2bc5e51455c70ef790b9f65aa632ed9bc8a7 is v1.4.1 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "0e8d2bc5e51455c70ef790b9f65aa632ed9bc8a7"; do
#27d4b617e7097cda7d0d4c45ff2b09d248f33179 is v1.4.1 latest
for onnx_version in "5af210ca8a1c73aa6bae8754c9346ec54d0a756e" "bae6333e149a59a3faa9c4d9c44974373dcf5256" "9e55ace55aad1ada27516038dfbdc66a8a0763db" "27d4b617e7097cda7d0d4c45ff2b09d248f33179"; do
if [ -z ${lastest_onnx_version+x} ]; then
echo "first pass";
else

29
tools/ci_build/github/linux/run_build.sh
View file

@ -20,36 +20,23 @@ if [ $BUILD_OS = "android" ]; then
/opt/cmake/bin/cmake -DCMAKE_TOOLCHAIN_FILE=/android-ndk/build/cmake/android.toolchain.cmake -DANDROID_CPP_FEATURES=exceptions -DANDROID_PLATFORM=android-28 -DANDROID_ABI=arm64-v8a -DCMAKE_BUILD_TYPE=Release -Donnxruntime_CROSS_COMPILING=ON -Donnxruntime_BUILD_x86=OFF -DONNX_CUSTOM_PROTOC_EXECUTABLE=/usr/bin/protoc ../cmake
/opt/cmake/bin/cmake --build . -- -j$(nproc)
else
COMMON_BUILD_ARGS="--skip_submodule_sync --enable_onnx_tests --parallel --build_shared_lib --build_wheel --use_openmp"
if [ $BUILD_DEVICE = "gpu" ]; then
_CUDNN_VERSION=$(echo $CUDNN_VERSION | cut -d. -f1-2)
python3 $SCRIPT_DIR/../../build.py --build_dir /build \
--config Debug Release \
--skip_submodule_sync --enable_onnx_tests \
--parallel --build_shared_lib \
--use_cuda --use_openmp \
--config Debug Release $COMMON_BUILD_ARGS \
--use_cuda \
--cuda_home /usr/local/cuda \
--cudnn_home /usr/local/cudnn-$_CUDNN_VERSION/cuda --build_shared_lib $BUILD_EXTR_PAR
--cudnn_home /usr/local/cudnn-$_CUDNN_VERSION/cuda $BUILD_EXTR_PAR
elif [ $BUILD_DEVICE = "tensorrt" ]; then
_CUDNN_VERSION=$(echo $CUDNN_VERSION | cut -d. -f1-2)
python3 $SCRIPT_DIR/../../build.py --build_dir /build \
--config Release \
--enable_onnx_tests \
--parallel --build_shared_lib \
--config Release $COMMON_BUILD_ARGS \
--use_tensorrt --tensorrt_home /workspace/tensorrt \
--use_openmp \
--cuda_home /usr/local/cuda \
--cudnn_home /usr/local/cuda --build_shared_lib $BUILD_EXTR_PAR
elif [ $BUILD_DEVICE = "ngraph" ]; then
--cudnn_home /usr/local/cuda $BUILD_EXTR_PAR
else #cpu and ngraph
python3 $SCRIPT_DIR/../../build.py --build_dir /build \
--config Debug Release --build_shared_lib \
--skip_submodule_sync --enable_onnx_tests \
--build_wheel \
--parallel --use_openmp $BUILD_EXTR_PAR
else
python3 $SCRIPT_DIR/../../build.py --build_dir /build \
--config Debug Release --build_shared_lib \
--skip_submodule_sync --enable_onnx_tests \
--build_wheel \
--parallel --use_openmp --build_shared_lib $BUILD_EXTR_PAR
--config Debug Release $COMMON_BUILD_ARGS $BUILD_EXTR_PAR
fi
fi