Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix segmented algorithms tests #6221

Merged
merged 2 commits into from Apr 15, 2023
Merged

Fix segmented algorithms tests #6221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa72a5
Fix compilation of segmented algorithm tests on MSVC
Pansysk75 Apr 14, 2023
9b7f2f5
Fix segmented algorithm tests
Pansysk75 Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_adjacent_find1.cpp
View file
Open in desktop
Expand Up @@ -34,9 +34,10 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 1, 2, 3, 1, 5, 2, 3, 4, 2, 3, 2, 1, 2,
3, 4, 5, 6, 5, 6, 1, 2, 3, 4, 2, 1, 2, 3, 3, 5, 4, 3, 2, 1, 1, 2, 3, 4,
1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 7, 6, 5, 7, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

Expand Down
5 changes: 3 additions & 2 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_adjacent_find2.cpp
View file
Open in desktop
Expand Up @@ -34,9 +34,10 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 1, 2, 3, 1, 5, 2, 3, 4, 2, 3, 2, 1, 2,
3, 4, 5, 6, 5, 6, 1, 2, 3, 4, 2, 1, 2, 3, 3, 5, 4, 3, 2, 1, 1, 2, 3, 4,
1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 7, 6, 5, 7, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

Expand Down
11 changes: 6 additions & 5 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_all_of1.cpp
View file
Open in desktop
Expand Up @@ -29,16 +29,17 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 1, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 1, 2,
3, 4, 5, 6, 5, 6, 1, 2, 3, 4, 1, 1, 2, 3, 4, 5, 4, 3, 2, 1, 1, 2, 3, 4,
1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 7, 6, 5, 7, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

struct op5
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 5;
}
Expand All @@ -47,7 +48,7 @@ struct op5
struct op0
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 0;
}
Expand All @@ -56,7 +57,7 @@ struct op0
struct op8
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 8;
}
Expand Down
11 changes: 6 additions & 5 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_all_of2.cpp
View file
Open in desktop
Expand Up @@ -29,16 +29,17 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 1, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 1, 2,
3, 4, 5, 6, 5, 6, 1, 2, 3, 4, 1, 1, 2, 3, 4, 5, 4, 3, 2, 1, 1, 2, 3, 4,
1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 7, 6, 5, 7, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

struct op5
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 5;
}
Expand All @@ -47,7 +48,7 @@ struct op5
struct op0
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 0;
}
Expand All @@ -56,7 +57,7 @@ struct op0
struct op8
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 8;
}
Expand Down
11 changes: 6 additions & 5 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_any_of1.cpp
View file
Open in desktop
Expand Up @@ -29,16 +29,17 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 1, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 1, 2,
3, 4, 5, 6, 5, 6, 1, 2, 3, 4, 1, 1, 2, 3, 4, 5, 4, 3, 2, 1, 1, 2, 3, 4,
1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 7, 6, 5, 7, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

struct op5
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 5;
}
Expand All @@ -47,7 +48,7 @@ struct op5
struct op0
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 0;
}
Expand All @@ -56,7 +57,7 @@ struct op0
struct op8
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 8;
}
Expand Down
11 changes: 6 additions & 5 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_any_of2.cpp
View file
Open in desktop
Expand Up @@ -29,16 +29,17 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 1, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 1, 2,
3, 4, 5, 6, 5, 6, 1, 2, 3, 4, 1, 1, 2, 3, 4, 5, 4, 3, 2, 1, 1, 2, 3, 4,
1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 7, 6, 5, 7, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

struct op5
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 5;
}
Expand All @@ -47,7 +48,7 @@ struct op5
struct op0
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 0;
}
Expand All @@ -56,7 +57,7 @@ struct op0
struct op8
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 8;
}
Expand Down
5 changes: 3 additions & 2 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_max_element1.cpp
View file
Open in desktop
Expand Up @@ -31,9 +31,10 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 6, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 6, 2,
3, 4, 5, 6, 5, 6, 6, 2, 3, 4, 6, 6, 2, 3, 4, 5, 4, 3, 2, 6, 6, 2, 3, 4,
6, 2, 3, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 5, 8, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

