Skip to content

Commit

Permalink
Less lines, less lines everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
@gonidelis
gonidelis committed Sep 5, 2024
1 parent 167a296 commit 5456f46
Show file tree
Hide file tree
Showing 20 changed files with 252 additions and 777 deletions.
42 changes: 12 additions & 30 deletions thrust/testing/cuda/sequence.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,26 @@ void TestSequenceDevice(ExecutionPolicy exec)
ASSERT_EQUAL(cudaSuccess, err);
}

ASSERT_EQUAL(v[0], 0);
ASSERT_EQUAL(v[1], 1);
ASSERT_EQUAL(v[2], 2);
ASSERT_EQUAL(v[3], 3);
ASSERT_EQUAL(v[4], 4);
thrust::device_vector<int> ref{0, 1, 2, 3, 4};
ASSERT_EQUAL(v, ref);

sequence_kernel<<<1, 1>>>(exec, v.begin(), v.end(), 10);
{
cudaError_t const err = cudaDeviceSynchronize();
ASSERT_EQUAL(cudaSuccess, err);
}

ASSERT_EQUAL(v[0], 10);
ASSERT_EQUAL(v[1], 11);
ASSERT_EQUAL(v[2], 12);
ASSERT_EQUAL(v[3], 13);
ASSERT_EQUAL(v[4], 14);
ref = {10, 11, 12, 13, 14};
ASSERT_EQUAL(v, ref);

sequence_kernel<<<1, 1>>>(exec, v.begin(), v.end(), 10, 2);
{
cudaError_t const err = cudaDeviceSynchronize();
ASSERT_EQUAL(cudaSuccess, err);
}

ASSERT_EQUAL(v[0], 10);
ASSERT_EQUAL(v[1], 12);
ASSERT_EQUAL(v[2], 14);
ASSERT_EQUAL(v[3], 16);
ASSERT_EQUAL(v[4], 18);
ref = {10, 12, 14, 16, 18};
ASSERT_EQUAL(v, ref);
}

void TestSequenceDeviceSeq()
Expand Down Expand Up @@ -89,29 +80,20 @@ void TestSequenceCudaStreams()
thrust::sequence(thrust::cuda::par.on(s), v.begin(), v.end());
cudaStreamSynchronize(s);

ASSERT_EQUAL(v[0], 0);
ASSERT_EQUAL(v[1], 1);
ASSERT_EQUAL(v[2], 2);
ASSERT_EQUAL(v[3], 3);
ASSERT_EQUAL(v[4], 4);
Vector ref{0, 1, 2, 3, 4};
ASSERT_EQUAL(v, ref);

thrust::sequence(thrust::cuda::par.on(s), v.begin(), v.end(), 10);
cudaStreamSynchronize(s);

ASSERT_EQUAL(v[0], 10);
ASSERT_EQUAL(v[1], 11);
ASSERT_EQUAL(v[2], 12);
ASSERT_EQUAL(v[3], 13);
ASSERT_EQUAL(v[4], 14);
ref = {10, 11, 12, 13, 14};
ASSERT_EQUAL(v, ref);

thrust::sequence(thrust::cuda::par.on(s), v.begin(), v.end(), 10, 2);
cudaStreamSynchronize(s);

ASSERT_EQUAL(v[0], 10);
ASSERT_EQUAL(v[1], 12);
ASSERT_EQUAL(v[2], 14);
ASSERT_EQUAL(v[3], 16);
ASSERT_EQUAL(v[4], 18);
ref = {10, 12, 14, 16, 18};
ASSERT_EQUAL(v, ref);

cudaStreamDestroy(s);
}
Expand Down
24 changes: 4 additions & 20 deletions thrust/testing/cuda/set_difference.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,9 @@ void TestSetDifferenceDevice(ExecutionPolicy exec)
using Vector = thrust::device_vector<int>;
using Iterator = typename Vector::iterator;

Vector a(4), b(5);

// clang-format off
a[0] = 0; a[1] = 2; a[2] = 4; a[3] = 5;
b[0] = 0; b[1] = 3; b[2] = 3; b[3] = 4; b[4] = 6;
// clang-format on

Vector ref(2);
ref[0] = 2;
ref[1] = 5;
Vector a{0, 2, 4, 5}, b{0, 3, 3, 4, 6};

Vector ref{2, 5};
Vector result(2);

