ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5537 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2011-01-12 15:24:04 +00:00
parent 9cd3b0f28d
commit 8f2257ecbf
41 changed files with 351 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/gpu/geryon/nvc_device.h
View File

@ -13,7 +13,7 @@
copyright : (C) 2009 by W. Michael Brown
email : brownw@ornl.gov
***************************************************************************/
/* -----------------------------------------------------------------------
Copyright (2009) Sandia Corporation. Under the terms of Contract
DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
@ -95,7 +95,7 @@ class UCL_Device {
/** \note You cannot delete the default stream **/
inline void pop_command_queue() {
if (_cq.size()<2) return;
CUDA_SAFE_CALL_NS(cudaStreamDestroy(_cq.back()));
CUDA_DESTRUCT_CALL_NS(cudaStreamDestroy(_cq.back()));
_cq.pop_back();
}
@ -290,7 +290,7 @@ inline void UCL_Device::print_all(std::ostream &out) {
else
out << "Unknown\n";
#endif
#if CUDART_VERSION >= 3000
#if CUDART_VERSION >= 3010
out << " Concurrent kernel execution: ";
if (_properties[i].concurrentKernels)
out << "Yes\n";