Overhaul Sparse Core

This commit is contained in:
Charles Schlosser
2023-01-07 22:09:42 +00:00
committed by Rasmus Munk Larsen
parent 9255181891
commit 81172cbdcb
4 changed files with 512 additions and 517 deletions

View File

@@ -132,15 +132,7 @@ class CompressedStorage
/** \returns the largest \c k in [start,end) such that for all \c j in [start,k) index[\c j]\<\a key */
inline Index searchLowerIndex(Index start, Index end, Index key) const
{
while(end>start)
{
Index mid = (end+start)>>1;
if (m_indices[mid]<key)
start = mid+1;
else
end = mid;
}
return start;
return static_cast<Index>(std::distance(m_indices, std::lower_bound(m_indices + start, m_indices + end, key)));
}
/** \returns the stored value at index \a key
@@ -198,19 +190,12 @@ class CompressedStorage
return m_values[id];
}
void moveChunk(Index from, Index to, Index chunkSize)
inline void moveChunk(Index from, Index to, Index chunkSize)
{
eigen_internal_assert(to+chunkSize <= m_size);
if(to>from && from+chunkSize>to)
{
// move backward
internal::smart_memmove(m_values+from, m_values+from+chunkSize, m_values+to);
internal::smart_memmove(m_indices+from, m_indices+from+chunkSize, m_indices+to);
}
else
{
internal::smart_copy(m_values+from, m_values+from+chunkSize, m_values+to);
internal::smart_copy(m_indices+from, m_indices+from+chunkSize, m_indices+to);
eigen_internal_assert(chunkSize >= 0 && to+chunkSize <= m_size);
if (chunkSize > 0) {
internal::smart_memmove(m_values + from, m_values + from + chunkSize, m_values + to);
internal::smart_memmove(m_indices + from, m_indices + from + chunkSize, m_indices + to);
}
}

File diff suppressed because it is too large Load Diff