thrust::device_vector<Iterator> end_vec(1);
Expand Down Expand Up @@ -66,17 +58,9 @@ void TestSetDifferenceCudaStreams()
using Vector = thrust::device_vector<int>;
using Iterator = Vector::iterator;

Vector a(4), b(5);

// clang-format off
a[0] = 0; a[1] = 2; a[2] = 4; a[3] = 5;
b[0] = 0; b[1] = 3; b[2] = 3; b[3] = 4; b[4] = 6;
// clang-format on

Vector ref(2);
ref[0] = 2;
ref[1] = 5;
Vector a{0, 2, 4, 5}, b{0, 3, 3, 4, 6};

Vector ref{2, 5};
Vector result(2);

cudaStream_t s;
Expand Down
34 changes: 6 additions & 28 deletions thrust/testing/cuda/set_difference_by_key.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,10 @@ void TestSetDifferenceByKeyDevice(ExecutionPolicy exec)
using Vector = thrust::device_vector<int>;
using Iterator = typename Vector::iterator;

// clang-format off
Vector a_key(4), b_key(5);
Vector a_val(4), b_val(5);

a_key[0] = 0; a_key[1] = 2; a_key[2] = 4; a_key[3] = 5;
a_val[0] = 0; a_val[1] = 0; a_val[2] = 0; a_val[3] = 0;

b_key[0] = 0; b_key[1] = 3; b_key[2] = 3; b_key[3] = 4; b_key[4] = 6;
b_val[0] = 1; b_val[1] = 1; b_val[2] = 1; b_val[3] = 1; b_val[4] = 1;

Vector ref_key(2), ref_val(2);
ref_key[0] = 2; ref_key[1] = 5;
ref_val[0] = 0; ref_val[1] = 0;
// clang-format on
Vector a_key{0, 2, 4, 5}, b_key{0, 3, 3, 4, 6};
Vector a_val(4, 0), b_val(5, 1);

Vector ref_key{2, 5}, ref_val{0, 0};
Vector result_key(2), result_val(2);

using iter_pair = thrust::pair<Iterator, Iterator>;
Expand Down Expand Up @@ -96,21 +85,10 @@ void TestSetDifferenceByKeyCudaStreams()
using Vector = thrust::device_vector<int>;
using Iterator = Vector::iterator;

// clang-format off
Vector a_key(4), b_key(5);
Vector a_val(4), b_val(5);

a_key[0] = 0; a_key[1] = 2; a_key[2] = 4; a_key[3] = 5;
a_val[0] = 0; a_val[1] = 0; a_val[2] = 0; a_val[3] = 0;

b_key[0] = 0; b_key[1] = 3; b_key[2] = 3; b_key[3] = 4; b_key[4] = 6;
b_val[0] = 1; b_val[1] = 1; b_val[2] = 1; b_val[3] = 1; b_val[4] = 1;

Vector ref_key(2), ref_val(2);
ref_key[0] = 2; ref_key[1] = 5;
ref_val[0] = 0; ref_val[1] = 0;
// clang-format on
Vector a_key{0, 2, 4, 5}, b_key{0, 3, 3, 4, 6};
Vector a_val(4, 0), b_val(5, 1);

Vector ref_key{2, 5}, ref_val{0, 0};
Vector result_key(2), result_val(2);

cudaStream_t s;
Expand Down
24 changes: 4 additions & 20 deletions thrust/testing/cuda/set_intersection.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,9 @@ void TestSetIntersectionDevice(ExecutionPolicy exec)
using Vector = thrust::device_vector<int>;
using Iterator = Vector::iterator;

Vector a(3), b(4);

// clang-format off
a[0] = 0; a[1] = 2; a[2] = 4;
b[0] = 0; b[1] = 3; b[2] = 3; b[3] = 4;
// clang-format on

Vector ref(2);
ref[0] = 0;
ref[1] = 4;
Vector a{0, 2, 4}, b{0, 3, 3, 4};

Vector ref{0, 4};
Vector result(2);
thrust::device_vector<Iterator> end_vec(1);

Expand Down Expand Up @@ -75,17 +67,9 @@ void TestSetIntersectionCudaStreams(ExecutionPolicy policy)
using Vector = thrust::device_vector<int>;
using Iterator = Vector::iterator;

Vector a(3), b(4);

// clang-format off
a[0] = 0; a[1] = 2; a[2] = 4;
b[0] = 0; b[1] = 3; b[2] = 3; b[3] = 4;
// clang-format on

