Implementation for BSP1D backend

Author: byjtew

include/graphblas/bsp1d/blas3.hpp

@@ -205,6 +205,140 @@ namespace grb {
 		return internal::checkGlobalErrorStateOrClear( C, ret );
 	}
 
+	template<
+		Descriptor descr = descriptors::no_operation,
+		class Operator,
+		typename IOType, typename MaskType, typename InputType, 
+		typename RIT, typename CIT, typename NIT
+	>
+	RC foldl(
+		Matrix< IOType, BSP1D, RIT, CIT, NIT > &A,
+		const InputType &x,
+		const Operator &op = Operator(),
+		const typename std::enable_if< 
+			!grb::is_object< IOType >::value &&
+			!grb::is_object< InputType >::value &&
+			!grb::is_object< MaskType >::value &&
+			grb::is_operator< Operator >::value, void
+		>::type * const = nullptr
+	) {
+
+#ifdef _DEBUG
+		std::cout << "In grb::foldl( BSP1D, matrix, scalar, op )\n";
+#endif
+		RC rc = SUCCESS;
+
+		if( grb::nnz( A ) == 0 ) {
+			return rc;
+		}
+
+		// Do local folding
+		rc = foldl< descr >( internal::getLocal( A ), x, op );		
+
+		return rc;
+	}
+
+	template<
+		Descriptor descr = descriptors::no_operation,
+		class Operator,
+		typename IOType, typename MaskType, typename InputType, 
+		typename RIT_A, typename CIT_A, typename NIT_A,
+		typename RIT_M, typename CIT_M, typename NIT_M
+	>
+	RC foldl(
+		Matrix< IOType, BSP1D, RIT_A, CIT_A, NIT_A > &A,
+		const Matrix< MaskType, BSP1D, RIT_M, CIT_M, NIT_M > &mask,
+		const InputType &x,
+		const Operator &op = Operator(),
+		const typename std::enable_if< 
+			!grb::is_object< IOType >::value &&
+			!grb::is_object< InputType >::value &&
+			!grb::is_object< MaskType >::value &&
+			grb::is_operator< Operator >::value, void
+		>::type * const = nullptr
+	) {
+
+#ifdef _DEBUG
+		std::cout << "In grb::foldl( BSP1D, matrix, mask, scalar, op )\n";
+#endif
+		RC rc = SUCCESS;
+
+		if( grb::nnz( A ) == 0 ) {
+			return rc;
+		}
+
+		// Do local folding
+		rc = foldl< descr >( internal::getLocal( A ), internal::getLocal( mask ), x, op );		
+
+		return rc;
+	}
+
+	template<
+		Descriptor descr = descriptors::no_operation,
+		class Operator,
+		typename IOType, typename MaskType, typename InputType, 
+		typename RIT_A, typename CIT_A, typename NIT_A,
+		typename RIT_M, typename CIT_M, typename NIT_M
+	>
+	RC foldr(
+		Matrix< IOType, BSP1D, RIT_A, CIT_A, NIT_A > &A,
+		const Matrix< MaskType, BSP1D, RIT_M, CIT_M, NIT_M > &mask,
+		const InputType &x,
+		const Operator &op = Operator(),
+		const typename std::enable_if< 
+			!grb::is_object< IOType >::value &&
+			!grb::is_object< InputType >::value &&
+			!grb::is_object< MaskType >::value &&
+			grb::is_operator< Operator >::value, void
+		>::type * const = nullptr
+	) {
+
+#ifdef _DEBUG
+		std::cout << "In grb::foldr( BSP1D, matrix, scalar, mask, op )\n";
+#endif
+		RC rc = SUCCESS;
+
+		if( grb::nnz( A ) == 0 ) {
+			return rc;
+		}
+
+		// Do local folding
+		rc = foldr< descr >( internal::getLocal( A ), internal::getLocal( mask ), x, op );		
+
+		return rc;
+	}
+
+	template<
+		Descriptor descr = descriptors::no_operation,
+		class Operator,
+		typename IOType, typename InputType, 
+		typename RIT, typename CIT, typename NIT
+	>
+	RC foldr(
+		Matrix< IOType, BSP1D, RIT, CIT, NIT > &A,
+		const InputType &x,
+		const Operator &op = Operator(),
+		const typename std::enable_if< 
+			!grb::is_object< IOType >::value &&
+			!grb::is_object< InputType >::value &&
+			grb::is_operator< Operator >::value, void
+		>::type * const = nullptr
+	) {
+#ifdef _DEBUG
+		std::cout << "In grb::foldr( BSP1D, matrix, scalar, op )\n";
+#endif
+		RC rc = SUCCESS;
+
+		if( grb::nnz( A ) == 0 ) {
+			return rc;
+		}
+
+		// Do local folding
+		rc = foldr< descr >( internal::getLocal( A ), x, op );		
+
+		return rc;
+	}
+
 } // namespace grb
 
 #endif

tests/unit/CMakeLists.txt

@@ -146,7 +146,7 @@ add_grb_executables( eWiseMul eWiseMul.cpp
 )
 
 add_grb_executables( fold_matrix_scalar_to_matrix fold_matrix_scalar_to_matrix.cpp
-	BACKENDS reference reference_omp hyperdags
+	BACKENDS reference reference_omp hyperdags bsp1d hybrid
 )
 
 add_grb_executables( muladd muladd.cpp

tests/unit/fold_matrix_scalar_to_matrix.cpp

@@ -109,12 +109,12 @@ struct input {
 	const OpFoldl & opFoldl;
 	const OpFoldr & opFoldr = OpFoldr();
 
-	input( const char * test_label,
-		const char * test_description,
-		const grb::Matrix< T > & initial,
-		const grb::Matrix< M > & mask,
-		const S scalar,
-		const grb::Matrix< T > & expected,
+	input( const char * test_label = "",
+		const char * test_description = "",
+		const grb::Matrix< T > & initial = {0,0},
+		const grb::Matrix< M > & mask = {0,0},
+		const S scalar = 0,
+		const grb::Matrix< T > & expected = {0,0},
 		bool skip_masked = false,
 		bool skip_unmasked = false,
 		const OpFoldl & opFoldl = OpFoldl(),

tests/unit/unittests.sh

@@ -222,7 +222,7 @@ for MODE in ${MODES}; do
 				grep 'Test OK' ${TEST_OUT_DIR}/ewiseapply_large_${MODE}_${BACKEND}_${P}_${T} || echo "Test FAILED"
 				echo " "
 
-				if [ "$BACKEND" = "reference" ] || [ "$BACKEND" = "reference_omp" ] || [ "$BACKEND" = "hyperdags" ]; then 
+				if [ "$BACKEND" != "nonblocking" ]; then 
 					echo ">>>      [x]           [x]       Testing grb::foldl and grb::foldr reducing sparse"
 					echo "                                 matrix in-place using operators."
 					$runner ${TEST_BIN_DIR}/fold_matrix_scalar_to_matrix_${MODE}_${BACKEND} &> ${TEST_OUT_DIR}/fold_matrix_scalar_to_matrix_${MODE}_${BACKEND}_${P}_${T}.log