Cleanup for gh install on rhel

mlcommons · Mar 4, 2024 · 61c23e2 · 61c23e2
1 parent 29b3c95
commit 61c23e2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/cm-mlops/script/get-generic-sys-util/_cm.json b/cm-mlops/script/get-generic-sys-util/_cm.json
@@ -291,7 +291,16 @@
           "dnf": "numactl-devel",
           "yum": "numactl-devel"
         }
-      }
+      },
+      "deps": [
+        {
+	  "tags": "install,numactl,from.src",
+	  "enable_if_env": {
+            "CM_HOST_OS_FLAVOR": [ "rhel" ],
+	    "CM_HOST_OS_VERSION": [ "9.1", "9.2", "9.3" ]
+	  }
+	}
+      ]
     },
     "g++-12": {
       "env": {

diff --git a/cm-mlops/script/get-generic-sys-util/customize.py b/cm-mlops/script/get-generic-sys-util/customize.py
@@ -42,8 +42,12 @@ def preprocess(i):
     env['CM_SYS_UTIL_INSTALL_CMD'] = sudo + ' ' +install_cmd + ' ' + package_name
 
     env['+PATH'] = []
+
     if env.get('CM_HOST_OS_FLAVOR', '') == 'rhel':
         if env['CM_SYS_UTIL_NAME'] == "g++12":
             env['+PATH'] = [ "/opt/rh/gcc-toolset-12/root/usr/bin" ]
 
+        if env['CM_SYS_UTIL_NAME'] == "numactl" and env['CM_HOST_OS_VERSION'] in [ "9.1", "9.2", "9.3" ]:
+            env['CM_SYS_UTIL_INSTALL_CMD'] = ''
+
     return {'return':0}
diff --git a/cm-mlops/script/install-github-cli/run-rhel.sh b/cm-mlops/script/install-github-cli/run-rhel.sh
@@ -1,3 +1,3 @@
-sudo dnf install 'dnf-command(config-manager)'
+sudo dnf install -y 'dnf-command(config-manager)'
 sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo
-sudo dnf install gh
+sudo dnf install -y gh
diff --git a/cm-mlops/script/install-llvm-src/_cm.json b/cm-mlops/script/install-llvm-src/_cm.json
@@ -278,7 +278,7 @@
            "tags": "get,generic-python-lib,_custom-python,_package.torch,_url.git+https://github.com/pytorch/pytorch.git@927dc662386af052018212c7d01309a506fc94cd",
            "env": {
              "CM_PYTHON_BIN_WITH_PATH": "<<<CM_CONDA_BIN_PATH>>>/python3",
-             "+ CXXFLAGS": [ "-Wno-nonnull" ]
+             "+ CXXFLAGS": [ "-Wno-nonnull", "-Wno-maybe-uninitialized", "-Wno-uninitialized", "-Wno-free-nonheap-object" ]
            }
         },
         {