From 25f747eb3c33a3ffd443fb72628006e756a8432b Mon Sep 17 00:00:00 2001
From: GuanLuo <41310872+GuanLuo@users.noreply.github.com>
Date: Thu, 16 Feb 2023 13:41:48 -0800
Subject: [PATCH] Revert "Using cuda11.8 container for ORT build" (#5367)

This reverts commit 2ae64dedb91b69d41e83071278c2d3b21df5c7d8.
---
 build.py | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/build.py b/build.py
index 915bb38985..1b7d49425b 100755
--- a/build.py
+++ b/build.py
@@ -675,15 +675,15 @@ def onnxruntime_cmake_args(images, library_paths):
         ]
     else:
         if target_platform() == 'windows':
-            if 'ort-base' in images:
+            if 'base' in images:
                 cargs.append(
                     cmake_backend_arg('onnxruntime', 'TRITON_BUILD_CONTAINER',
-                                      None, images['ort-base']))
+                                      None, images['base']))
         else:
-            if 'ort-base' in images:
+            if 'base' in images:
                 cargs.append(
                     cmake_backend_arg('onnxruntime', 'TRITON_BUILD_CONTAINER',
-                                      None, images['ort-base']))
+                                      None, images['base']))
             else:
                 cargs.append(
                     cmake_backend_arg('onnxruntime',
@@ -1085,7 +1085,6 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu,
     if 'onnxruntime' in backends:
         df += '''
 ENV LD_LIBRARY_PATH /opt/tritonserver/backends/onnxruntime:${LD_LIBRARY_PATH}
-ENV LD_LIBRARY_PATH /usr/local/cuda-11.8/lib64:${LD_LIBRARY_PATH}
 '''
 
     backend_dependencies = ""
@@ -1157,10 +1156,6 @@ def dockerfile_prepare_container_linux(argmap, backends, enable_gpu,
 
     if enable_gpu:
         df += install_dcgm_libraries(argmap['DCGM_VERSION'], target_machine)
-        # This is temporary solution to support 23.01
-        df += '''
-RUN apt-get update && apt-get install -y libcufft-11-8
-'''
         df += '''
 # Extra defensive wiring for CUDA Compat lib
 RUN ln -sf ${_CUDA_COMPAT_PATH}/lib.real ${_CUDA_COMPAT_PATH}/lib \
@@ -2243,12 +2238,9 @@ def enable_all():
         fail_if(
             len(parts) != 2,
             '--image must specify <image-name>,<full-image-registry>')
-        # REMOVEME: ONNXRUNTIME 1.13.1 build is failing with cuda 12. Hence, using
-        # cuda 11.8 container as build image for ORT.
         fail_if(
             parts[0] not in [
-                'base', 'gpu-base', 'pytorch', 'tensorflow1', 'tensorflow2',
-                'ort-base'
+                'base', 'gpu-base', 'pytorch', 'tensorflow1', 'tensorflow2'
             ], 'unsupported value for --image')
         log('image "{}": "{}"'.format(parts[0], parts[1]))
         images[parts[0]] = parts[1]