Vector ref(2);
ref[0] = 0;
ref[1] = 4;
Vector a{0, 2, 4}, b{0, 3, 3, 4};

Vector ref{0, 4};
Vector result(2);

cudaStream_t s;
Expand Down
32 changes: 6 additions & 26 deletions thrust/testing/cuda/set_intersection_by_key.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,10 @@ void TestSetIntersectionByKeyDevice(ExecutionPolicy exec)
using Vector = thrust::device_vector<int>;
using Iterator = typename Vector::iterator;

// clang-format off
Vector a_key(3), b_key(4);
Vector a_val(3);

a_key[0] = 0; a_key[1] = 2; a_key[2] = 4;
a_val[0] = 0; a_val[1] = 0; a_val[2] = 0;

b_key[0] = 0; b_key[1] = 3; b_key[2] = 3; b_key[3] = 4;

Vector ref_key(2), ref_val(2);
ref_key[0] = 0; ref_key[1] = 4;
ref_val[0] = 0; ref_val[1] = 0;
// clang-format on
Vector a_key{0, 2, 4}, b_key{0, 3, 3, 4};
Vector a_val(3, 0);

Vector ref_key{0, 4}, ref_val{0, 0};
Vector result_key(2), result_val(2);

using iter_pair = thrust::pair<Iterator, Iterator>;
Expand Down Expand Up @@ -97,20 +87,10 @@ void TestSetIntersectionByKeyCudaStreams(ExecutionPolicy policy)
using Vector = thrust::device_vector<int>;
using Iterator = Vector::iterator;

// clang-format off
Vector a_key(3), b_key(4);
Vector a_val(3);

a_key[0] = 0; a_key[1] = 2; a_key[2] = 4;
a_val[0] = 0; a_val[1] = 0; a_val[2] = 0;

b_key[0] = 0; b_key[1] = 3; b_key[2] = 3; b_key[3] = 4;

Vector ref_key(2), ref_val(2);
ref_key[0] = 0; ref_key[1] = 4;
ref_val[0] = 0; ref_val[1] = 0;
// clang-format on
Vector a_key{0, 2, 4}, b_key{0, 3, 3, 4};
Vector a_val(3, 0);

Vector ref_key{0, 4}, ref_val{0, 0};
Vector result_key(2), result_val(2);

cudaStream_t s;
Expand Down
22 changes: 4 additions & 18 deletions thrust/testing/cuda/set_symmetric_difference.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,9 @@ void TestSetSymmetricDifferenceDevice(ExecutionPolicy exec)
using Vector = thrust::device_vector<int>;
using Iterator = typename Vector::iterator;

// clang-format off
Vector a(4), b(5);

a[0] = 0; a[1] = 2; a[2] = 4; a[3] = 6;
b[0] = 0; b[1] = 3; b[2] = 3; b[3] = 4; b[4] = 7;

Vector ref(5);
ref[0] = 2; ref[1] = 3; ref[2] = 3; ref[3] = 6; ref[4] = 7;
// clang-format on
Vector a{0, 2, 4, 6}, b{0, 3, 3, 4, 7};

Vector ref{2, 3, 3, 6, 7};
Vector result(5);
thrust::device_vector<Iterator> end_vec(1);

Expand Down Expand Up @@ -65,16 +58,9 @@ void TestSetSymmetricDifferenceCudaStreams()
using Vector = thrust::device_vector<int>;
using Iterator = Vector::iterator;

// clang-format off
Vector a(4), b(5);

a[0] = 0; a[1] = 2; a[2] = 4; a[3] = 6;
b[0] = 0; b[1] = 3; b[2] = 3; b[3] = 4; b[4] = 7;

Vector ref(5);
ref[0] = 2; ref[1] = 3; ref[2] = 3; ref[3] = 6; ref[4] = 7;
// clang-format on
Vector a{0, 2, 4, 6}, b{0, 3, 3, 4, 7};

Vector ref{2, 3, 3, 6, 7};
Vector result(5);

cudaStream_t s;
Expand Down
34 changes: 6 additions & 28 deletions thrust/testing/cuda/set_symmetric_difference_by_key.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,10 @@ void TestSetSymmetricDifferenceByKeyDevice(ExecutionPolicy exec)
using Vector = thrust::device_vector<int>;
using Iterator = typename Vector::iterator;

