KJ135
/
ISCE_INSAR
mirror of http://172.16.0.12:5000/WBJY/ISCE_INSAR.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #272 from lijun99/cuda_fix 

cuda Scons fix: remove unnecessary -lcuda which prevents compiling on…
LT1AB
Ryan Burns 2021-05-17 12:06:19 -07:00 committed by GitHub
parent 19b754dd1a 7b51af405d
commit 673dc04fcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/zerodop/GPUgeo2rdr/src/SConscript
View File

@ -11,7 +11,7 @@ build = envGPUgeo2rdr['PRJ_SCONS_BUILD'] + '/' + package + '/' + project + '/src
if envGPUgeo2rdr['GPU_ACC_ENABLED']: if envGPUgeo2rdr['GPU_ACC_ENABLED']:
envGPUgeo2rdr.AppendUnique(CPPPATH=envGPUgeo2rdr['CUDACPPPATH']) envGPUgeo2rdr.AppendUnique(CPPPATH=envGPUgeo2rdr['CUDACPPPATH'])
envGPUgeo2rdr.AppendUnique(LIBPATH=envGPUgeo2rdr['CUDALIBPATH']) envGPUgeo2rdr.AppendUnique(LIBPATH=envGPUgeo2rdr['CUDALIBPATH'])
envGPUgeo2rdr.AppendUnique(LIBS=['cuda','cudart']) envGPUgeo2rdr.AppendUnique(LIBS=['cudart'])
###Custom cython builder ###Custom cython builder

2
components/zerodop/GPUresampslc/src/SConscript
View File

@ -11,7 +11,7 @@ build = envGPUresampslc['PRJ_SCONS_BUILD'] + '/' + package + '/' + project + '/s
if envGPUresampslc['GPU_ACC_ENABLED']: if envGPUresampslc['GPU_ACC_ENABLED']:
envGPUresampslc.AppendUnique(CPPPATH=envGPUresampslc['CUDACPPPATH']) envGPUresampslc.AppendUnique(CPPPATH=envGPUresampslc['CUDACPPPATH'])
envGPUresampslc.AppendUnique(LIBPATH=envGPUresampslc['CUDALIBPATH']) envGPUresampslc.AppendUnique(LIBPATH=envGPUresampslc['CUDALIBPATH'])
envGPUresampslc.AppendUnique(LIBS=['cuda','cudart']) envGPUresampslc.AppendUnique(LIBS=['cudart'])
###Custom cython builder ###Custom cython builder

2
components/zerodop/GPUtopozero/src/SConscript
View File

@ -11,7 +11,7 @@ build = envGPUtopozero['PRJ_SCONS_BUILD'] + '/' + package + '/' + project + '/sr
if envGPUtopozero['GPU_ACC_ENABLED']: if envGPUtopozero['GPU_ACC_ENABLED']:
envGPUtopozero.AppendUnique(CPPPATH=envGPUtopozero['CUDACPPPATH']) envGPUtopozero.AppendUnique(CPPPATH=envGPUtopozero['CUDACPPPATH'])
envGPUtopozero.AppendUnique(LIBPATH=envGPUtopozero['CUDALIBPATH']) envGPUtopozero.AppendUnique(LIBPATH=envGPUtopozero['CUDALIBPATH'])
envGPUtopozero.AppendUnique(LIBS=['cuda','cudart']) envGPUtopozero.AppendUnique(LIBS=['cudart'])
###Custom cython builder ###Custom cython builder
cythonBuilder = Builder(action = 'cython3 $SOURCE --cplus', cythonBuilder = Builder(action = 'cython3 $SOURCE --cplus',

2
contrib/PyCuAmpcor/SConscript
View File

@ -14,7 +14,7 @@ Export('envPyCuAmpcor')
if envPyCuAmpcor['GPU_ACC_ENABLED']: if envPyCuAmpcor['GPU_ACC_ENABLED']:
envPyCuAmpcor.Append(CPPPATH=envPyCuAmpcor['CUDACPPPATH']) envPyCuAmpcor.Append(CPPPATH=envPyCuAmpcor['CUDACPPPATH'])
envPyCuAmpcor.Append(LIBPATH=envPyCuAmpcor['CUDALIBPATH']) 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 build = envPyCuAmpcor['PRJ_SCONS_BUILD'] + '/' + package + '/' + project
# includeScons = os.path.join('include','SConscript') # includeScons = os.path.join('include','SConscript')

2
scons_tools/cuda.py
View File

@ -52,7 +52,7 @@ def generate(env):
# default flags for the NVCC compiler # default flags for the NVCC compiler
env['STATICNVCCFLAGS'] = '' env['STATICNVCCFLAGS'] = ''
env['SHAREDNVCCFLAGS'] = '' 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 # default NVCC commands
env['STATICNVCCCMD'] = '$NVCC -o $TARGET -c $NVCCFLAGS $STATICNVCCFLAGS $SOURCES' env['STATICNVCCCMD'] = '$NVCC -o $TARGET -c $NVCCFLAGS $STATICNVCCFLAGS $SOURCES'