From 7b51af405ddc3722881fd2e86bea77e5dedcec47 Mon Sep 17 00:00:00 2001
From: Lijun Zhu <ljzhu@gps.caltech.edu>
Date: Thu, 15 Apr 2021 00:40:16 -0700
Subject: [PATCH] cuda Scons fix: remove unnecessary -lcuda which prevents
 compiling on cluster head node without cuda drivers

---
 components/zerodop/GPUgeo2rdr/src/SConscript   | 6 +++---
 components/zerodop/GPUresampslc/src/SConscript | 2 +-
 components/zerodop/GPUtopozero/src/SConscript  | 4 ++--
 contrib/PyCuAmpcor/SConscript                  | 2 +-
 scons_tools/cuda.py                            | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/zerodop/GPUgeo2rdr/src/SConscript b/components/zerodop/GPUgeo2rdr/src/SConscript
index 623955a0..23759410 100644
--- a/components/zerodop/GPUgeo2rdr/src/SConscript
+++ b/components/zerodop/GPUgeo2rdr/src/SConscript
@@ -3,7 +3,7 @@
 import os
 
 Import('envGPUgeo2rdr')
-package = envGPUgeo2rdr['PACKAGE'] 
+package = envGPUgeo2rdr['PACKAGE']
 project = envGPUgeo2rdr['PROJECT']
 install = envGPUgeo2rdr['PRJ_SCONS_INSTALL'] + '/' + package + '/' + project
 build = envGPUgeo2rdr['PRJ_SCONS_BUILD'] + '/' + package + '/' + project + '/src'
@@ -11,7 +11,7 @@ build = envGPUgeo2rdr['PRJ_SCONS_BUILD'] + '/' + package + '/' + project + '/src
 if envGPUgeo2rdr['GPU_ACC_ENABLED']:
     envGPUgeo2rdr.AppendUnique(CPPPATH=envGPUgeo2rdr['CUDACPPPATH'])
     envGPUgeo2rdr.AppendUnique(LIBPATH=envGPUgeo2rdr['CUDALIBPATH'])
-    envGPUgeo2rdr.AppendUnique(LIBS=['cuda','cudart'])
+    envGPUgeo2rdr.AppendUnique(LIBS=['cudart'])
 
 
 ###Custom cython builder
@@ -24,7 +24,7 @@ def cythonPseudoBuilder(env,source,bld,inst):
     cppCode = env.Pyx2Cpp(source)
     listFiles = [source+'.cpp', 'Ellipsoid.cpp', 'Geo2rdr.cpp', 'GeoController.cpp', 'LinAlg.cpp', 'Orbit.cpp', 'Poly1d.cpp']
     env.MergeFlags('-fopenmp -O3 -std=c++11 -fPIC -pthread -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -Wall -Wstrict-prototypes')
-    
+
     if (env['GPU_ACC_ENABLED']):
         listFiles.append('GPUgeo.cu')
         lib = env.LoadableModule(target = 'GPUgeo2rdr.abi3.so', source = listFiles, CPPDEFINES = 'GPU_ACC_ENABLED')
diff --git a/components/zerodop/GPUresampslc/src/SConscript b/components/zerodop/GPUresampslc/src/SConscript
index eba18fdf..a5046e73 100644
--- a/components/zerodop/GPUresampslc/src/SConscript
+++ b/components/zerodop/GPUresampslc/src/SConscript
@@ -11,7 +11,7 @@ build = envGPUresampslc['PRJ_SCONS_BUILD'] + '/' + package + '/' + project + '/s
 if envGPUresampslc['GPU_ACC_ENABLED']:
     envGPUresampslc.AppendUnique(CPPPATH=envGPUresampslc['CUDACPPPATH'])
     envGPUresampslc.AppendUnique(LIBPATH=envGPUresampslc['CUDALIBPATH'])
-    envGPUresampslc.AppendUnique(LIBS=['cuda','cudart'])
+    envGPUresampslc.AppendUnique(LIBS=['cudart'])
 
 
 ###Custom cython builder
diff --git a/components/zerodop/GPUtopozero/src/SConscript b/components/zerodop/GPUtopozero/src/SConscript
index b123502f..6d4c088e 100644
--- a/components/zerodop/GPUtopozero/src/SConscript
+++ b/components/zerodop/GPUtopozero/src/SConscript
@@ -3,7 +3,7 @@
 import os
 
 Import('envGPUtopozero')
-package = envGPUtopozero['PACKAGE'] 
+package = envGPUtopozero['PACKAGE']
 project = envGPUtopozero['PROJECT']
 install = envGPUtopozero['PRJ_SCONS_INSTALL'] + '/' + package + '/' + project
 build = envGPUtopozero['PRJ_SCONS_BUILD'] + '/' + package + '/' + project + '/src'
@@ -11,7 +11,7 @@ build = envGPUtopozero['PRJ_SCONS_BUILD'] + '/' + package + '/' + project + '/sr
 if envGPUtopozero['GPU_ACC_ENABLED']:
     envGPUtopozero.AppendUnique(CPPPATH=envGPUtopozero['CUDACPPPATH'])
     envGPUtopozero.AppendUnique(LIBPATH=envGPUtopozero['CUDALIBPATH'])
-    envGPUtopozero.AppendUnique(LIBS=['cuda','cudart'])
+    envGPUtopozero.AppendUnique(LIBS=['cudart'])
 
 ###Custom cython builder
 cythonBuilder = Builder(action = 'cython3 $SOURCE --cplus',
diff --git a/contrib/PyCuAmpcor/SConscript b/contrib/PyCuAmpcor/SConscript
index 227a34fe..0b232b35 100644
--- a/contrib/PyCuAmpcor/SConscript
+++ b/contrib/PyCuAmpcor/SConscript
@@ -14,7 +14,7 @@ Export('envPyCuAmpcor')
 if envPyCuAmpcor['GPU_ACC_ENABLED']:
     envPyCuAmpcor.Append(CPPPATH=envPyCuAmpcor['CUDACPPPATH'])
     envPyCuAmpcor.Append(LIBPATH=envPyCuAmpcor['CUDALIBPATH'])
-    envPyCuAmpcor.Append(LIBS=['cuda','cudart','cufft','cublas'])
+    envPyCuAmpcor.Append(LIBS=['cudart','cufft','cublas'])
     build = envPyCuAmpcor['PRJ_SCONS_BUILD'] + '/' + package + '/' + project
 
 #    includeScons = os.path.join('include','SConscript')
diff --git a/scons_tools/cuda.py b/scons_tools/cuda.py
index 4edaf12f..19b0bba4 100644
--- a/scons_tools/cuda.py
+++ b/scons_tools/cuda.py
@@ -52,7 +52,7 @@ def generate(env):
     # default flags for the NVCC compiler
     env['STATICNVCCFLAGS'] = ''
     env['SHAREDNVCCFLAGS'] = ''
-    env['ENABLESHAREDNVCCFLAG'] = '-std=c++11 -shared -Xcompiler -fPIC -I/opt/conda/include'
+    env['ENABLESHAREDNVCCFLAG'] = '-std=c++11 -shared -Xcompiler -fPIC'
 
     # default NVCC commands
     env['STATICNVCCCMD'] = '$NVCC -o $TARGET -c $NVCCFLAGS $STATICNVCCFLAGS $SOURCES'