Update ONNX Runtime version to 1.4.0 (triton-inference-server#1860)

* Update ONNX Runtime version to 1.4.0

* Remove path as it is fixed in ORT upstream

Dockerfile

@@ -63,7 +63,7 @@ RUN cd pytorch && \
 FROM ${BASE_IMAGE} AS tritonserver_onnx
 
 # Onnx Runtime release version
-ARG ONNX_RUNTIME_VERSION=1.3.0
+ARG ONNX_RUNTIME_VERSION=1.4.0
 
 WORKDIR /workspace
 
@@ -81,18 +81,6 @@ ARG SCRIPT_DIR=/workspace/onnxruntime/tools/ci_build/github/linux/docker/scripts
 # Copy patches into container...
 COPY build/onnxruntime /tmp/trtis/build/onnxruntime
 
-# Patch for cudnn.
-RUN patch -i /tmp/trtis/build/onnxruntime/cudnn.patch \
-    /workspace/onnxruntime/onnxruntime/core/providers/cuda/rnn/cudnn_rnn_base.h
-
-# Patch to remove compute_30 support.
-RUN patch -i /tmp/trtis/build/onnxruntime/compute30.patch \
-    /workspace/onnxruntime/cmake/CMakeLists.txt
-
-# Patch build to use the CUDA Runtime version of CUB.
-RUN sed -i 's/${PROJECT_SOURCE_DIR}\/external\/cub//' \
-    /workspace/onnxruntime/cmake/onnxruntime_providers.cmake
-
 RUN sed -i "s/backend-test-tools.*//" ${SCRIPT_DIR}/install_onnx.sh
 RUN cp -r ${SCRIPT_DIR} /tmp/scripts && \
     ${SCRIPT_DIR}/install_ubuntu.sh -p 3.6 -o 18.04 && ${SCRIPT_DIR}/install_deps.sh -p 3.6
@@ -249,7 +237,6 @@ RUN cd /opt/tritonserver/lib/pytorch && \
 # Onnx Runtime headers and library
 # Put include files to same directory as ONNX Runtime changed the include path
 # https://github.com/microsoft/onnxruntime/pull/1461
-ARG ONNX_RUNTIME_VERSION=1.3.0
 COPY --from=tritonserver_onnx /workspace/onnxruntime/include/onnxruntime/core/session/onnxruntime_c_api.h \
      /opt/tritonserver/include/onnxruntime/
 COPY --from=tritonserver_onnx /workspace/onnxruntime/include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \
@@ -260,10 +247,10 @@ COPY --from=tritonserver_onnx /workspace/onnxruntime/include/onnxruntime/core/pr
      /opt/tritonserver/include/onnxruntime/
 COPY --from=tritonserver_onnx /workspace/onnxruntime/include/onnxruntime/core/providers/openvino/openvino_provider_factory.h \
      /opt/tritonserver/include/onnxruntime/
-COPY --from=tritonserver_onnx /workspace/build/Release/libonnxruntime.so.${ONNX_RUNTIME_VERSION} \
+COPY --from=tritonserver_onnx /workspace/build/Release/libonnxruntime.so.* \
      /opt/tritonserver/lib/onnx/
 RUN cd /opt/tritonserver/lib/onnx && \
-    ln -sf libonnxruntime.so.${ONNX_RUNTIME_VERSION} libonnxruntime.so
+    ln -sf libonnxruntime.so.* libonnxruntime.so
 
 # Minimum OpenVINO libraries required by ONNX Runtime to link and to run
 # with OpenVINO Execution Provider