@@ -157,16 +157,6 @@ def dockerfile_for_linux(output_file):
157157    && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3* \\  
158158    && cmake --version 
159159
160- """ 
161-     if  FLAGS .enable_gpu :
162-         df  +=  """ 
163- # Allow configure to pick up cuDNN where it expects it. 
164- # (Note: $CUDNN_VERSION is defined by base image) 
165- RUN _CUDNN_VERSION=$(echo $CUDNN_VERSION | cut -d. -f1-2) && \  
166-      mkdir -p /usr/local/cudnn-$_CUDNN_VERSION/cuda/include && \ 
167-      ln -s /usr/include/cudnn.h /usr/local/cudnn-$_CUDNN_VERSION/cuda/include/cudnn.h && \ 
168-      mkdir -p /usr/local/cudnn-$_CUDNN_VERSION/cuda/lib64 && \ 
169-      ln -s /etc/alternatives/libcudnn_so /usr/local/cudnn-$_CUDNN_VERSION/cuda/lib64/libcudnn.so
170160""" 
171161
172162    if  FLAGS .ort_openvino  is  not   None :
@@ -395,7 +385,7 @@ def dockerfile_for_linux(output_file):
395385""" 
396386    df  +=  """ 
397387RUN cd /opt/onnxruntime/lib && \  
398-      for i in `find . -mindepth 1 -maxdepth 1 -type f -name '*\.so*'`; do \ 
388+      for i in `find . -mindepth 1 -maxdepth 1 -type f -name '*\\  .so*'`; do \ 
399389         patchelf --set-rpath '$ORIGIN' $i; \ 
400390     done
401391
@@ -476,7 +466,7 @@ def dockerfile_for_windows(output_file):
476466
477467    df  +=  """ 
478468WORKDIR /workspace/onnxruntime 
479- ARG VS_DEVCMD_BAT="\BuildTools\VC\Auxiliary\Build\v cvars64.bat" 
469+ ARG VS_DEVCMD_BAT="\\  BuildTools\\  VC\\  Auxiliary\\  Build\ \ vcvars64.bat" 
480470RUN powershell Set-Content 'build.bat' -value 'call %VS_DEVCMD_BAT%',(Get-Content 'build.bat') 
481471RUN build.bat --cmake_generator "Visual Studio 17 2022" --config Release --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=75;80;86;90" --skip_submodule_sync --parallel --build_shared_lib --compile_no_warning_as_error --skip_tests --update --build --build_dir /workspace/build {} 
482472""" .format (
@@ -559,12 +549,8 @@ def preprocess_gpu_flags():
559549            FLAGS .tensorrt_home  =  "/tensorrt" 
560550    else :
561551        if  "CUDNN_VERSION"  in  os .environ :
562-             version  =  None 
563-             m  =  re .match (r"([0-9]\.[0-9])\.[0-9]\.[0-9]" , os .environ ["CUDNN_VERSION" ])
564-             if  m :
565-                 version  =  m .group (1 )
566552            if  FLAGS .cudnn_home  is  None :
567-                 FLAGS .cudnn_home  =  "/usr/local/cudnn-{}/cuda"  . format ( version ) 
553+                 FLAGS .cudnn_home  =  "/usr"  
568554
569555        if  FLAGS .cuda_home  is  None :
570556            FLAGS .cuda_home  =  "/usr/local/cuda" 
@@ -611,6 +597,7 @@ def preprocess_gpu_flags():
611597        default = None ,
612598        help = 'Target for build, can be "linux", "windows", "rhel", or "igpu". If not specified, build targets the current platform.' ,
613599    )
600+ 
614601    parser .add_argument (
615602        "--cuda-version" , type = str , required = False , help = "Version for CUDA." 
616603    )
0 commit comments