diff options
| author | knarf <knarf@043a8217-7a68-40fe-abfd-36aa7d4fa6a8> | 2013-12-16 20:09:28 +0000 |
|---|---|---|
| committer | knarf <knarf@043a8217-7a68-40fe-abfd-36aa7d4fa6a8> | 2013-12-16 20:09:28 +0000 |
| commit | d090650838a08623e100496796f4ef40994e5b3a (patch) | |
| tree | 0fa99d854cb2dae62f90dcac40afe72924aded3b | |
| parent | 293b97e8d167876de31e695ecb32d260b506a1e0 (diff) | |
backport upstream build fix from svn rev29754: fixed build error when the CUDA runtime API wrapper are enabled and CUPTI is disabled
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@37 043a8217-7a68-40fe-abfd-36aa7d4fa6a8
| -rwxr-xr-x | configure.sh | 3 | ||||
| -rw-r--r-- | dist/cuda_build_fix__svn29754 | 35 |
2 files changed, 37 insertions, 1 deletions
diff --git a/configure.sh b/configure.sh index 8c5e0c5..2716cb4 100755 --- a/configure.sh +++ b/configure.sh @@ -155,9 +155,10 @@ then pushd ${BUILD_DIR} ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz ${PATCH?} -p0 < ${SRCDIR}/dist/default_outfile-1.6.5.patch + cd ${NAME} + ${PATCH?} -p0 < ${SRCDIR}/dist/cuda_build_fix__svn29754 echo "MPI: Configuring..." - cd ${NAME} # Cannot have a memory manager with a static library on some # systems (e.g. Linux); see # <http://www.open-mpi.org/faq/?category=mpi-apps#static-mpi-apps> diff --git a/dist/cuda_build_fix__svn29754 b/dist/cuda_build_fix__svn29754 new file mode 100644 index 0000000..5447ddc --- /dev/null +++ b/dist/cuda_build_fix__svn29754 @@ -0,0 +1,35 @@ +Index: ompi/contrib/vt/vt/vtlib/vt_cudart.c +=================================================================== +--- ompi/contrib/vt/vt/vtlib/vt_cudart.c (revision 29753) ++++ ompi/contrib/vt/vt/vtlib/vt_cudart.c (revision 29754) +@@ -2722,7 +2722,10 @@ + /* get an already created unused event */ + kernel->evt = vtDev->evtbuf_pos; + +- if(!vt_cupti_events_enabled){ ++#if defined(VT_CUPTI_EVENTS) ++ if(!vt_cupti_events_enabled) ++#endif ++ { + /* increment buffers */ + vtDev->evtbuf_pos++; + vtDev->buf_pos += sizeof(VTCUDAKernel); +Index: ompi/contrib/vt/vt/ChangeLog +=================================================================== +--- ompi/contrib/vt/vt/ChangeLog (revision 29753) ++++ ompi/contrib/vt/vt/ChangeLog (revision 29754) +@@ -3,6 +3,8 @@ + - removed non-posix call to length(array) in AWK script for generating + the C MPI wrapper functions + - fixed potential buffer overflow when reading the filter file ++ - fixed build error when the CUDA runtime API wrapper are enabled and ++ CUPTI is disabled + - enabled access to CUPTI counters for CUDA tracing via CUPTI + - enabled GPU memory usage tracing independent of the CUDA API + - enabled recording of CUDA synchronization and implicit synchronization in + +Property changes on: ompi/contrib/vt/vt +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /vendor/vampirtrace/current:r29732-29753 + |