Skip to content

Unbreaking compilation errors #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmikushin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Unbreaking compilation errors #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions thrust/system/cuda/detail/bulk/malloc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,7 @@ inline __device__ T *on_chip_cast(T *ptr)
namespace detail
{

#ifdef __HIP_PLATFORM_NVCC__
HIP_DYNAMIC_SHARED( int, s_data_segment_begin)
#else
extern int s_data_segment_begin[];
#endif

class os
{
Expand Down Expand Up @@ -474,19 +470,12 @@ class singleton_on_chip_allocator
}; // end singleton_on_chip_allocator

// put the object in an anonymous namespace so that non-CUDA compilers don't complain about multiple definitions
#ifdef __HIP_PLATFORM_NVCC__
namespace
{

__shared__ uninitialized<singleton_on_chip_allocator> s_on_chip_allocator;

} // end anon namespace
#else
namespace
{
uninitialized<singleton_on_chip_allocator> s_on_chip_allocator;
} // end anon namespace
#endif

inline __device__ void init_on_chip_malloc(size_t max_data_segment_size)
{
Expand Down