Skip to content

Commit 908df3f

Browse files
committed
reverted managed_array_test.cpp and added <cassert>
1 parent e81eb80 commit 908df3f

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/ManagedArray.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#include "ManagedArray.hpp"
4747
#include "ArrayManager.hpp"
4848

49-
#include <assert.h>
49+
#include <cassert>
5050

5151
namespace chai {
5252

src/tests/managed_array_tests.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -393,28 +393,28 @@ CUDA_TEST(ManagedArray, UserCallback)
393393
#endif
394394
#endif
395395

396-
#if defined(CHAI_ENABLE_CUDA)
397-
CUDA_TEST(ManagedArray, Move)
396+
#if !defined(NDEBUG)
397+
TEST(ManagedArray, OutOfRangeAccess)
398398
{
399-
chai::ManagedArray<float> array(10, chai::GPU);
400-
401-
forall(cuda(), 0, 10, [=] __device__ (int i) {
402-
array[i] = i;
403-
});
404-
405-
array.move(chai::CPU);
406-
407-
ASSERT_EQ(array[5], 5);
399+
chai::ManagedArray<float> array(20);
408400

409-
array.free();
401+
EXPECT_DEATH(
402+
forall(sequential(), 10, 50, [=] (int i) {
403+
array[i] = 0.0f;
404+
});,
405+
"i < m_elems");
410406
}
411-
#endif // defined(CHAI_ENABLE_CUDA)
412407

413-
#if defined(CHAI_ARRAY_BOUNDS_CHECK)
414-
TEST(ManagedArray_DeathTest, RangeCheck) {
415-
chai::ManagedArray<float> array(10);
408+
#if defined(CHAI_ENABLE_CUDA)
409+
CUDA_TEST(ManagedArray, OutOfRangeAccessGPU)
410+
{
411+
chai::ManagedArray<float> array(20);
416412

417-
EXPECT_DEATH_IF_SUPPORTED( array[-1], ".*" );
418-
EXPECT_DEATH_IF_SUPPORTED( array[10], ".*" );
413+
EXPECT_DEATH(
414+
forall(cuda(), 10, 50, [=] __device__ (int i) {
415+
array[i] = 0.0f;
416+
});,
417+
"i < m_elems");
419418
}
420-
#endif
419+
#endif // defined(CHAI_ENABLE_CUDA)
420+
#endif // !defined(NDEBUG)

0 commit comments

Comments
 (0)