Skip to content

Commit

Permalink
Reduce number of instantiations in set_symmetric_difference tests (#…
Browse files Browse the repository at this point in the history 
…1476)

* Reduce number of instantiations in `set_symmetric_difference` tests

We are getting CI failures, as those tests can run into timeouts and also some PTX issues due to large binary.

We do not really need to test the full matrix, so remove `forward_iterator` tests.

Locally that brings down test time from 170s to 50s

Fixes nvbug4544983

* Also reduce test matrix for `merge` tests
  • Loading branch information
@miscco
miscco authored Mar 5, 2024
1 parent a5c4747 commit aa09099
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions libcudacxx/test/libcudacxx/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ __host__ __device__ TEST_CONSTEXPR_CXX14 void test4() {
template <class T, class Iter1, class Iter2>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test3() {
test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
test4<T, Iter1, Iter2, forward_iterator<T*> >();
//test4<T, Iter1, Iter2, forward_iterator<T*> >();
test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
test4<T, Iter1, Iter2, random_access_iterator<T*> >();
test4<T, Iter1, Iter2, T*>();
Expand All @@ -66,7 +66,7 @@ __host__ __device__ TEST_CONSTEXPR_CXX14 void test3() {
template <class T, class Iter1>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test2() {
test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
//test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
test3<T, Iter1, const T*>();
Expand All @@ -75,7 +75,7 @@ __host__ __device__ TEST_CONSTEXPR_CXX14 void test2() {
template <class T>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test1() {
test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
//test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
test2<T, const T*>();
Expand Down
6 changes: 3 additions & 3 deletions libcudacxx/test/libcudacxx/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ __host__ __device__ TEST_CONSTEXPR_CXX14 void test4() {
template <class T, class Iter1, class Iter2>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test3() {
test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
test4<T, Iter1, Iter2, forward_iterator<T*> >();
//test4<T, Iter1, Iter2, forward_iterator<T*> >();
test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
test4<T, Iter1, Iter2, random_access_iterator<T*> >();
test4<T, Iter1, Iter2, T*>();
Expand All @@ -69,7 +69,7 @@ __host__ __device__ TEST_CONSTEXPR_CXX14 void test3() {
template <class T, class Iter1>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test2() {
test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
//test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
test3<T, Iter1, const T*>();
Expand All @@ -78,7 +78,7 @@ __host__ __device__ TEST_CONSTEXPR_CXX14 void test2() {
template <class T>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test1() {
test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
//test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
test2<T, const T*>();
Expand Down
6 changes: 3 additions & 3 deletions ...alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ template<class T, class Iter1, class Iter2>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test3()
{
test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
test4<T, Iter1, Iter2, forward_iterator<T*> >();
//test4<T, Iter1, Iter2, forward_iterator<T*> >();
test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
test4<T, Iter1, Iter2, random_access_iterator<T*> >();
test4<T, Iter1, Iter2, T*>();
Expand All @@ -65,7 +65,7 @@ template<class T, class Iter1>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test2()
{
test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
//test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
test3<T, Iter1, const T*>();
Expand All @@ -75,7 +75,7 @@ template<class T>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test1()
{
test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
//test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
test2<T, const T*>();
Expand Down
6 changes: 3 additions & 3 deletions ...orting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ template<class T, class Iter1, class Iter2>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test3()
{
test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
test4<T, Iter1, Iter2, forward_iterator<T*> >();
//test4<T, Iter1, Iter2, forward_iterator<T*> >();
test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
test4<T, Iter1, Iter2, random_access_iterator<T*> >();
test4<T, Iter1, Iter2, T*>();
Expand All @@ -66,7 +66,7 @@ template<class T, class Iter1>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test2()
{
test3<T, Iter1, cpp17_input_iterator<const T*> >();
test3<T, Iter1, forward_iterator<const T*> >();
//test3<T, Iter1, forward_iterator<const T*> >();
test3<T, Iter1, bidirectional_iterator<const T*> >();
test3<T, Iter1, random_access_iterator<const T*> >();
test3<T, Iter1, const T*>();
Expand All @@ -76,7 +76,7 @@ template<class T>
__host__ __device__ TEST_CONSTEXPR_CXX14 void test1()
{
test2<T, cpp17_input_iterator<const T*> >();
test2<T, forward_iterator<const T*> >();
//test2<T, forward_iterator<const T*> >();
test2<T, bidirectional_iterator<const T*> >();
test2<T, random_access_iterator<const T*> >();
test2<T, const T*>();
Expand Down

0 comments on commit aa09099

Please sign in to comment.