From c5f2624b75c33d649173edac3c34007bcfa7cd84 Mon Sep 17 00:00:00 2001
From: Tomas Oberhuber <tomas.oberhuber@fjfi.cvut.cz>
Date: Tue, 4 Feb 2020 12:36:01 +0100
Subject: [PATCH] Renaming sparse matrix unit tests.
---
src/UnitTests/Matrices/CMakeLists.txt | 50 +++++++++----------
.../Matrices/SparseMatrixTest_CSR.cpp | 1 +
...R_segments.cpp => SparseMatrixTest_CSR.cu} | 0
..._CSR_segments.h => SparseMatrixTest_CSR.h} | 0
.../Matrices/SparseMatrixTest_CSR_segments.cu | 1 -
.../Matrices/SparseMatrixTest_Ellpack.cpp | 1 +
...gments.cpp => SparseMatrixTest_Ellpack.cu} | 0
..._segments.h => SparseMatrixTest_Ellpack.h} | 0
.../SparseMatrixTest_Ellpack_segments.cu | 1 -
.../SparseMatrixTest_SlicedEllpack.cpp | 1 +
....cpp => SparseMatrixTest_SlicedEllpack.cu} | 0
...nts.h => SparseMatrixTest_SlicedEllpack.h} | 0
...SparseMatrixTest_SlicedEllpack_segments.cu | 1 -
13 files changed, 28 insertions(+), 28 deletions(-)
create mode 100644 src/UnitTests/Matrices/SparseMatrixTest_CSR.cpp
rename src/UnitTests/Matrices/{SparseMatrixTest_CSR_segments.cpp => SparseMatrixTest_CSR.cu} (100%)
rename src/UnitTests/Matrices/{SparseMatrixTest_CSR_segments.h => SparseMatrixTest_CSR.h} (100%)
delete mode 100644 src/UnitTests/Matrices/SparseMatrixTest_CSR_segments.cu
create mode 100644 src/UnitTests/Matrices/SparseMatrixTest_Ellpack.cpp
rename src/UnitTests/Matrices/{SparseMatrixTest_Ellpack_segments.cpp => SparseMatrixTest_Ellpack.cu} (100%)
rename src/UnitTests/Matrices/{SparseMatrixTest_Ellpack_segments.h => SparseMatrixTest_Ellpack.h} (100%)
delete mode 100644 src/UnitTests/Matrices/SparseMatrixTest_Ellpack_segments.cu
create mode 100644 src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack.cpp
rename src/UnitTests/Matrices/{SparseMatrixTest_SlicedEllpack_segments.cpp => SparseMatrixTest_SlicedEllpack.cu} (100%)
rename src/UnitTests/Matrices/{SparseMatrixTest_SlicedEllpack_segments.h => SparseMatrixTest_SlicedEllpack.h} (100%)
delete mode 100644 src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack_segments.cu
diff --git a/src/UnitTests/Matrices/CMakeLists.txt b/src/UnitTests/Matrices/CMakeLists.txt
index d7259fc030..c4b2fabd39 100644
--- a/src/UnitTests/Matrices/CMakeLists.txt
+++ b/src/UnitTests/Matrices/CMakeLists.txt
@@ -1,9 +1,6 @@
ADD_SUBDIRECTORY( Legacy )
IF( BUILD_CUDA )
- CUDA_ADD_EXECUTABLE( SparseMatrixCopyTest SparseMatrixCopyTest.cu OPTIONS ${CXX_TESTS_FLAGS} )
- TARGET_LINK_LIBRARIES( SparseMatrixCopyTest ${GTEST_BOTH_LIBRARIES} )
-
CUDA_ADD_EXECUTABLE( DenseMatrixTest DenseMatrixTest.cu OPTIONS ${CXX_TESTS_FLAGS} )
TARGET_LINK_LIBRARIES( DenseMatrixTest ${GTEST_BOTH_LIBRARIES} )
@@ -16,23 +13,22 @@ IF( BUILD_CUDA )
CUDA_ADD_EXECUTABLE( MultidiagonalMatrixTest MultidiagonalMatrixTest.cu OPTIONS ${CXX_TESTS_FLAGS} )
TARGET_LINK_LIBRARIES( MultidiagonalMatrixTest ${GTEST_BOTH_LIBRARIES} )
- CUDA_ADD_EXECUTABLE( SparseMatrixTest_CSR_segments SparseMatrixTest_CSR_segments.cu OPTIONS ${CXX_TESTS_FLAGS} )
- TARGET_LINK_LIBRARIES( SparseMatrixTest_CSR_segments ${GTEST_BOTH_LIBRARIES} )
+ CUDA_ADD_EXECUTABLE( SparseMatrixTest_CSR SparseMatrixTest_CSR.cu OPTIONS ${CXX_TESTS_FLAGS} )
+ TARGET_LINK_LIBRARIES( SparseMatrixTest_CSR ${GTEST_BOTH_LIBRARIES} )
- CUDA_ADD_EXECUTABLE( SparseMatrixTest_Ellpack_segments SparseMatrixTest_Ellpack_segments.cu OPTIONS ${CXX_TESTS_FLAGS} )
- TARGET_LINK_LIBRARIES( SparseMatrixTest_Ellpack_segments ${GTEST_BOTH_LIBRARIES} )
+ CUDA_ADD_EXECUTABLE( SparseMatrixTest_Ellpack SparseMatrixTest_Ellpack.cu OPTIONS ${CXX_TESTS_FLAGS} )
+ TARGET_LINK_LIBRARIES( SparseMatrixTest_Ellpack ${GTEST_BOTH_LIBRARIES} )
- CUDA_ADD_EXECUTABLE( SparseMatrixTest_SlicedEllpack_segments SparseMatrixTest_SlicedEllpack_segments.cu OPTIONS ${CXX_TESTS_FLAGS} )
- TARGET_LINK_LIBRARIES( SparseMatrixTest_SlicedEllpack_segments ${GTEST_BOTH_LIBRARIES} )
+ CUDA_ADD_EXECUTABLE( SparseMatrixTest_SlicedEllpack SparseMatrixTest_SlicedEllpack.cu OPTIONS ${CXX_TESTS_FLAGS} )
+ TARGET_LINK_LIBRARIES( SparseMatrixTest_SlicedEllpack ${GTEST_BOTH_LIBRARIES} )
+
+ CUDA_ADD_EXECUTABLE( SparseMatrixCopyTest SparseMatrixCopyTest.cu OPTIONS ${CXX_TESTS_FLAGS} )
+ TARGET_LINK_LIBRARIES( SparseMatrixCopyTest ${GTEST_BOTH_LIBRARIES} )
CUDA_ADD_EXECUTABLE( BinarySparseMatrixTest BinarySparseMatrixTest.cu OPTIONS ${CXX_TESTS_FLAGS} )
TARGET_LINK_LIBRARIES( BinarySparseMatrixTest ${GTEST_BOTH_LIBRARIES} )
ELSE( BUILD_CUDA )
- ADD_EXECUTABLE( SparseMatrixCopyTest SparseMatrixCopyTest.cpp )
- TARGET_COMPILE_OPTIONS( SparseMatrixCopyTest PRIVATE ${CXX_TESTS_FLAGS} )
- TARGET_LINK_LIBRARIES( SparseMatrixCopyTest ${GTEST_BOTH_LIBRARIES} )
-
ADD_EXECUTABLE( DenseMatrixTest DenseMatrixTest.cpp )
TARGET_COMPILE_OPTIONS( DenseMatrixTest PRIVATE ${CXX_TESTS_FLAGS} )
TARGET_LINK_LIBRARIES( DenseMatrixTest ${GTEST_BOTH_LIBRARIES} )
@@ -49,17 +45,21 @@ ELSE( BUILD_CUDA )
TARGET_COMPILE_OPTIONS( MultidiagonalMatrixTest PRIVATE ${CXX_TESTS_FLAGS} )
TARGET_LINK_LIBRARIES( MultidiagonalMatrixTest ${GTEST_BOTH_LIBRARIES} )
- ADD_EXECUTABLE( SparseMatrixTest_CSR_segments SparseMatrixTest_CSR_segments.cpp )
- TARGET_COMPILE_OPTIONS( SparseMatrixTest_CSR_segments PRIVATE ${CXX_TESTS_FLAGS} )
- TARGET_LINK_LIBRARIES( SparseMatrixTest_CSR_segments ${GTEST_BOTH_LIBRARIES} )
+ ADD_EXECUTABLE( SparseMatrixTest_CSR SparseMatrixTest_CSR.cpp )
+ TARGET_COMPILE_OPTIONS( SparseMatrixTest_CSR PRIVATE ${CXX_TESTS_FLAGS} )
+ TARGET_LINK_LIBRARIES( SparseMatrixTest_CSR ${GTEST_BOTH_LIBRARIES} )
+
+ ADD_EXECUTABLE( SparseMatrixTest_Ellpack SparseMatrixTest_Ellpack.cpp )
+ TARGET_COMPILE_OPTIONS( SparseMatrixTest_Ellpack PRIVATE ${CXX_TESTS_FLAGS} )
+ TARGET_LINK_LIBRARIES( SparseMatrixTest_Ellpack ${GTEST_BOTH_LIBRARIES} )
- ADD_EXECUTABLE( SparseMatrixTest_Ellpack_segments SparseMatrixTest_Ellpack_segments.cpp )
- TARGET_COMPILE_OPTIONS( SparseMatrixTest_Ellpack_segments PRIVATE ${CXX_TESTS_FLAGS} )
- TARGET_LINK_LIBRARIES( SparseMatrixTest_Ellpack_segments ${GTEST_BOTH_LIBRARIES} )
+ ADD_EXECUTABLE( SparseMatrixTest_SlicedEllpack SparseMatrixTest_SlicedEllpack.cpp )
+ TARGET_COMPILE_OPTIONS( SparseMatrixTest_SlicedEllpack PRIVATE ${CXX_TESTS_FLAGS} )
+ TARGET_LINK_LIBRARIES( SparseMatrixTest_SlicedEllpack ${GTEST_BOTH_LIBRARIES} )
- ADD_EXECUTABLE( SparseMatrixTest_SlicedEllpack_segments SparseMatrixTest_SlicedEllpack_segments.cpp )
- TARGET_COMPILE_OPTIONS( SparseMatrixTest_SlicedEllpack_segments PRIVATE ${CXX_TESTS_FLAGS} )
- TARGET_LINK_LIBRARIES( SparseMatrixTest_SlicedEllpack_segments ${GTEST_BOTH_LIBRARIES} )
+ ADD_EXECUTABLE( SparseMatrixCopyTest SparseMatrixCopyTest.cpp )
+ TARGET_COMPILE_OPTIONS( SparseMatrixCopyTest PRIVATE ${CXX_TESTS_FLAGS} )
+ TARGET_LINK_LIBRARIES( SparseMatrixCopyTest ${GTEST_BOTH_LIBRARIES} )
ADD_EXECUTABLE( BinarySparseMatrixTest BinarySparseMatrixTest.cpp )
TARGET_COMPILE_OPTIONS( BinarySparseMatrixTest PRIVATE ${CXX_TESTS_FLAGS} )
@@ -72,9 +72,9 @@ ADD_TEST( DenseMatrixTest ${EXECUTABLE_OUTPUT_PATH}/DenseMatrixTest${CMAKE_EXECU
ADD_TEST( TridiagonalMatrixTest ${EXECUTABLE_OUTPUT_PATH}/TridiagonalMatrixTest${CMAKE_EXECUTABLE_SUFFIX} )
ADD_TEST( MultidiagonalMatrixTest ${EXECUTABLE_OUTPUT_PATH}/MultidiagonalMatrixTest${CMAKE_EXECUTABLE_SUFFIX} )
-ADD_TEST( SparseMatrixTest_CSR_segments ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_CSR_segments${CMAKE_EXECUTABLE_SUFFIX} )
-ADD_TEST( SparseMatrixTest_Ellpack_segments ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_Ellpack_segments${CMAKE_EXECUTABLE_SUFFIX} )
-ADD_TEST( SparseMatrixTest_SlicedEllpack_segments ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_SlicedEllpack_segments${CMAKE_EXECUTABLE_SUFFIX} )
+ADD_TEST( SparseMatrixTest_CSR ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_CSR${CMAKE_EXECUTABLE_SUFFIX} )
+ADD_TEST( SparseMatrixTest_Ellpack ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_Ellpack${CMAKE_EXECUTABLE_SUFFIX} )
+ADD_TEST( SparseMatrixTest_SlicedEllpack ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_SlicedEllpack${CMAKE_EXECUTABLE_SUFFIX} )
ADD_TEST( BinarySparseMatrixTest ${EXECUTABLE_OUTPUT_PATH}/BinarySparseMatrixTest${CMAKE_EXECUTABLE_SUFFIX} )
if( ${BUILD_MPI} )
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_CSR.cpp b/src/UnitTests/Matrices/SparseMatrixTest_CSR.cpp
new file mode 100644
index 0000000000..258ad2c538
--- /dev/null
+++ b/src/UnitTests/Matrices/SparseMatrixTest_CSR.cpp
@@ -0,0 +1 @@
+#include "SparseMatrixTest_CSR.h"
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_CSR_segments.cpp b/src/UnitTests/Matrices/SparseMatrixTest_CSR.cu
similarity index 100%
rename from src/UnitTests/Matrices/SparseMatrixTest_CSR_segments.cpp
rename to src/UnitTests/Matrices/SparseMatrixTest_CSR.cu
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_CSR_segments.h b/src/UnitTests/Matrices/SparseMatrixTest_CSR.h
similarity index 100%
rename from src/UnitTests/Matrices/SparseMatrixTest_CSR_segments.h
rename to src/UnitTests/Matrices/SparseMatrixTest_CSR.h
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_CSR_segments.cu b/src/UnitTests/Matrices/SparseMatrixTest_CSR_segments.cu
deleted file mode 100644
index 771c74b9a2..0000000000
--- a/src/UnitTests/Matrices/SparseMatrixTest_CSR_segments.cu
+++ /dev/null
@@ -1 +0,0 @@
-#include "SparseMatrixTest_CSR_segments.h"
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_Ellpack.cpp b/src/UnitTests/Matrices/SparseMatrixTest_Ellpack.cpp
new file mode 100644
index 0000000000..c454706f0b
--- /dev/null
+++ b/src/UnitTests/Matrices/SparseMatrixTest_Ellpack.cpp
@@ -0,0 +1 @@
+#include "SparseMatrixTest_Ellpack.h"
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_Ellpack_segments.cpp b/src/UnitTests/Matrices/SparseMatrixTest_Ellpack.cu
similarity index 100%
rename from src/UnitTests/Matrices/SparseMatrixTest_Ellpack_segments.cpp
rename to src/UnitTests/Matrices/SparseMatrixTest_Ellpack.cu
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_Ellpack_segments.h b/src/UnitTests/Matrices/SparseMatrixTest_Ellpack.h
similarity index 100%
rename from src/UnitTests/Matrices/SparseMatrixTest_Ellpack_segments.h
rename to src/UnitTests/Matrices/SparseMatrixTest_Ellpack.h
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_Ellpack_segments.cu b/src/UnitTests/Matrices/SparseMatrixTest_Ellpack_segments.cu
deleted file mode 100644
index 63219e9b07..0000000000
--- a/src/UnitTests/Matrices/SparseMatrixTest_Ellpack_segments.cu
+++ /dev/null
@@ -1 +0,0 @@
-#include "SparseMatrixTest_Ellpack_segments.h"
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack.cpp b/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack.cpp
new file mode 100644
index 0000000000..40e2e94b81
--- /dev/null
+++ b/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack.cpp
@@ -0,0 +1 @@
+#include "SparseMatrixTest_SlicedEllpack.h"
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack_segments.cpp b/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack.cu
similarity index 100%
rename from src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack_segments.cpp
rename to src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack.cu
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack_segments.h b/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack.h
similarity index 100%
rename from src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack_segments.h
rename to src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack.h
diff --git a/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack_segments.cu b/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack_segments.cu
deleted file mode 100644
index a88301100d..0000000000
--- a/src/UnitTests/Matrices/SparseMatrixTest_SlicedEllpack_segments.cu
+++ /dev/null
@@ -1 +0,0 @@
-#include "SparseMatrixTest_SlicedEllpack_segments.h"
--
GitLab