yezhengmao/nccl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #69 from cwhipkey/master

Browse Source 
Qualify nullptr_t with std::
This commit is contained in:
Sylvain Jeaugey 2017-02-08 09:17:50 -08:00 committed by GitHub
commit 024d1e2678
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/primitives.h
View File

@ -101,7 +101,7 @@ Tptr ptradd(Tptr ptr, int i) {
} }
__device__ __forceinline__ __device__ __forceinline__
nullptr_t ptradd(nullptr_t ptr, int i) { std::nullptr_t ptradd(std::nullptr_t ptr, int i) {
return nullptr; return nullptr;
} }
@ -120,8 +120,8 @@ class Primitives {
DST2_T dst2, DST2_T dst2,
int len, int maxoffset, int step, SYNC_Ts... flags) { int len, int maxoffset, int step, SYNC_Ts... flags) {
enum { noSrc2 = std::is_same<SRC2_T, nullptr_t>::value }; enum { noSrc2 = std::is_same<SRC2_T, std::nullptr_t>::value };
enum { noDst2 = std::is_same<DST2_T, nullptr_t>::value }; enum { noDst2 = std::is_same<DST2_T, std::nullptr_t>::value };
static_assert(noSrc2 || std::is_same<SRC2_T, const T*>::value, static_assert(noSrc2 || std::is_same<SRC2_T, const T*>::value,
"src2 must be of type T* or nullptr_t"); "src2 must be of type T* or nullptr_t");
static_assert(noDst2 || std::is_same<DST2_T, T*>::value, static_assert(noDst2 || std::is_same<DST2_T, T*>::value,
@ -146,8 +146,8 @@ class Primitives {
THREADS, THREADS,
OpType, OpType,
T, T,
!std::is_same<DST2_T, nullptr_t>::value, // HAS_DEST1 !std::is_same<DST2_T, std::nullptr_t>::value, // HAS_DEST1
!std::is_same<SRC2_T, nullptr_t>::value // HAS_SRC1 !std::is_same<SRC2_T, std::nullptr_t>::value // HAS_SRC1
> >
( (
threadIdx.x, threadIdx.x,