Update 'gen_ort_dockerfile.py' fil to meet changes in ONNX Runtime 1.20.x

Author: mc-nv

tools/gen_ort_dockerfile.py

@@ -157,16 +157,8 @@ def dockerfile_for_linux(output_file):
     && apt-get install -y --no-install-recommends cmake=3.28.3* cmake-data=3.28.3* \\
     && cmake --version
 
-"""
-    if FLAGS.enable_gpu:
-        df += """
-# Allow configure to pick up cuDNN where it expects it.
-# (Note: $CUDNN_VERSION is defined by base image)
-RUN _CUDNN_VERSION=$(echo $CUDNN_VERSION | cut -d. -f1-2) && \
-    mkdir -p /usr/local/cudnn-$_CUDNN_VERSION/cuda/include && \
-    ln -s /usr/include/cudnn.h /usr/local/cudnn-$_CUDNN_VERSION/cuda/include/cudnn.h && \
-    mkdir -p /usr/local/cudnn-$_CUDNN_VERSION/cuda/lib64 && \
-    ln -s /etc/alternatives/libcudnn_so /usr/local/cudnn-$_CUDNN_VERSION/cuda/lib64/libcudnn.so
+RUN python3 -m pip install psutil
+
 """
 
     if FLAGS.ort_openvino is not None:
@@ -287,7 +279,7 @@ def dockerfile_for_linux(output_file):
 
     df += """
 WORKDIR /workspace/onnxruntime
-ARG COMMON_BUILD_ARGS="--config ${{ONNXRUNTIME_BUILD_CONFIG}} --skip_submodule_sync --parallel --build_shared_lib \
+ARG COMMON_BUILD_ARGS="--config ${{ONNXRUNTIME_BUILD_CONFIG}} --skip_submodule_sync --parallel 2 --build_shared_lib \
     --compile_no_warning_as_error --build_dir /workspace/build --cmake_extra_defines CMAKE_CUDA_ARCHITECTURES='{}' "
 """.format(
         cuda_archs
@@ -395,7 +387,7 @@ def dockerfile_for_linux(output_file):
 """
     df += """
 RUN cd /opt/onnxruntime/lib && \
-    for i in `find . -mindepth 1 -maxdepth 1 -type f -name '*\.so*'`; do \
+    for i in `find . -mindepth 1 -maxdepth 1 -type f -name '*\\.so*'`; do \
         patchelf --set-rpath '$ORIGIN' $i; \
     done
 
@@ -476,7 +468,7 @@ def dockerfile_for_windows(output_file):
 
     df += """
 WORKDIR /workspace/onnxruntime
-ARG VS_DEVCMD_BAT="\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+ARG VS_DEVCMD_BAT="\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat"
 RUN powershell Set-Content 'build.bat' -value 'call %VS_DEVCMD_BAT%',(Get-Content 'build.bat')
 RUN 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 {}
 """.format(
@@ -559,12 +551,8 @@ def preprocess_gpu_flags():
             FLAGS.tensorrt_home = "/tensorrt"
     else:
         if "CUDNN_VERSION" in os.environ:
-            version = None
-            m = re.match(r"([0-9]\.[0-9])\.[0-9]\.[0-9]", os.environ["CUDNN_VERSION"])
-            if m:
-                version = m.group(1)
             if FLAGS.cudnn_home is None:
-                FLAGS.cudnn_home = "/usr/local/cudnn-{}/cuda".format(version)
+                FLAGS.cudnn_home = "/usr"
 
         if FLAGS.cuda_home is None:
             FLAGS.cuda_home = "/usr/local/cuda"
@@ -573,13 +561,13 @@ def preprocess_gpu_flags():
             print("error: linux build requires --cudnn-home and --cuda-home")
 
         if FLAGS.tensorrt_home is None:
-            if target_platform() == "rhel":
-                if platform.machine().lower() == "aarch64":
-                    FLAGS.tensorrt_home = "/usr/local/cuda/targets/sbsa-linux/"
-                else:
-                    FLAGS.tensorrt_home = "/usr/local/cuda/targets/x86_64-linux/"
-            else:
-                FLAGS.tensorrt_home = "/usr/src/tensorrt"
+          if target_platform() == "rhel":
+              if platform.machine().lower() == "aarch64":
+                  FLAGS.tensorrt_home = "/usr/local/cuda/targets/sbsa-linux/"
+              else:
+                  FLAGS.tensorrt_home = "/usr/local/cuda/targets/x86_64-linux/"
+          else:
+              FLAGS.tensorrt_home = "/usr/src/tensorrt"
 
 
 if __name__ == "__main__":
@@ -609,8 +597,9 @@ def preprocess_gpu_flags():
         "--target-platform",
         required=False,
         default=None,
-        help='Target for build, can be "linux", "windows", "rhel", or "igpu". If not specified, build targets the current platform.',
+        help='Target for build, can be "linux", "windows" or "igpu". If not specified, build targets the current platform.',
     )
+
     parser.add_argument(
         "--cuda-version", type=str, required=False, help="Version for CUDA."
     )
@@ -667,4 +656,4 @@ def preprocess_gpu_flags():
             FLAGS.ort_openvino = None
         dockerfile_for_windows(FLAGS.output)
     else:
-        dockerfile_for_linux(FLAGS.output)
+        dockerfile_for_linux(FLAGS.output)