Renaming system directory and moving platform (sequential) specific t…

…ests under the platform subdirectory
cmu-sei · Jun 14, 2018 · d49e9e6 · d49e9e6
1 parent b117eff
commit d49e9e6
Show file tree

Hide file tree

Showing 28 changed files with 42 additions and 46 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -30,8 +30,8 @@ endif()
 
 message("Configuring platform: ${PLATFORM}")
 
-if (EXISTS ${CMAKE_SOURCE_DIR}/graphblas/system/${PLATFORM})
-    set(PLATFORM_SOURCE_DIR ${CMAKE_SOURCE_DIR}/graphblas/system/${PLATFORM})
+if (EXISTS ${CMAKE_SOURCE_DIR}/graphblas/platforms/${PLATFORM})
+    set(PLATFORM_SOURCE_DIR ${CMAKE_SOURCE_DIR}/graphblas/platforms/${PLATFORM})
 else()
     unset(PLATFORM CACHE)
     message(FATAL_ERROR "Specified platform directory does not exist.")
@@ -64,7 +64,7 @@ foreach( testsourcefile ${TEST_SOURCES} )
 endforeach( testsourcefile ${TEST_SOURCES} )
 
 ### Make extra PLATFORM-specific tests
-file( GLOB TEST_SOURCES LIST_DIRECTORIES false ${CMAKE_SOURCE_DIR}/test/${PLATFORM}/*.cpp )
+file( GLOB TEST_SOURCES LIST_DIRECTORIES false ${PLATFORM_SOURCE_DIR}/test/*.cpp )
 foreach( testsourcefile ${TEST_SOURCES} )
     get_filename_component(justname ${testsourcefile} NAME)
     string( REPLACE ".cpp" "" testname ${justname} )

diff --git a/src/graphblas/system/README_backend.txt → src/graphblas/platforms/README_backend.txt b/src/graphblas/system/README_backend.txt → src/graphblas/platforms/README_backend.txt
diff --git a/...hblas/system/backend_include_template.hpp → ...as/platforms/backend_include_template.hpp b/...hblas/system/backend_include_template.hpp → ...as/platforms/backend_include_template.hpp
@@ -23,44 +23,44 @@
 // 2. Specify a single include file that contains the include
 // directives for all of the platform's header files
 #if(GB_INCLUDE_BACKEND_ALL)
-#include <graphblas/system/GB_BACKEND_NAME/GB_BACKEND_NAME.hpp>
+#include <graphblas/platforms/GB_BACKEND_NAME/GB_BACKEND_NAME.hpp>
 #undef GB_INCLUDE_BACKEND_ALL
 #endif
 
 // 3. Specify the include file that defines the platform's Matrix base class
 #if(GB_INCLUDE_BACKEND_MATRIX)
-#include <graphblas/system/GB_BACKEND_NAME/Matrix.hpp>
+#include <graphblas/platforms/GB_BACKEND_NAME/Matrix.hpp>
 #undef GB_INCLUDE_BACKEND_MATRIX
 #endif
 
 // 4. Specify the include file that defines the platform's Vector base class
 #if(GB_INCLUDE_BACKEND_VECTOR)
-#include <graphblas/system/GB_BACKEND_NAME/Vector.hpp>
+#include <graphblas/platforms/GB_BACKEND_NAME/Vector.hpp>
 #undef GB_INCLUDE_BACKEND_VECTOR
 #endif
 
 // 5. Specify the include file that defines the pretty_print and
 // pretty_print_matrix functions.
 #if(GB_INCLUDE_BACKEND_UTILITY)
-#include <graphblas/system/GB_BACKEND_NAME/utility.hpp>
+#include <graphblas/platforms/GB_BACKEND_NAME/utility.hpp>
 #undef GB_INCLUDE_BACKEND_UTILITY
 #endif
 
 // 6. Specify the include file that defines the platform's TransposeView class
 #if(GB_INCLUDE_BACKEND_TRANSPOSE_VIEW)
-#include <graphblas/system/GB_BACKEND_NAME/TransposeView.hpp>
+#include <graphblas/platforms/GB_BACKEND_NAME/TransposeView.hpp>
 #undef GB_INCLUDE_BACKEND_TRANSPOSE_VIEW
 #endif
 
 // 7. Specify the include file that defines the platform's ComplementView class
 #if(GB_INCLUDE_BACKEND_COMPLEMENT_VIEW)
-#include <graphblas/system/GB_BACKEND_NAME/ComplementView.hpp>
+#include <graphblas/platforms/GB_BACKEND_NAME/ComplementView.hpp>
 #undef GB_INCLUDE_BACKEND_COMPLEMENT_VIEW
 #endif
 
 // 8. Specify the include file(s) that defines the platform's
 // operations functions.
 #if(GB_INCLUDE_BACKEND_OPERATIONS)
-#include <graphblas/system/GB_BACKEND_NAME/operations.hpp>
+#include <graphblas/platforms/GB_BACKEND_NAME/operations.hpp>
 #undef GB_INCLUDE_BACKEND_OPERATIONS
 #endif
diff --git a/.../system/sequential/BitmapSparseVector.hpp → ...atforms/sequential/BitmapSparseVector.hpp b/.../system/sequential/BitmapSparseVector.hpp → ...atforms/sequential/BitmapSparseVector.hpp
diff --git a/...blas/system/sequential/ComplementView.hpp → ...s/platforms/sequential/ComplementView.hpp b/...blas/system/sequential/ComplementView.hpp → ...s/platforms/sequential/ComplementView.hpp
@@ -16,9 +16,7 @@
 #ifndef GB_SEQUENTIAL_NEW_COMPLEMENT_VIEW_HPP
 #define GB_SEQUENTIAL_NEW_COMPLEMENT_VIEW_HPP
 
-#include <graphblas/system/sequential/types.hpp>
-
-#include <graphblas/system/sequential/Matrix.hpp>
+#include <graphblas/platforms/sequential/Matrix.hpp>
 
 namespace GraphBLAS
 {

diff --git a/...las/system/sequential/LilSparseMatrix.hpp → .../platforms/sequential/LilSparseMatrix.hpp b/...las/system/sequential/LilSparseMatrix.hpp → .../platforms/sequential/LilSparseMatrix.hpp
@@ -22,8 +22,6 @@
 
 #include <graphblas/graphblas.hpp>
 
-#include <graphblas/system/sequential/types.hpp>
-
 //****************************************************************************
 
 namespace GraphBLAS

diff --git a/src/graphblas/system/sequential/Matrix.hpp → ...graphblas/platforms/sequential/Matrix.hpp b/src/graphblas/system/sequential/Matrix.hpp → ...graphblas/platforms/sequential/Matrix.hpp
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <cstddef>
-#include <graphblas/system/sequential/LilSparseMatrix.hpp>
+#include <graphblas/platforms/sequential/LilSparseMatrix.hpp>
 
 //****************************************************************************
 
@@ -92,4 +92,4 @@ namespace GraphBLAS
 }
 
 // HACK
-#include <graphblas/system/sequential/utility.hpp>
+#include <graphblas/platforms/sequential/utility.hpp>
diff --git a/...hblas/system/sequential/TransposeView.hpp → ...as/platforms/sequential/TransposeView.hpp b/...hblas/system/sequential/TransposeView.hpp → ...as/platforms/sequential/TransposeView.hpp
@@ -17,7 +17,7 @@
 #ifndef GB_SEQUENTIAL_TRANSPOSE_VIEW_HPP
 #define GB_SEQUENTIAL_TRANSPOSE_VIEW_HPP
 
-#include <graphblas/system/sequential/Matrix.hpp>
+#include <graphblas/platforms/sequential/Matrix.hpp>
 
 //****************************************************************************
 

diff --git a/src/graphblas/system/sequential/Vector.hpp → ...graphblas/platforms/sequential/Vector.hpp b/src/graphblas/system/sequential/Vector.hpp → ...graphblas/platforms/sequential/Vector.hpp
@@ -20,7 +20,7 @@
 
 #include <graphblas/detail/config.hpp>
 #include <vector>
-#include <graphblas/system/sequential/BitmapSparseVector.hpp>
+#include <graphblas/platforms/sequential/BitmapSparseVector.hpp>
 
 namespace GraphBLAS
 {

diff --git a/...las/system/sequential/backend_include.hpp → .../platforms/sequential/backend_include.hpp b/...las/system/sequential/backend_include.hpp → .../platforms/sequential/backend_include.hpp
@@ -18,35 +18,35 @@
 // sets of files as specified by the user.
 
 #if(GB_INCLUDE_BACKEND_ALL)
-#include <graphblas/system/sequential/sequential.hpp>
+#include <graphblas/platforms/sequential/sequential.hpp>
 #endif
 
 #if(GB_INCLUDE_BACKEND_MATRIX)
-#include <graphblas/system/sequential/Matrix.hpp>
+#include <graphblas/platforms/sequential/Matrix.hpp>
 #undef GB_INCLUDE_BACKEND_MATRIX
 #endif
 
 #if(GB_INCLUDE_BACKEND_VECTOR)
-#include <graphblas/system/sequential/Vector.hpp>
+#include <graphblas/platforms/sequential/Vector.hpp>
 #undef GB_INCLUDE_BACKEND_VECTOR
 #endif
 
 #if(GB_INCLUDE_BACKEND_UTILITY)
-#include <graphblas/system/sequential/utility.hpp>
+#include <graphblas/platforms/sequential/utility.hpp>
 #undef GB_INCLUDE_BACKEND_UTILITY
 #endif
 
 #if(GB_INCLUDE_BACKEND_TRANSPOSE_VIEW)
-#include <graphblas/system/sequential/TransposeView.hpp>
+#include <graphblas/platforms/sequential/TransposeView.hpp>
 #undef GB_INCLUDE_BACKEND_TRANSPOSE_VIEW
 #endif
 
 #if(GB_INCLUDE_BACKEND_COMPLEMENT_VIEW)
-#include <graphblas/system/sequential/ComplementView.hpp>
+#include <graphblas/platforms/sequential/ComplementView.hpp>
 #undef GB_INCLUDE_BACKEND_COMPLEMENT_VIEW
 #endif
 
 #if(GB_INCLUDE_BACKEND_OPERATIONS)
-#include <graphblas/system/sequential/operations.hpp>
+#include <graphblas/platforms/sequential/operations.hpp>
 #undef GB_INCLUDE_BACKEND_OPERATIONS
 #endif
diff --git a/...raphblas/system/sequential/operations.hpp → ...hblas/platforms/sequential/operations.hpp b/...raphblas/system/sequential/operations.hpp → ...hblas/platforms/sequential/operations.hpp
@@ -29,20 +29,20 @@
 #include <iterator>
 
 #include <graphblas/algebra.hpp>
-#include <graphblas/system/sequential/TransposeView.hpp>
-#include <graphblas/system/sequential/ComplementView.hpp>
+#include <graphblas/platforms/sequential/TransposeView.hpp>
+#include <graphblas/platforms/sequential/ComplementView.hpp>
 
 // Add individual operation files here
-#include <graphblas/system/sequential/sparse_mxm.hpp>
-#include <graphblas/system/sequential/sparse_mxv.hpp>
-#include <graphblas/system/sequential/sparse_vxm.hpp>
-#include <graphblas/system/sequential/sparse_ewisemult.hpp>
-#include <graphblas/system/sequential/sparse_ewiseadd.hpp>
-#include <graphblas/system/sequential/sparse_extract.hpp>
-#include <graphblas/system/sequential/sparse_assign.hpp>
-#include <graphblas/system/sequential/sparse_apply.hpp>
-#include <graphblas/system/sequential/sparse_reduce.hpp>
-#include <graphblas/system/sequential/sparse_transpose.hpp>
+#include <graphblas/platforms/sequential/sparse_mxm.hpp>
+#include <graphblas/platforms/sequential/sparse_mxv.hpp>
+#include <graphblas/platforms/sequential/sparse_vxm.hpp>
+#include <graphblas/platforms/sequential/sparse_ewisemult.hpp>
+#include <graphblas/platforms/sequential/sparse_ewiseadd.hpp>
+#include <graphblas/platforms/sequential/sparse_extract.hpp>
+#include <graphblas/platforms/sequential/sparse_assign.hpp>
+#include <graphblas/platforms/sequential/sparse_apply.hpp>
+#include <graphblas/platforms/sequential/sparse_reduce.hpp>
+#include <graphblas/platforms/sequential/sparse_transpose.hpp>
 
 
 namespace GraphBLAS

diff --git a/...raphblas/system/sequential/sequential.hpp → ...hblas/platforms/sequential/sequential.hpp b/...raphblas/system/sequential/sequential.hpp → ...hblas/platforms/sequential/sequential.hpp
@@ -17,17 +17,17 @@
 
 #pragma once
 
-#include <graphblas/system/sequential/Matrix.hpp>
-#include <graphblas/system/sequential/Vector.hpp>
+#include <graphblas/platforms/sequential/Matrix.hpp>
+#include <graphblas/platforms/sequential/Vector.hpp>
 
-#include <graphblas/system/sequential/utility.hpp>
+#include <graphblas/platforms/sequential/utility.hpp>
 
-#include <graphblas/system/sequential/TransposeView.hpp>
-#include <graphblas/system/sequential/ComplementView.hpp>
+#include <graphblas/platforms/sequential/TransposeView.hpp>
+#include <graphblas/platforms/sequential/ComplementView.hpp>
 
-#include <graphblas/system/sequential/operations.hpp>
+#include <graphblas/platforms/sequential/operations.hpp>
 
-#include <graphblas/system/sequential/BitmapSparseVector.hpp>
-#include <graphblas/system/sequential/LilSparseMatrix.hpp>
+#include <graphblas/platforms/sequential/BitmapSparseVector.hpp>
+#include <graphblas/platforms/sequential/LilSparseMatrix.hpp>
 
 #endif // GB_SEQUENTIAL_HPP
diff --git a/...phblas/system/sequential/sparse_apply.hpp → ...las/platforms/sequential/sparse_apply.hpp b/...phblas/system/sequential/sparse_apply.hpp → ...las/platforms/sequential/sparse_apply.hpp
diff --git a/...hblas/system/sequential/sparse_assign.hpp → ...as/platforms/sequential/sparse_assign.hpp b/...hblas/system/sequential/sparse_assign.hpp → ...as/platforms/sequential/sparse_assign.hpp
diff --git a/...las/system/sequential/sparse_ewiseadd.hpp → .../platforms/sequential/sparse_ewiseadd.hpp b/...las/system/sequential/sparse_ewiseadd.hpp → .../platforms/sequential/sparse_ewiseadd.hpp
diff --git a/...as/system/sequential/sparse_ewisemult.hpp → ...platforms/sequential/sparse_ewisemult.hpp b/...as/system/sequential/sparse_ewisemult.hpp → ...platforms/sequential/sparse_ewisemult.hpp
diff --git a/...blas/system/sequential/sparse_extract.hpp → ...s/platforms/sequential/sparse_extract.hpp b/...blas/system/sequential/sparse_extract.hpp → ...s/platforms/sequential/sparse_extract.hpp
diff --git a/...blas/system/sequential/sparse_helpers.hpp → ...s/platforms/sequential/sparse_helpers.hpp b/...blas/system/sequential/sparse_helpers.hpp → ...s/platforms/sequential/sparse_helpers.hpp
diff --git a/...raphblas/system/sequential/sparse_mxm.hpp → ...hblas/platforms/sequential/sparse_mxm.hpp b/...raphblas/system/sequential/sparse_mxm.hpp → ...hblas/platforms/sequential/sparse_mxm.hpp
diff --git a/...raphblas/system/sequential/sparse_mxv.hpp → ...hblas/platforms/sequential/sparse_mxv.hpp b/...raphblas/system/sequential/sparse_mxv.hpp → ...hblas/platforms/sequential/sparse_mxv.hpp
diff --git a/...hblas/system/sequential/sparse_reduce.hpp → ...as/platforms/sequential/sparse_reduce.hpp b/...hblas/system/sequential/sparse_reduce.hpp → ...as/platforms/sequential/sparse_reduce.hpp
diff --git a/...as/system/sequential/sparse_transpose.hpp → ...platforms/sequential/sparse_transpose.hpp b/...as/system/sequential/sparse_transpose.hpp → ...platforms/sequential/sparse_transpose.hpp
diff --git a/...raphblas/system/sequential/sparse_vxm.hpp → ...hblas/platforms/sequential/sparse_vxm.hpp b/...raphblas/system/sequential/sparse_vxm.hpp → ...hblas/platforms/sequential/sparse_vxm.hpp
diff --git a/src/test/sequential/run_tests.sh → ...as/platforms/sequential/test/run_tests.sh b/src/test/sequential/run_tests.sh → ...as/platforms/sequential/test/run_tests.sh
diff --git a/.../sequential/test_bitmap_sparse_vector.cpp → ...ential/test/test_bitmap_sparse_vector.cpp b/.../sequential/test_bitmap_sparse_vector.cpp → ...ential/test/test_bitmap_sparse_vector.cpp
diff --git a/...est/sequential/test_lil_sparse_matrix.cpp → ...equential/test/test_lil_sparse_matrix.cpp b/...est/sequential/test_lil_sparse_matrix.cpp → ...equential/test/test_lil_sparse_matrix.cpp
diff --git a/src/graphblas/system/sequential/types.hpp → src/graphblas/platforms/sequential/types.hpp b/src/graphblas/system/sequential/types.hpp → src/graphblas/platforms/sequential/types.hpp
diff --git a/src/graphblas/system/sequential/utility.hpp → ...raphblas/platforms/sequential/utility.hpp b/src/graphblas/system/sequential/utility.hpp → ...raphblas/platforms/sequential/utility.hpp