diff --git a/.gitignore b/.gitignore index b073e43735..a96cbe7db0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,8 @@ nbproject vlsvdiff_DP vlsvextract_DP compile_commands.json +libraries*/ +library-build/ +run_*/ +!run_tests.sh +profile/ diff --git a/arch/gpu_base.cpp b/arch/gpu_base.cpp index f3631e38ba..f96b0266cc 100644 --- a/arch/gpu_base.cpp +++ b/arch/gpu_base.cpp @@ -663,11 +663,13 @@ __host__ void gpu_trans_allocate( __host__ void gpu_trans_deallocate() { // Deallocate any translation vectors or sets which exist if (gpu_allocated_largestVmeshSizePower != 0) { - ::delete unionOfBlocksSet; + unionOfBlocksSet->~Hashmap(); + free(unionOfBlocksSet); gpu_allocated_largestVmeshSizePower = 0; } if (gpu_allocated_unionSetSize != 0) { - ::delete unionOfBlocks; + unionOfBlocks->~SplitVector(); + free(unionOfBlocks); gpu_allocated_unionSetSize = 0; } } diff --git a/spatial_cells/spatial_cell_gpu.cpp b/spatial_cells/spatial_cell_gpu.cpp index 606c0a6794..ea755bcb08 100644 --- a/spatial_cells/spatial_cell_gpu.cpp +++ b/spatial_cells/spatial_cell_gpu.cpp @@ -129,15 +129,18 @@ namespace spatial_cell { SpatialCell::~SpatialCell() { if (velocity_block_with_content_list) { - ::delete velocity_block_with_content_list; + velocity_block_with_content_list->~SplitVector(); + free(velocity_block_with_content_list); velocity_block_with_content_list = 0; } if (velocity_block_with_content_map) { - ::delete velocity_block_with_content_map; + velocity_block_with_content_map->~Hashmap(); + free(velocity_block_with_content_map); velocity_block_with_content_map = 0; } if (velocity_block_with_no_content_map) { - ::delete velocity_block_with_no_content_map; + velocity_block_with_no_content_map->~Hashmap(); + free(velocity_block_with_no_content_map); velocity_block_with_no_content_map = 0; } velocity_block_with_content_list_size=0; @@ -146,19 +149,23 @@ namespace spatial_cell { vbwncl_sizePower = 0; if (list_with_replace_new) { - ::delete list_with_replace_new; + list_with_replace_new->~SplitVector(); + free(list_with_replace_new); list_with_replace_new = 0; } if (list_delete) { - ::delete list_delete; + list_delete->~SplitVector(); + free(list_delete); list_delete = 0; } if (list_to_replace) { - ::delete list_to_replace; + list_to_replace->~SplitVector(); + free(list_to_replace); list_to_replace = 0; } if (list_with_replace_old) { - ::delete list_with_replace_old; + list_with_replace_old->~SplitVector(); + free(list_with_replace_old); list_with_replace_old = 0; } list_with_replace_new_capacity = 0;