removed broken test case

Author: HazelCullom

test/SliceWrapper.cpp

@@ -224,66 +224,6 @@ int many_type_test(int num_tuples) {
   using ExecutionSpace = Kokkos::DefaultExecutionSpace;
   using MemorySpace = ExecutionSpace::memory_space;
 
-  // Slice Wrapper Factory
-  CabSliceFactory<ExecutionSpace, MemorySpace,
-		  double, short int, float, char, int,
-		  char, double, long unsigned int,
-		  long double> cabSliceFactory(num_tuples);
-  
-  auto slice_wrapper0 = cabSliceFactory.makeSliceCab<0>();
-  auto slice_wrapper1 = cabSliceFactory.makeSliceCab<1>();
-  auto slice_wrapper2 = cabSliceFactory.makeSliceCab<2>();
-  auto slice_wrapper3 = cabSliceFactory.makeSliceCab<3>();
-  auto slice_wrapper4 = cabSliceFactory.makeSliceCab<4>();
-  auto slice_wrapper5 = cabSliceFactory.makeSliceCab<5>();
-  auto slice_wrapper6 = cabSliceFactory.makeSliceCab<6>();
-  auto slice_wrapper7 = cabSliceFactory.makeSliceCab<7>();
-  auto slice_wrapper8 = cabSliceFactory.makeSliceCab<8>();
-  
-  // simd_parallel_for setup
-  Cabana::SimdPolicy<cabSliceFactory.vecLen, ExecutionSpace> simd_policy(0, num_tuples);
-
-  // kernel that reads and writes
-  auto vector_kernel = KOKKOS_LAMBDA(const int s, const int a) {
-    double d0 = 42/(s+a+1.3);
-    double d1 = d0*d0;
-    double d2 = d1/123.456751;
-    float f0 = 0;
-    char c0 = 'a'+s+a;
-    char c1 = 'a'+((s*a+a) % 26);
-    int i0 = s+a;
-    int i1 = s+a/int(d0);
-    int i2 = i0+i1;
-    slice_wrapper0.access(s,a) = d0;
-    slice_wrapper1.access(s,a) = i0;
-    slice_wrapper2.access(s,a) = f0;
-    slice_wrapper3.access(s,a) = c0;
-    slice_wrapper4.access(s,a) = i1;
-    slice_wrapper5.access(s,a) = c1;
-    slice_wrapper6.access(s,a) = d1;
-    slice_wrapper7.access(s,a) = i2;
-    slice_wrapper8.access(s,a) = d2;
-    
-    assert(slice_wrapper0.access(s,a) == d0);
-    assert(slice_wrapper1.access(s,a) == i0);
-    assert(slice_wrapper2.access(s,a) == f0);
-    printf("float: %f\n", slice_wrapper2.access(s,a));
-    assert(slice_wrapper3.access(s,a) == c0);
-    assert(slice_wrapper4.access(s,a) == i1);
-    assert(slice_wrapper5.access(s,a) == c1);
-    assert(slice_wrapper6.access(s,a) == d1);
-    assert(slice_wrapper7.access(s,a) == i2);
-    assert(slice_wrapper8.access(s,a) == d2);
-  };
-
-  Cabana::simd_parallel_for(simd_policy, vector_kernel, "parallel_for_many_type_test");
-  return 0;
-}
-
-int ordered_many_type_test(int num_tuples) {
-  using ExecutionSpace = Kokkos::DefaultExecutionSpace;
-  using MemorySpace = ExecutionSpace::memory_space;
-  
   // Slice Wrapper Factory
   CabSliceFactory<ExecutionSpace, MemorySpace,
 		  long double, double, double,
@@ -317,8 +257,8 @@ int ordered_many_type_test(int num_tuples) {
     slice_wrapper0.access(s,a) = d0;
     slice_wrapper1.access(s,a) = d1;
     slice_wrapper2.access(s,a) = d2;
-    slice_wrapper3.access(s,a) = f0;
-    slice_wrapper4.access(s,a) = i0;
+    slice_wrapper3.access(s,a) = i0;
+    slice_wrapper4.access(s,a) = f0;
     slice_wrapper5.access(s,a) = i1;
     slice_wrapper6.access(s,a) = i2;
     slice_wrapper7.access(s,a) = c0;
@@ -327,8 +267,8 @@ int ordered_many_type_test(int num_tuples) {
     assert(slice_wrapper0.access(s,a) == d0);
     assert(slice_wrapper1.access(s,a) == d1);
     assert(slice_wrapper2.access(s,a) == d2);
-    assert(slice_wrapper3.access(s,a) == f0);
-    assert(slice_wrapper4.access(s,a) == i0);
+    assert(slice_wrapper3.access(s,a) == i0);
+    assert(slice_wrapper4.access(s,a) == f0);
     assert(slice_wrapper5.access(s,a) == i1);
     assert(slice_wrapper6.access(s,a) == i2);
     assert(slice_wrapper7.access(s,a) == c0);
@@ -345,8 +285,7 @@ int main(int argc, char* argv[]) {
 
   Kokkos::ScopeGuard scope_guard(argc, argv);
 
-  //many_type_test(num_tuples); // fails due to types not being in descending order
-  ordered_many_type_test(num_tuples);
+  many_type_test(num_tuples);
   no_type_test(num_tuples);
   single_type_test(num_tuples);
   multi_type_test(num_tuples);