From 672b7113d7db057943254447a6d0295087cc634a Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 11 Aug 2016 11:35:42 -0400
Subject: [PATCH] CUDA8 support on rhel7.2 and rhel7.3

---
 .../xcat/install/rh/cudafull.rhels7.ppc64le.pkglist      | 2 +-
 .../xcat/install/rh/cudaruntime.rhels7.ppc64le.pkglist   | 6 +++++-
 .../share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist   | 3 +++
 .../netboot/rh/cudafull.rhels7.ppc64le.otherpkgs.pkglist | 2 +-
 .../rh/cudaruntime.rhels7.ppc64le.otherpkgs.pkglist      | 6 +++++-
 xCAT/postscripts/config_cuda                             | 9 ++++-----
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/xCAT-server/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist
index b08d9ac4d..c7f35565a 100644
--- a/xCAT-server/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist
+++ b/xCAT-server/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist
@@ -1,6 +1,6 @@
 #INCLUDE:compute.rhels7.pkglist#
 
-#For Cuda 7.5
+#For Cuda 
 kernel-devel
 gcc
 pciutils
diff --git a/xCAT-server/share/xcat/install/rh/cudaruntime.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/install/rh/cudaruntime.rhels7.ppc64le.pkglist
index 1efe75819..a48175537 100644
--- a/xCAT-server/share/xcat/install/rh/cudaruntime.rhels7.ppc64le.pkglist
+++ b/xCAT-server/share/xcat/install/rh/cudaruntime.rhels7.ppc64le.pkglist
@@ -1,9 +1,13 @@
 #INCLUDE:compute.rhels7.pkglist#
 
-#For Cuda 7.5
+#For Cuda
 kernel-devel
 gcc
 pciutils
 dkms
+#To install cuda-runtime, need to specify the version
+#if want to install cuda-runtime-8-0, uncomment it,
+#then comment out cuda-runtime-7-5
+#cuda-runtime-8-0
 cuda-runtime-7-5
 
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist
index 2a7c348d3..6c101ad23 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels7.ppc64.pkglist
@@ -27,3 +27,6 @@ net-tools
 gzip
 tar
 xz
+grub2
+grub2-tools
+bzip2
diff --git a/xCAT-server/share/xcat/netboot/rh/cudafull.rhels7.ppc64le.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rh/cudafull.rhels7.ppc64le.otherpkgs.pkglist
index bbb7cc418..01f740b46 100644
--- a/xCAT-server/share/xcat/netboot/rh/cudafull.rhels7.ppc64le.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/cudafull.rhels7.ppc64le.otherpkgs.pkglist
@@ -1,5 +1,5 @@
 
-#For Cuda 7.5
+#For Cuda
 kernel-devel
 gcc
 pciutils
diff --git a/xCAT-server/share/xcat/netboot/rh/cudaruntime.rhels7.ppc64le.otherpkgs.pkglist b/xCAT-server/share/xcat/netboot/rh/cudaruntime.rhels7.ppc64le.otherpkgs.pkglist
index 8a5acb857..12c60f80a 100644
--- a/xCAT-server/share/xcat/netboot/rh/cudaruntime.rhels7.ppc64le.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/netboot/rh/cudaruntime.rhels7.ppc64le.otherpkgs.pkglist
@@ -1,8 +1,12 @@
 
-#For Cuda 7.5
+#For Cuda
 kernel-devel
 gcc
 pciutils
 dkms
+#To install cuda-runtime, need to specify the version
+#if want to install cuda-runtime-8-0, uncomment it,
+#then comment out cuda-runtime-7-5
+#cuda-runtime-8-0
 cuda-runtime-7-5
 
diff --git a/xCAT/postscripts/config_cuda b/xCAT/postscripts/config_cuda
index 42d98b3b9..db4ee9fb8 100755
--- a/xCAT/postscripts/config_cuda
+++ b/xCAT/postscripts/config_cuda
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-# set the paths required for cuda7.5
-CUDA_VER="cuda-7.5"
-FILENAME="/etc/profile.d/xcat-${CUDA_VER}.sh"
+# set the paths required for cuda
+FILENAME="/etc/profile.d/xcat-cuda.sh"
 
-echo "export PATH=/usr/local/${CUDA_VER}/bin:\$PATH" > ${FILENAME}
-echo "export LD_LIBRARY_PATH=/usr/local/${CUDA_VER}/lib64:\$LD_LIBRARY_PATH" >> ${FILENAME}
+echo "export PATH=/usr/local/cuda/bin:\$PATH" > ${FILENAME}
+echo "export LD_LIBRARY_PATH=/usr/local/cuda/lib64:\$LD_LIBRARY_PATH" >> ${FILENAME}