Skip to content
This repository was archived by the owner on Mar 21, 2024. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ elif master_env['PLATFORM'] == 'darwin':
master_env['ENV'].setdefault('DYLD_LIBRARY_PATH', []).append(cuda_installation()[1])
elif master_env['PLATFORM'] == 'win32':
master_env['ENV']['TBBROOT'] = os.environ['TBBROOT']
master_env['ENV']['PATH'] += ';' + tbb_installation(master_env)[0]

# get the list of requested backends
host_backends = master_env.subst('$host_backend').split()
Expand Down
14 changes: 14 additions & 0 deletions thrust/system/cuda/detail/tag.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,34 @@ inline Tag select_system(thrust::any_system_tag, Tag)
return Tag();
}

// this version catches a user's tag derived from cuda::tag in the first slot
template<typename Tag>
__host__ __device__
inline cuda_to_cpp select_system(Tag, thrust::system::cpp::tag)
{
return cuda_to_cpp();
}

__host__ __device__
inline cuda_to_cpp select_system(tag, thrust::system::cpp::tag)
{
return cuda_to_cpp();
}

// this version catches a user's tag derived from cuda::tag in the second slot
template<typename Tag>
__host__ __device__
inline cpp_to_cuda select_system(thrust::system::cpp::tag, Tag)
{
return cpp_to_cuda();
}

__host__ __device__
inline cpp_to_cuda select_system(thrust::system::cpp::tag, tag)
{
return cpp_to_cuda();
}

} // end detail

// alias the tag here
Expand Down