Expand Down
5 changes: 3 additions & 2 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_max_element2.cpp
View file
Open in desktop
Expand Up @@ -31,9 +31,10 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 6, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 6, 2,
3, 4, 5, 6, 5, 6, 6, 2, 3, 4, 6, 6, 2, 3, 4, 5, 4, 3, 2, 6, 6, 2, 3, 4,
6, 2, 3, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 5, 8, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

Expand Down
5 changes: 3 additions & 2 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_min_element1.cpp
View file
Open in desktop
Expand Up @@ -31,9 +31,10 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 6, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 6, 2,
3, 4, 5, 6, 5, 6, 6, 2, 3, 4, 6, 6, 2, 3, 4, 5, 4, 3, 2, 6, 6, 2, 3, 4,
6, 2, 3, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 5, 8, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

Expand Down
5 changes: 3 additions & 2 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_min_element2.cpp
View file
Open in desktop
Expand Up @@ -31,9 +31,10 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 6, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 6, 2,
3, 4, 5, 6, 5, 6, 6, 2, 3, 4, 6, 6, 2, 3, 4, 5, 4, 3, 2, 6, 6, 2, 3, 4,
6, 2, 3, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 5, 8, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

Expand Down
5 changes: 3 additions & 2 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_minmax_element1.cpp
View file
Open in desktop
Expand Up @@ -31,9 +31,10 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 6, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 6, 2,
3, 4, 5, 6, 5, 6, 6, 2, 3, 4, 6, 6, 2, 3, 4, 5, 4, 3, 2, 6, 6, 2, 3, 4,
6, 2, 3, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 5, 8, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

Expand Down
5 changes: 3 additions & 2 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_minmax_element2.cpp
View file
Open in desktop
Expand Up @@ -31,9 +31,10 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 6, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 6, 2,
3, 4, 5, 6, 5, 6, 6, 2, 3, 4, 6, 6, 2, 3, 4, 5, 4, 3, 2, 6, 6, 2, 3, 4,
6, 2, 3, 6, 6, 6, 6, 6, 6, 6, 6, 7, 6, 5, 8, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

Expand Down
11 changes: 6 additions & 5 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_none1.cpp
View file
Open in desktop
Expand Up @@ -29,16 +29,17 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 1, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 1, 2,
3, 4, 5, 6, 5, 6, 1, 2, 3, 4, 1, 1, 2, 3, 4, 5, 4, 3, 2, 1, 1, 2, 3, 4,
1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 7, 6, 5, 7, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

struct op5
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 5;
}
Expand All @@ -47,7 +48,7 @@ struct op5
struct op0
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 0;
}
Expand All @@ -56,7 +57,7 @@ struct op0
struct op8
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 8;
}
Expand Down
11 changes: 6 additions & 5 deletions libs/full/segmented_algorithms/tests/unit/partitioned_vector_none2.cpp
View file
Open in desktop
Expand Up @@ -29,16 +29,17 @@ void initialize(hpx::partitioned_vector<T>& xvalues)
T init_array[SIZE] = {1, 2, 3, 4, 5, 1, 2, 3, 3, 5, 5, 3, 4, 2, 3, 2, 1, 2,
3, 4, 5, 6, 5, 6, 1, 2, 3, 4, 1, 1, 2, 3, 4, 5, 4, 3, 2, 1, 1, 2, 3, 4,
1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 7, 6, 5, 7, 5, 4, 2, 3, 4, 5, 2};
for (int i = 0; i < SIZE; i++)
typename hpx::partitioned_vector<T>::iterator it = xvalues.begin();
for (int i = 0; i < SIZE; i++, it++)
{
xvalues.set_value(i, init_array[i]);
*it = init_array[i];
}
}

struct op5
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 5;
}
Expand All @@ -47,7 +48,7 @@ struct op5
struct op0
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 0;
}
Expand All @@ -56,7 +57,7 @@ struct op0
struct op8
{
template <typename T>
bool operator()(T& value)
bool operator()(T& value) const
{
return value > 8;
}
Expand Down