From c22a969b8d9a4d7c30d82c13b86bfc4e987ce131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkovsky@mmg.fjfi.cvut.cz>
Date: Sun, 1 Mar 2020 09:30:23 +0100
Subject: [PATCH] Removed unnecessary/duplicate types from the instantiations
of SegmentsTest
---
src/UnitTests/Containers/Segments/SegmentsTest_CSR.h | 10 +---------
.../Containers/Segments/SegmentsTest_Ellpack.h | 10 +---------
.../Containers/Segments/SegmentsTest_SlicedEllpack.h | 10 +---------
3 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/src/UnitTests/Containers/Segments/SegmentsTest_CSR.h b/src/UnitTests/Containers/Segments/SegmentsTest_CSR.h
index 81d4e9ff34..f2a3a18639 100644
--- a/src/UnitTests/Containers/Segments/SegmentsTest_CSR.h
+++ b/src/UnitTests/Containers/Segments/SegmentsTest_CSR.h
@@ -27,19 +27,11 @@ protected:
// types for which MatrixTest is instantiated
using CSRSegmentsTypes = ::testing::Types
<
- TNL::Containers::Segments::CSR< TNL::Devices::Host, int >,
- TNL::Containers::Segments::CSR< TNL::Devices::Host, long >,
- TNL::Containers::Segments::CSR< TNL::Devices::Host, int >,
- TNL::Containers::Segments::CSR< TNL::Devices::Host, long >,
TNL::Containers::Segments::CSR< TNL::Devices::Host, int >,
TNL::Containers::Segments::CSR< TNL::Devices::Host, long >
#ifdef HAVE_CUDA
,TNL::Containers::Segments::CSR< TNL::Devices::Cuda, int >,
- TNL::Containers::Segments::CSR< TNL::Devices::Cuda, long >,
- TNL::Containers::Segments::CSR< TNL::Devices::Cuda, int >,
- TNL::Containers::Segments::CSR< TNL::Devices::Cuda, long >,
- TNL::Containers::Segments::CSR< TNL::Devices::Cuda, int >,
- TNL::Containers::Segments::CSR< TNL::Devices::Cuda, long >,
+ TNL::Containers::Segments::CSR< TNL::Devices::Cuda, long >
#endif
>;
diff --git a/src/UnitTests/Containers/Segments/SegmentsTest_Ellpack.h b/src/UnitTests/Containers/Segments/SegmentsTest_Ellpack.h
index 7b5e90b238..7def8a7329 100644
--- a/src/UnitTests/Containers/Segments/SegmentsTest_Ellpack.h
+++ b/src/UnitTests/Containers/Segments/SegmentsTest_Ellpack.h
@@ -27,19 +27,11 @@ protected:
// types for which MatrixTest is instantiated
using EllpackSegmentsTypes = ::testing::Types
<
- TNL::Containers::Segments::Ellpack< TNL::Devices::Host, int >,
- TNL::Containers::Segments::Ellpack< TNL::Devices::Host, long >,
- TNL::Containers::Segments::Ellpack< TNL::Devices::Host, int >,
- TNL::Containers::Segments::Ellpack< TNL::Devices::Host, long >,
TNL::Containers::Segments::Ellpack< TNL::Devices::Host, int >,
TNL::Containers::Segments::Ellpack< TNL::Devices::Host, long >
#ifdef HAVE_CUDA
,TNL::Containers::Segments::Ellpack< TNL::Devices::Cuda, int >,
- TNL::Containers::Segments::Ellpack< TNL::Devices::Cuda, long >,
- TNL::Containers::Segments::Ellpack< TNL::Devices::Cuda, int >,
- TNL::Containers::Segments::Ellpack< TNL::Devices::Cuda, long >,
- TNL::Containers::Segments::Ellpack< TNL::Devices::Cuda, int >,
- TNL::Containers::Segments::Ellpack< TNL::Devices::Cuda, long >,
+ TNL::Containers::Segments::Ellpack< TNL::Devices::Cuda, long >
#endif
>;
diff --git a/src/UnitTests/Containers/Segments/SegmentsTest_SlicedEllpack.h b/src/UnitTests/Containers/Segments/SegmentsTest_SlicedEllpack.h
index 1bcff31918..51131c7dfb 100644
--- a/src/UnitTests/Containers/Segments/SegmentsTest_SlicedEllpack.h
+++ b/src/UnitTests/Containers/Segments/SegmentsTest_SlicedEllpack.h
@@ -27,19 +27,11 @@ protected:
// types for which MatrixTest is instantiated
using SlicedEllpackSegmentsTypes = ::testing::Types
<
- TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Host, int >,
- TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Host, long >,
- TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Host, int >,
- TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Host, long >,
TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Host, int >,
TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Host, long >
#ifdef HAVE_CUDA
,TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Cuda, int >,
- TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Cuda, long >,
- TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Cuda, int >,
- TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Cuda, long >,
- TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Cuda, int >,
- TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Cuda, long >,
+ TNL::Containers::Segments::SlicedEllpack< TNL::Devices::Cuda, long >
#endif
>;
--
GitLab