Skip to content

Update to bitmask #64

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
wants to merge 1 commit into
base: py-local-src
Choose a base branch
from
Open

Update to bitmask #64

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
83 changes: 50 additions & 33 deletions libNeonDomain/include/Neon/domain/details/mGrid/sparseBitMask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#pragma once
#include "Neon/domain/tools/PointHashTable.h"

Expand Down Expand Up @@ -466,9 +465,11 @@ class SparseBitBlocks
* @see isActivePoint() To query point states
*/
SparseBitBlocks(const Neon::index_3d& bbox)
: mBBox(bbox)
: mBBox( (bbox.x + BitBlock::blockSize.x - 1) / BitBlock::blockSize.x,
(bbox.y + BitBlock::blockSize.y - 1) / BitBlock::blockSize.y,
(bbox.z + BitBlock::blockSize.z - 1) / BitBlock::blockSize.z )
{
mHashTable = Neon::domain::tool::PointHashTable<int32_t, BitBlock*>(bbox);
mHashTable = Neon::domain::tool::PointHashTable<int32_t, BitBlock*>(mBBox);
auto newPoolPtr = new Pool{};
memoryPool.emplace_back(newPoolPtr);
firstFreeIndex = 0;
Expand Down Expand Up @@ -534,50 +535,52 @@ class SparseBitBlocks
template <bool ThreadSafe>
auto activatePoint(const Neon::index_3d& point) -> void
{
if (!(point < mBBox)) {
std::cout << "Error -> point outside of valid range" << std::endl;
Neon::index_3d block_coord(point.x / BitBlock::blockSize.x,
point.y / BitBlock::blockSize.y,
point.z / BitBlock::blockSize.z);
Neon::index_3d local(point.x % BitBlock::blockSize.x,
point.y % BitBlock::blockSize.y,
point.z % BitBlock::blockSize.z);

if (!(block_coord < mBBox)) {
std::cout << "Error -> block outside of valid range" << std::endl;
std::exit(1);
}
BitBlock* bitBlock = getBitBlockPrt(point);

BitBlock* bitBlock = getBitBlockPrt(block_coord);
if (bitBlock != nullptr) {
bitBlock->setON<ThreadSafe>(point);
bitBlock->setON<ThreadSafe>(local);
return;
}

if constexpr (ThreadSafe == true) {
#pragma omp critical(SparseBitBlocks_addPoint)
{
bitBlock = getBitBlockPrt(point);
bitBlock = getBitBlockPrt(block_coord);
if (bitBlock == nullptr) {
if (firstFreeIndex > memoryPoolGranularity) {
std::cout << "Error -> firstFreeIndex == memoryPoolGranularity" << std::endl;
std::exit(1);
}
if (firstFreeIndex == memoryPoolGranularity) {
//auto new_pool = Pool{};
memoryPool.emplace_back({});
auto new_pool_ptr = new Pool{};
memoryPool.emplace_back(new_pool_ptr);
firstFreeIndex = 0;
}
bitBlock = &memoryPool[memoryPool.size() - 1][firstFreeIndex];
bitBlock = &((*memoryPool.back())[firstFreeIndex]);
firstFreeIndex++;
mHashTable.addPoint(point, bitBlock);
mHashTable.addPoint(block_coord, bitBlock);
}
bitBlock->setON<false>(point);
bitBlock->setON<false>(local);
}

} else {
// We are in a critical section managed by the calling
if (firstFreeIndex > memoryPoolGranularity) {
std::cout << "Error -> firstFreeIndex == memoryPoolGranularity" << std::endl;
std::exit(1);
}
if (firstFreeIndex == memoryPoolGranularity) {
auto new_pool_ptr = new Pool{};
memoryPool.emplace_back(new_pool_ptr);
firstFreeIndex = 0;
}
bitBlock = &(memoryPool[memoryPool.size() - 1]->at(firstFreeIndex));
bitBlock = &((*memoryPool.back())[firstFreeIndex]);
firstFreeIndex++;
mHashTable.addPoint(point, bitBlock);
bitBlock->setON<true>(point);
mHashTable.addPoint(block_coord, bitBlock);
bitBlock->setON<ThreadSafe>(local);
return;
}
}
Expand Down Expand Up @@ -630,20 +633,27 @@ class SparseBitBlocks
template <bool ThreadSafe = true>
auto removePoint(const Neon::index_3d& point) -> void
{
BitBlock* bitBlock = getBitBlockPrt(point);
Neon::index_3d block_coord(point.x / BitBlock::blockSize.x,
point.y / BitBlock::blockSize.y,
point.z / BitBlock::blockSize.z);
Neon::index_3d local(point.x % BitBlock::blockSize.x,
point.y % BitBlock::blockSize.y,
point.z % BitBlock::blockSize.z);

BitBlock* bitBlock = getBitBlockPrt(block_coord);
if (bitBlock == nullptr) {
std::cout << "Error -> " << std::endl;
return;
}
bitBlock->setOFF<ThreadSafe>(point);
bitBlock->setOFF<ThreadSafe>(local);
}

auto getBitBlockPrt(const Neon::index_3d& point) const -> BitBlock*
auto getBitBlockPrt(const Neon::index_3d& coord) const -> BitBlock*
{
if (!(point < mBBox)) {
std::cout << "Error -> point outside of valid range" << std::endl;
if (!(coord < mBBox)) {
std::cout << "Error -> coord outside of valid range" << std::endl;
std::exit(1);
}
BitBlock* const* tmp = mHashTable.getMetadata(point);
BitBlock* const* tmp = mHashTable.getMetadata(coord);
if (tmp == nullptr) {
return nullptr;
}
Expand Down Expand Up @@ -704,11 +714,18 @@ class SparseBitBlocks
*/
auto isActivePoint(const Neon::index_3d& point) const -> bool
{
BitBlock* bitBlock = getBitBlockPrt(point);
Neon::index_3d block_coord(point.x / BitBlock::blockSize.x,
point.y / BitBlock::blockSize.y,
point.z / BitBlock::blockSize.z);
Neon::index_3d local(point.x % BitBlock::blockSize.x,
point.y % BitBlock::blockSize.y,
point.z % BitBlock::blockSize.z);

BitBlock* bitBlock = getBitBlockPrt(block_coord);
if (bitBlock == nullptr) {
return false;
}
return bitBlock->isON(point);
return bitBlock->isON(local);
};
};
} // namespace Neon::domain::details::mGrid
Loading