// clang-format off
Vector a_key(4), b_key(5);
Vector a_val(4), b_val(5);

a_key[0] = 0; a_key[1] = 2; a_key[2] = 4; a_key[3] = 6;
a_val[0] = 0; a_val[1] = 0; a_val[2] = 0; a_val[3] = 0;

b_key[0] = 0; b_key[1] = 3; b_key[2] = 3; b_key[3] = 4; b_key[4] = 7;
b_val[0] = 1; b_val[1] = 1; b_val[2] = 1; b_val[3] = 1; b_val[4] = 1;

Vector ref_key(5), ref_val(5);
ref_key[0] = 2; ref_key[1] = 3; ref_key[2] = 3; ref_key[3] = 6; ref_key[4] = 7;
ref_val[0] = 0; ref_val[1] = 1; ref_val[2] = 1; ref_val[3] = 0; ref_val[4] = 1;
// clang-format on
Vector a_key{0, 2, 4, 6}, b_key{0, 3, 3, 4, 7};
Vector a_val(4, 0), b_val(5, 1);

Vector ref_key{2, 3, 3, 6, 7}, ref_val{0, 1, 1, 0, 1};
Vector result_key(5), result_val(5);

using iter_pair = thrust::pair<Iterator, Iterator>;
Expand Down Expand Up @@ -94,21 +83,10 @@ void TestSetSymmetricDifferenceByKeyCudaStreams()
using Vector = thrust::device_vector<int>;
using Iterator = Vector::iterator;

// clang-format off
Vector a_key(4), b_key(5);
Vector a_val(4), b_val(5);

a_key[0] = 0; a_key[1] = 2; a_key[2] = 4; a_key[3] = 6;
a_val[0] = 0; a_val[1] = 0; a_val[2] = 0; a_val[3] = 0;

b_key[0] = 0; b_key[1] = 3; b_key[2] = 3; b_key[3] = 4; b_key[4] = 7;
b_val[0] = 1; b_val[1] = 1; b_val[2] = 1; b_val[3] = 1; b_val[4] = 1;

Vector ref_key(5), ref_val(5);
ref_key[0] = 2; ref_key[1] = 3; ref_key[2] = 3; ref_key[3] = 6; ref_key[4] = 7;
ref_val[0] = 0; ref_val[1] = 1; ref_val[2] = 1; ref_val[3] = 0; ref_val[4] = 1;
// clang-format on
Vector a_key{0, 2, 4, 6}, b_key{0, 3, 3, 4, 7};
Vector a_val(4, 0), b_val(5, 1);

Vector ref_key{2, 3, 3, 6, 7}, ref_val{0, 1, 1, 0, 1};
Vector result_key(5), result_val(5);

cudaStream_t s;
Expand Down
22 changes: 4 additions & 18 deletions thrust/testing/cuda/set_union.cu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,9 @@ void TestSetUnionDevice(ExecutionPolicy exec)
using Vector = thrust::device_vector<int>;
using Iterator = typename Vector::iterator;

// clang-format off
Vector a(3), b(4);

a[0] = 0; a[1] = 2; a[2] = 4;
b[0] = 0; b[1] = 3; b[2] = 3; b[3] = 4;

Vector ref(5);
ref[0] = 0; ref[1] = 2; ref[2] = 3; ref[3] = 3; ref[4] = 4;
// clang-format on
Vector a{0, 2, 4}, b{0, 3, 3, 4};

Vector ref{0, 2, 3, 3, 4};
Vector result(5);
thrust::device_vector<Iterator> end_vec(1);

Expand Down Expand Up @@ -64,16 +57,9 @@ void TestSetUnionCudaStreams()
using Vector = thrust::device_vector<int>;
using Iterator = Vector::iterator;

// clang-format off
Vector a(3), b(4);

a[0] = 0; a[1] = 2; a[2] = 4;
b[0] = 0; b[1] = 3; b[2] = 3; b[3] = 4;

Vector ref(5);
ref[0] = 0; ref[1] = 2; ref[2] = 3; ref[3] = 3; ref[4] = 4;
// clang-format on
Vector a{0, 2, 4}, b{0, 3, 3, 4};

Vector ref{0, 2, 3, 3, 4};
Vector result(5);

cudaStream_t s;
Expand Down
Loading

0 comments on commit 5456f46

Please sign in to comment.