Commit 92914bca authored by Alexander Breuer's avatar Alexander Breuer

Fixed Mac OS X specific issues (CUDA) in the build script.

parent fbf9fdf1
...@@ -33,6 +33,7 @@ CUDA Tool for SCons ...@@ -33,6 +33,7 @@ CUDA Tool for SCons
breuera - changes (see original: http://www.scons.org/wiki/CudaTool) breuera - changes (see original: http://www.scons.org/wiki/CudaTool)
* commented out *.linkinfo * commented out *.linkinfo
* lib64 instead of lib * lib64 instead of lib
* removed unnecessary SDK, "cudaSDKPath + '/lib64', cudaSDKPath + '/common/lib64' + cudaSDKSubLibDir, ", from LIBSPATH
*** ***
""" """
...@@ -172,7 +173,7 @@ def generate(env): ...@@ -172,7 +173,7 @@ def generate(env):
# add required libraries # add required libraries
env.Append(CPPPATH=[cudaSDKPath + '/common/inc', cudaToolkitPath + '/include']) env.Append(CPPPATH=[cudaSDKPath + '/common/inc', cudaToolkitPath + '/include'])
env.Append(LIBPATH=[cudaSDKPath + '/lib64', cudaSDKPath + '/common/lib64' + cudaSDKSubLibDir, cudaToolkitPath + '/lib64']) env.Append(LIBPATH=[cudaToolkitPath + '/lib64'])
env.Append(LIBS=['cudart']) env.Append(LIBS=['cudart'])
def exists(env): def exists(env):
......
...@@ -190,6 +190,10 @@ if env['parallelization'] in ['cuda', 'mpi_with_cuda']: ...@@ -190,6 +190,10 @@ if env['parallelization'] in ['cuda', 'mpi_with_cuda']:
env.Append(NVCCFLAGS=' --gpu-architecture=') env.Append(NVCCFLAGS=' --gpu-architecture=')
env.Append(NVCCFLAGS=env['computeCapability']) env.Append(NVCCFLAGS=env['computeCapability'])
# compile explicitly with 64-bit on Mac OS X
if env['PLATFORM'] == 'darwin':
env.Append(NVCCFLAGS=' -m64')
# set the precompiler flags for MPI (CUDA) # set the precompiler flags for MPI (CUDA)
if env['parallelization'] in ['mpi_with_cuda']: if env['parallelization'] in ['mpi_with_cuda']:
env.Append(NVCCFLAGS=' -DUSEMPI') env.Append(NVCCFLAGS=' -DUSEMPI')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment