Upgrade to onnx 1.7.1 (forked version with custom allocator)

Author: alonre24

get_deps.sh

@@ -282,7 +282,7 @@ fi
 
 ################################################################################### ONNXRUNTIME
 
-ORT_VERSION="1.6.0"
+ORT_VERSION="1.7.1"
 
 if [[ $WITH_ORT != 0 ]]; then
 	[[ $FORCE == 1 ]] && rm -rf $ONNXRUNTIME

opt/build/onnxruntime/Dockerfile.x64

@@ -6,7 +6,7 @@ ARG OS=debian:buster
 FROM ${OS}
 
 ARG ONNXRUNTIME_REPO=https://github.com/RedisAI/onnxruntime
-ARG ONNXRUNTIME_VER=1.6.0
+ARG ONNXRUNTIME_VER=1.7.1
 ARG ARCH=x64
 
 RUN apt-get -qq update

opt/build/onnxruntime/Dockerfile.x64-gpu

@@ -4,7 +4,7 @@ ARG CUDA_VER=11.0-cudnn8
 FROM nvidia/cuda:11.0-cudnn8-devel-ubuntu18.04
 
 ARG ONNXRUNTIME_REPO=https://github.com/RedisAI/onnxruntime
-ARG ONNXRUNTIME_VER=1.6.0
+ARG ONNXRUNTIME_VER=1.7.1
 ARG ARCH=x64-gpu
 
 RUN apt-get -qq update

opt/build/onnxruntime/Makefile

@@ -1,7 +1,7 @@
 
 ROOT=.
 
-VERSION ?= 1.6.0
+VERSION ?= 1.7.1
 OSNICK ?= buster
 
 #----------------------------------------------------------------------------------------------

opt/build/onnxruntime/pack.sh

@@ -6,7 +6,7 @@ PLATFORM="$2"
 
 mkdir -p pack/include pack/lib
 cp onnxruntime/build/Linux/MinSizeRel/libonnxruntime.so.${VER} pack/lib/
-cp onnxruntime/docs/C_API.md pack/
+cp onnxruntime/docs/C_API_Guidelines.md pack/
 cp onnxruntime/LICENSE pack/
 cp onnxruntime/README.md pack/
 cp onnxruntime/ThirdPartyNotices.txt pack/

src/backends/onnxruntime.c

@@ -329,7 +329,7 @@ RAI_Model *RAI_ModelCreateORT(RAI_Backend backend, const char *devicestr, RAI_Mo
     }
 
     // TODO: these options could be configured at the AI.CONFIG level
-    ONNX_VALIDATE_STATUS(ort->SetSessionGraphOptimizationLevel(session_options, ORT_DISABLE_ALL))
+    ONNX_VALIDATE_STATUS(ort->SetSessionGraphOptimizationLevel(session_options, ORT_ENABLE_BASIC))
     ONNX_VALIDATE_STATUS(
         ort->SetIntraOpNumThreads(session_options, (int)opts.backends_intra_op_parallelism))
     ONNX_VALIDATE_STATUS(

tests/flow/tests_onnx.py

@@ -504,7 +504,7 @@ def test_onnx_use_custom_allocator(env):
     ai_memory_config = {k.split(":")[0]: k.split(":")[1]
                         for k in con.execute_command("INFO MODULES").decode().split("#")[4].split()[1:]}
     allocator_access_num_after = ai_memory_config["ai_onnxruntime_memory_access_num"]
-    env.assertEqual(int(allocator_access_num_after) - int(allocator_access_num_before), 22)
+    env.assertEqual(int(allocator_access_num_after) - int(allocator_access_num_before), 16)
 
     values = con.execute_command('AI.TENSORGET', 'b{1}', 'VALUES')
     argmax = max(range(len(values)), key=lambda i: values[i])