Skip to content
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.

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

Applied kokkos patches to get things compiling for cuda and bitsets f… #4939

Merged
merged 1 commit into from
Apr 18, 2019
Merged
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
26 changes: 12 additions & 14 deletions packages/kokkos/containers/src/Kokkos_Bitset.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,22 +107,20 @@ class Bitset
}
}

/// assignment
Bitset<Device> & operator = (Bitset<Device> const & rhs)
{
this->m_size = rhs.m_size;
this->m_last_block_mask = rhs.m_last_block_mask;
this->m_blocks = rhs.m_blocks;
KOKKOS_INLINE_FUNCTION
Bitset (const Bitset<Device>&) = default;

return *this;
}
KOKKOS_INLINE_FUNCTION
Bitset& operator= (const Bitset<Device>&) = default;

/// copy constructor
Bitset( Bitset<Device> const & rhs)
: m_size( rhs.m_size )
, m_last_block_mask( rhs.m_last_block_mask )
, m_blocks( rhs.m_blocks )
{}
KOKKOS_INLINE_FUNCTION
Bitset (Bitset<Device>&&) = default;

KOKKOS_INLINE_FUNCTION
Bitset& operator= (Bitset<Device>&&) = default;

KOKKOS_INLINE_FUNCTION
~Bitset () = default;

/// number of bits in the set
/// can be call from the host or the device
Expand Down