@@ -119,7 +119,7 @@ void TestVectorFromSTLVector(void)
119
119
ASSERT_EQUAL (v[2 ], 2 );
120
120
121
121
v = stl_vector;
122
-
122
+
123
123
ASSERT_EQUAL (v.size (), 3lu);
124
124
ASSERT_EQUAL (v[0 ], 0 );
125
125
ASSERT_EQUAL (v[1 ], 1 );
@@ -169,7 +169,7 @@ template <class Vector>
169
169
void TestVectorFromBiDirectionalIterator (void )
170
170
{
171
171
typedef typename Vector::value_type T;
172
-
172
+
173
173
std::list<T> stl_list;
174
174
stl_list.push_back (0 );
175
175
stl_list.push_back (1 );
@@ -189,7 +189,7 @@ template <class Vector>
189
189
void TestVectorAssignFromBiDirectionalIterator (void )
190
190
{
191
191
typedef typename Vector::value_type T;
192
-
192
+
193
193
std::list<T> stl_list;
194
194
stl_list.push_back (0 );
195
195
stl_list.push_back (1 );
@@ -246,7 +246,7 @@ void TestVectorToAndFromHostVector(void)
246
246
v[1 ] = 11 ;
247
247
v[2 ] = 12 ;
248
248
249
- ASSERT_EQUAL (h[0 ], 0 ); ASSERT_EQUAL (v[0 ], 10 );
249
+ ASSERT_EQUAL (h[0 ], 0 ); ASSERT_EQUAL (v[0 ], 10 );
250
250
ASSERT_EQUAL (h[1 ], 1 ); ASSERT_EQUAL (v[1 ], 11 );
251
251
ASSERT_EQUAL (h[2 ], 2 ); ASSERT_EQUAL (v[2 ], 12 );
252
252
@@ -303,7 +303,7 @@ void TestVectorToAndFromDeviceVector(void)
303
303
v[1 ] = 11 ;
304
304
v[2 ] = 12 ;
305
305
306
- ASSERT_EQUAL (h[0 ], 0 ); ASSERT_EQUAL (v[0 ], 10 );
306
+ ASSERT_EQUAL (h[0 ], 0 ); ASSERT_EQUAL (v[0 ], 10 );
307
307
ASSERT_EQUAL (h[1 ], 1 ); ASSERT_EQUAL (v[1 ], 11 );
308
308
ASSERT_EQUAL (h[2 ], 2 ); ASSERT_EQUAL (v[2 ], 12 );
309
309
@@ -348,7 +348,7 @@ void TestVectorSwap(void)
348
348
349
349
v.swap (u);
350
350
351
- ASSERT_EQUAL (v[0 ], 10 ); ASSERT_EQUAL (u[0 ], 0 );
351
+ ASSERT_EQUAL (v[0 ], 10 ); ASSERT_EQUAL (u[0 ], 0 );
352
352
ASSERT_EQUAL (v[1 ], 11 ); ASSERT_EQUAL (u[1 ], 1 );
353
353
ASSERT_EQUAL (v[2 ], 12 ); ASSERT_EQUAL (u[2 ], 2 );
354
354
}
@@ -363,33 +363,33 @@ void TestVectorErasePosition(void)
363
363
364
364
v.erase (v.begin () + 2 );
365
365
366
- ASSERT_EQUAL (v.size (), 4lu);
367
- ASSERT_EQUAL (v[0 ], 0 );
368
- ASSERT_EQUAL (v[1 ], 1 );
369
- ASSERT_EQUAL (v[2 ], 3 );
370
- ASSERT_EQUAL (v[3 ], 4 );
371
-
366
+ ASSERT_EQUAL (v.size (), 4lu);
367
+ ASSERT_EQUAL (v[0 ], 0 );
368
+ ASSERT_EQUAL (v[1 ], 1 );
369
+ ASSERT_EQUAL (v[2 ], 3 );
370
+ ASSERT_EQUAL (v[3 ], 4 );
371
+
372
372
v.erase (v.begin () + 0 );
373
373
374
- ASSERT_EQUAL (v.size (), 3lu);
375
- ASSERT_EQUAL (v[0 ], 1 );
376
- ASSERT_EQUAL (v[1 ], 3 );
377
- ASSERT_EQUAL (v[2 ], 4 );
378
-
374
+ ASSERT_EQUAL (v.size (), 3lu);
375
+ ASSERT_EQUAL (v[0 ], 1 );
376
+ ASSERT_EQUAL (v[1 ], 3 );
377
+ ASSERT_EQUAL (v[2 ], 4 );
378
+
379
379
v.erase (v.begin () + 2 );
380
380
381
- ASSERT_EQUAL (v.size (), 2lu);
382
- ASSERT_EQUAL (v[0 ], 1 );
383
- ASSERT_EQUAL (v[1 ], 3 );
384
-
381
+ ASSERT_EQUAL (v.size (), 2lu);
382
+ ASSERT_EQUAL (v[0 ], 1 );
383
+ ASSERT_EQUAL (v[1 ], 3 );
384
+
385
385
v.erase (v.begin () + 1 );
386
386
387
- ASSERT_EQUAL (v.size (), 1lu);
388
- ASSERT_EQUAL (v[0 ], 1 );
387
+ ASSERT_EQUAL (v.size (), 1lu);
388
+ ASSERT_EQUAL (v[0 ], 1 );
389
389
390
390
v.erase (v.begin () + 0 );
391
391
392
- ASSERT_EQUAL (v.size (), 0lu);
392
+ ASSERT_EQUAL (v.size (), 0lu);
393
393
}
394
394
DECLARE_VECTOR_UNITTEST (TestVectorErasePosition);
395
395
@@ -402,26 +402,26 @@ void TestVectorEraseRange(void)
402
402
403
403
v.erase (v.begin () + 1 , v.begin () + 3 );
404
404
405
- ASSERT_EQUAL (v.size (), 4lu);
406
- ASSERT_EQUAL (v[0 ], 0 );
407
- ASSERT_EQUAL (v[1 ], 3 );
408
- ASSERT_EQUAL (v[2 ], 4 );
409
- ASSERT_EQUAL (v[3 ], 5 );
410
-
405
+ ASSERT_EQUAL (v.size (), 4lu);
406
+ ASSERT_EQUAL (v[0 ], 0 );
407
+ ASSERT_EQUAL (v[1 ], 3 );
408
+ ASSERT_EQUAL (v[2 ], 4 );
409
+ ASSERT_EQUAL (v[3 ], 5 );
410
+
411
411
v.erase (v.begin () + 2 , v.end ());
412
412
413
- ASSERT_EQUAL (v.size (), 2lu);
414
- ASSERT_EQUAL (v[0 ], 0 );
415
- ASSERT_EQUAL (v[1 ], 3 );
416
-
413
+ ASSERT_EQUAL (v.size (), 2lu);
414
+ ASSERT_EQUAL (v[0 ], 0 );
415
+ ASSERT_EQUAL (v[1 ], 3 );
416
+
417
417
v.erase (v.begin () + 0 , v.begin () + 1 );
418
418
419
- ASSERT_EQUAL (v.size (), 1lu);
420
- ASSERT_EQUAL (v[0 ], 3 );
421
-
419
+ ASSERT_EQUAL (v.size (), 1lu);
420
+ ASSERT_EQUAL (v[0 ], 3 );
421
+
422
422
v.erase (v.begin (), v.end ());
423
423
424
- ASSERT_EQUAL (v.size (), 0lu);
424
+ ASSERT_EQUAL (v.size (), 0lu);
425
425
}
426
426
DECLARE_VECTOR_UNITTEST (TestVectorEraseRange);
427
427
@@ -449,37 +449,37 @@ void TestVectorEquality(void)
449
449
s_b[0 ] = 0 ; s_b[1 ] = 1 ; s_b[2 ] = 3 ;
450
450
s_b[0 ] = 0 ; s_b[1 ] = 1 ;
451
451
452
- ASSERT_EQUAL ((h_a == h_a), true ); ASSERT_EQUAL ((h_a == d_a), true ); ASSERT_EQUAL ((d_a == h_a), true ); ASSERT_EQUAL ((d_a == d_a), true );
452
+ ASSERT_EQUAL ((h_a == h_a), true ); ASSERT_EQUAL ((h_a == d_a), true ); ASSERT_EQUAL ((d_a == h_a), true ); ASSERT_EQUAL ((d_a == d_a), true );
453
453
ASSERT_EQUAL ((h_b == h_b), true ); ASSERT_EQUAL ((h_b == d_b), true ); ASSERT_EQUAL ((d_b == h_b), true ); ASSERT_EQUAL ((d_b == d_b), true );
454
454
ASSERT_EQUAL ((h_c == h_c), true ); ASSERT_EQUAL ((h_c == d_c), true ); ASSERT_EQUAL ((d_c == h_c), true ); ASSERT_EQUAL ((d_c == d_c), true );
455
455
456
456
// test vector vs device_vector
457
- ASSERT_EQUAL ((s_a == d_a), true ); ASSERT_EQUAL ((d_a == s_a), true );
457
+ ASSERT_EQUAL ((s_a == d_a), true ); ASSERT_EQUAL ((d_a == s_a), true );
458
458
ASSERT_EQUAL ((s_b == d_b), true ); ASSERT_EQUAL ((d_b == s_b), true );
459
459
ASSERT_EQUAL ((s_c == d_c), true ); ASSERT_EQUAL ((d_c == s_c), true );
460
460
461
461
// test vector vs host_vector
462
- ASSERT_EQUAL ((s_a == h_a), true ); ASSERT_EQUAL ((h_a == s_a), true );
462
+ ASSERT_EQUAL ((s_a == h_a), true ); ASSERT_EQUAL ((h_a == s_a), true );
463
463
ASSERT_EQUAL ((s_b == h_b), true ); ASSERT_EQUAL ((h_b == s_b), true );
464
464
ASSERT_EQUAL ((s_c == h_c), true ); ASSERT_EQUAL ((h_c == s_c), true );
465
465
466
- ASSERT_EQUAL ((h_a == h_b), false ); ASSERT_EQUAL ((h_a == d_b), false ); ASSERT_EQUAL ((d_a == h_b), false ); ASSERT_EQUAL ((d_a == d_b), false );
466
+ ASSERT_EQUAL ((h_a == h_b), false ); ASSERT_EQUAL ((h_a == d_b), false ); ASSERT_EQUAL ((d_a == h_b), false ); ASSERT_EQUAL ((d_a == d_b), false );
467
467
ASSERT_EQUAL ((h_b == h_a), false ); ASSERT_EQUAL ((h_b == d_a), false ); ASSERT_EQUAL ((d_b == h_a), false ); ASSERT_EQUAL ((d_b == d_a), false );
468
468
ASSERT_EQUAL ((h_a == h_c), false ); ASSERT_EQUAL ((h_a == d_c), false ); ASSERT_EQUAL ((d_a == h_c), false ); ASSERT_EQUAL ((d_a == d_c), false );
469
469
ASSERT_EQUAL ((h_c == h_a), false ); ASSERT_EQUAL ((h_c == d_a), false ); ASSERT_EQUAL ((d_c == h_a), false ); ASSERT_EQUAL ((d_c == d_a), false );
470
470
ASSERT_EQUAL ((h_b == h_c), false ); ASSERT_EQUAL ((h_b == d_c), false ); ASSERT_EQUAL ((d_b == h_c), false ); ASSERT_EQUAL ((d_b == d_c), false );
471
471
ASSERT_EQUAL ((h_c == h_b), false ); ASSERT_EQUAL ((h_c == d_b), false ); ASSERT_EQUAL ((d_c == h_b), false ); ASSERT_EQUAL ((d_c == d_b), false );
472
472
473
473
// test vector vs device_vector
474
- ASSERT_EQUAL ((s_a == d_b), false ); ASSERT_EQUAL ((d_a == s_b), false );
474
+ ASSERT_EQUAL ((s_a == d_b), false ); ASSERT_EQUAL ((d_a == s_b), false );
475
475
ASSERT_EQUAL ((s_b == d_a), false ); ASSERT_EQUAL ((d_b == s_a), false );
476
476
ASSERT_EQUAL ((s_a == d_c), false ); ASSERT_EQUAL ((d_a == s_c), false );
477
477
ASSERT_EQUAL ((s_c == d_a), false ); ASSERT_EQUAL ((d_c == s_a), false );
478
478
ASSERT_EQUAL ((s_b == d_c), false ); ASSERT_EQUAL ((d_b == s_c), false );
479
479
ASSERT_EQUAL ((s_c == d_b), false ); ASSERT_EQUAL ((d_c == s_b), false );
480
480
481
481
// test vector vs host_vector
482
- ASSERT_EQUAL ((s_a == h_b), false ); ASSERT_EQUAL ((h_a == s_b), false );
482
+ ASSERT_EQUAL ((s_a == h_b), false ); ASSERT_EQUAL ((h_a == s_b), false );
483
483
ASSERT_EQUAL ((s_b == h_a), false ); ASSERT_EQUAL ((h_b == s_a), false );
484
484
ASSERT_EQUAL ((s_a == h_c), false ); ASSERT_EQUAL ((h_a == s_c), false );
485
485
ASSERT_EQUAL ((s_c == h_a), false ); ASSERT_EQUAL ((h_c == s_a), false );
@@ -511,37 +511,37 @@ void TestVectorInequality(void)
511
511
s_b[0 ] = 0 ; s_b[1 ] = 1 ; s_b[2 ] = 3 ;
512
512
s_b[0 ] = 0 ; s_b[1 ] = 1 ;
513
513
514
- ASSERT_EQUAL ((h_a != h_a), false ); ASSERT_EQUAL ((h_a != d_a), false ); ASSERT_EQUAL ((d_a != h_a), false ); ASSERT_EQUAL ((d_a != d_a), false );
514
+ ASSERT_EQUAL ((h_a != h_a), false ); ASSERT_EQUAL ((h_a != d_a), false ); ASSERT_EQUAL ((d_a != h_a), false ); ASSERT_EQUAL ((d_a != d_a), false );
515
515
ASSERT_EQUAL ((h_b != h_b), false ); ASSERT_EQUAL ((h_b != d_b), false ); ASSERT_EQUAL ((d_b != h_b), false ); ASSERT_EQUAL ((d_b != d_b), false );
516
516
ASSERT_EQUAL ((h_c != h_c), false ); ASSERT_EQUAL ((h_c != d_c), false ); ASSERT_EQUAL ((d_c != h_c), false ); ASSERT_EQUAL ((d_c != d_c), false );
517
517
518
518
// test vector vs device_vector
519
- ASSERT_EQUAL ((s_a != d_a), false ); ASSERT_EQUAL ((d_a != s_a), false );
519
+ ASSERT_EQUAL ((s_a != d_a), false ); ASSERT_EQUAL ((d_a != s_a), false );
520
520
ASSERT_EQUAL ((s_b != d_b), false ); ASSERT_EQUAL ((d_b != s_b), false );
521
521
ASSERT_EQUAL ((s_c != d_c), false ); ASSERT_EQUAL ((d_c != s_c), false );
522
522
523
523
// test vector vs host_vector
524
- ASSERT_EQUAL ((s_a != h_a), false ); ASSERT_EQUAL ((h_a != s_a), false );
524
+ ASSERT_EQUAL ((s_a != h_a), false ); ASSERT_EQUAL ((h_a != s_a), false );
525
525
ASSERT_EQUAL ((s_b != h_b), false ); ASSERT_EQUAL ((h_b != s_b), false );
526
526
ASSERT_EQUAL ((s_c != h_c), false ); ASSERT_EQUAL ((h_c != s_c), false );
527
527
528
- ASSERT_EQUAL ((h_a != h_b), true ); ASSERT_EQUAL ((h_a != d_b), true ); ASSERT_EQUAL ((d_a != h_b), true ); ASSERT_EQUAL ((d_a != d_b), true );
528
+ ASSERT_EQUAL ((h_a != h_b), true ); ASSERT_EQUAL ((h_a != d_b), true ); ASSERT_EQUAL ((d_a != h_b), true ); ASSERT_EQUAL ((d_a != d_b), true );
529
529
ASSERT_EQUAL ((h_b != h_a), true ); ASSERT_EQUAL ((h_b != d_a), true ); ASSERT_EQUAL ((d_b != h_a), true ); ASSERT_EQUAL ((d_b != d_a), true );
530
530
ASSERT_EQUAL ((h_a != h_c), true ); ASSERT_EQUAL ((h_a != d_c), true ); ASSERT_EQUAL ((d_a != h_c), true ); ASSERT_EQUAL ((d_a != d_c), true );
531
531
ASSERT_EQUAL ((h_c != h_a), true ); ASSERT_EQUAL ((h_c != d_a), true ); ASSERT_EQUAL ((d_c != h_a), true ); ASSERT_EQUAL ((d_c != d_a), true );
532
532
ASSERT_EQUAL ((h_b != h_c), true ); ASSERT_EQUAL ((h_b != d_c), true ); ASSERT_EQUAL ((d_b != h_c), true ); ASSERT_EQUAL ((d_b != d_c), true );
533
533
ASSERT_EQUAL ((h_c != h_b), true ); ASSERT_EQUAL ((h_c != d_b), true ); ASSERT_EQUAL ((d_c != h_b), true ); ASSERT_EQUAL ((d_c != d_b), true );
534
534
535
535
// test vector vs device_vector
536
- ASSERT_EQUAL ((s_a != d_b), true ); ASSERT_EQUAL ((d_a != s_b), true );
536
+ ASSERT_EQUAL ((s_a != d_b), true ); ASSERT_EQUAL ((d_a != s_b), true );
537
537
ASSERT_EQUAL ((s_b != d_a), true ); ASSERT_EQUAL ((d_b != s_a), true );
538
538
ASSERT_EQUAL ((s_a != d_c), true ); ASSERT_EQUAL ((d_a != s_c), true );
539
539
ASSERT_EQUAL ((s_c != d_a), true ); ASSERT_EQUAL ((d_c != s_a), true );
540
540
ASSERT_EQUAL ((s_b != d_c), true ); ASSERT_EQUAL ((d_b != s_c), true );
541
541
ASSERT_EQUAL ((s_c != d_b), true ); ASSERT_EQUAL ((d_c != s_b), true );
542
542
543
543
// test vector vs host_vector
544
- ASSERT_EQUAL ((s_a != h_b), true ); ASSERT_EQUAL ((h_a != s_b), true );
544
+ ASSERT_EQUAL ((s_a != h_b), true ); ASSERT_EQUAL ((h_a != s_b), true );
545
545
ASSERT_EQUAL ((s_b != h_a), true ); ASSERT_EQUAL ((h_b != s_a), true );
546
546
ASSERT_EQUAL ((s_a != h_c), true ); ASSERT_EQUAL ((h_a != s_c), true );
547
547
ASSERT_EQUAL ((s_c != h_a), true ); ASSERT_EQUAL ((h_c != s_a), true );
@@ -585,8 +585,8 @@ void TestVectorResizing(void)
585
585
586
586
ASSERT_EQUAL (v.size (), 0lu);
587
587
588
- // TODO remove this WAR
589
- #if defined(__CUDACC__) && CUDA_VERSION ==3000
588
+ // TODO remove this WAR
589
+ #if defined(__CUDACC__) && CUDART_VERSION ==3000
590
590
// depending on sizeof(T), we will receive one
591
591
// of two possible exceptions
592
592
try
@@ -599,7 +599,7 @@ void TestVectorResizing(void)
599
599
// reset the CUDA error
600
600
cudaGetLastError ();
601
601
} // end catch
602
- #endif // defined(__CUDACC__) && CUDA_VERSION ==3000
602
+ #endif // defined(__CUDACC__) && CUDART_VERSION ==3000
603
603
604
604
ASSERT_EQUAL (v.size (), 0lu);
605
605
}
@@ -622,15 +622,15 @@ void TestVectorReserving(void)
622
622
623
623
ASSERT_EQUAL (v.capacity (), old_capacity);
624
624
625
- // TODO remove this WAR
626
- #if defined(__CUDACC__) && CUDA_VERSION ==3000
625
+ // TODO remove this WAR
626
+ #if defined(__CUDACC__) && CUDART_VERSION ==3000
627
627
try
628
628
{
629
629
v.reserve (std::numeric_limits<size_t >::max ());
630
630
}
631
631
catch (std::length_error e) {}
632
632
catch (std::bad_alloc e) {}
633
- #endif // defined(__CUDACC__) && CUDA_VERSION ==3000
633
+ #endif // defined(__CUDACC__) && CUDART_VERSION ==3000
634
634
635
635
ASSERT_EQUAL (v.capacity (), old_capacity);
636
636
}
@@ -680,7 +680,7 @@ struct LargeStruct
680
680
681
681
void TestVectorContainingLargeType (void )
682
682
{
683
- // Thrust issue #5
683
+ // Thrust issue #5
684
684
// http://code.google.com/p/thrust/issues/detail?id=5
685
685
const static int N = 100 ;
686
686
typedef LargeStruct<N> T;
@@ -692,9 +692,9 @@ void TestVectorContainingLargeType(void)
692
692
693
693
thrust::device_vector<T> dv2 (20 );
694
694
thrust::host_vector<T> hv2 (20 );
695
-
695
+
696
696
ASSERT_EQUAL_QUIET (dv2, hv2);
697
-
697
+
698
698
// initialize tofirst element to something nonzero
699
699
T ls;
700
700
@@ -703,15 +703,15 @@ void TestVectorContainingLargeType(void)
703
703
704
704
thrust::device_vector<T> dv3 (20 , ls);
705
705
thrust::host_vector<T> hv3 (20 , ls);
706
-
706
+
707
707
ASSERT_EQUAL_QUIET (dv3, hv3);
708
-
708
+
709
709
// change first element
710
710
ls.data [0 ] = -13 ;
711
711
712
712
dv3[2 ] = ls;
713
713
hv3[2 ] = ls;
714
-
714
+
715
715
ASSERT_EQUAL_QUIET (dv3, hv3);
716
716
}
717
717
DECLARE_UNITTEST (TestVectorContainingLargeType);
0 commit comments