From 011a923229acdd365145a1043628a32df479ccc6 Mon Sep 17 00:00:00 2001
From: Arjun Suresh <arjunsuresh1987@gmail.com>
Date: Mon, 11 Mar 2024 01:44:26 +0530
Subject: [PATCH] Fixes for nvidia-docker

---
 cm-mlops/script/build-mlperf-inference-server-nvidia/_cm.yaml | 4 ++--
 cm-mlops/script/get-generic-python-lib/install.sh             | 2 +-
 cm-mlops/script/run-docker-container/customize.py             | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cm-mlops/script/build-mlperf-inference-server-nvidia/_cm.yaml b/cm-mlops/script/build-mlperf-inference-server-nvidia/_cm.yaml
index b7d2408b30..e805072090 100644
--- a/cm-mlops/script/build-mlperf-inference-server-nvidia/_cm.yaml
+++ b/cm-mlops/script/build-mlperf-inference-server-nvidia/_cm.yaml
@@ -236,8 +236,8 @@ docker:
     - tags: get,mlperf,inference,submission,dir
     - tags: get,nvidia-docker
   pre_run_cmds:
-    - cm pull repo mlcommons@ck
-  run_cmd_prefix: sudo apt remove -y cmake && cm pull repo mlcommons@ck
+    - cm pull repo
+  run_cmd_prefix: sudo apt remove -y cmake
   mounts:
    - "${{ IMAGENET_PATH }}:/data/imagenet-val"
    - "${{ CM_MLPERF_INFERENCE_RESULTS_DIR }}:${{ CM_MLPERF_INFERENCE_RESULTS_DIR }}"
diff --git a/cm-mlops/script/get-generic-python-lib/install.sh b/cm-mlops/script/get-generic-python-lib/install.sh
index 5d2614bf24..517a4e7288 100644
--- a/cm-mlops/script/get-generic-python-lib/install.sh
+++ b/cm-mlops/script/get-generic-python-lib/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [[ ${CM_GENERIC_PYTHON_PACKAGE_VARIANT} == "nvidia-apex" ]]; then
+if [[ ${CM_GENERIC_PYTHON_PACKAGE_VARIANT} == "nvidia-apex-depreciated" ]]; then
   cd ${CM_GIT_REPO_CHECKOUT_PATH}
   cmd="${CM_PYTHON_BIN_WITH_PATH} -m pip install -v --disable-pip-version-check --global-option=\"--cpp_ext\" --global-option=\"--cuda_ext\" ./"
   echo $cmd
diff --git a/cm-mlops/script/run-docker-container/customize.py b/cm-mlops/script/run-docker-container/customize.py
index cfaa7d7730..8348ce0ce6 100644
--- a/cm-mlops/script/run-docker-container/customize.py
+++ b/cm-mlops/script/run-docker-container/customize.py
@@ -113,6 +113,7 @@ def postprocess(i):
             run_cmds.append(post_run_cmd)
 
     run_cmd = " && ".join(run_cmds)
+    run_cmd = run_cmd.replace("--docker_run_deps", "")
 
     if mount_cmds:
         for mount_cmd in mount_cmds: