Reveret to a clean state

Author: byjtew

include/graphblas/algorithms/conjugate_gradient.hpp

@@ -27,7 +27,7 @@
 #define _H_GRB_ALGORITHMS_CONJUGATE_GRADIENT
 
 #include <cstdio>
-#include <cmath>
+#include <complex>
 
 #include <graphblas.hpp>
 #include <graphblas/utils/iscomplex.hpp>
@@ -144,8 +144,7 @@ namespace grb {
 		 * performance semantics, with the exception of getters such as #grb::nnz, are
 		 * specific to the backend selected during compilation.
 		 */
-		template<
-			Descriptor descr = descriptors::no_operation,
+		template< Descriptor descr = descriptors::no_operation,
 			typename IOType,
 			typename ResidualType,
 			typename NonzeroType,
@@ -155,20 +154,19 @@ namespace grb {
 				grb::identities::zero, grb::identities::one
 			>,
 			class Minus = operators::subtract< IOType >,
-			class Divide = operators::divide< IOType >,
-			typename RSI, typename NZI, Backend backend
+			class Divide = operators::divide< IOType >
 		>
 		grb::RC conjugate_gradient(
-			grb::Vector< IOType, backend > &x,
-			const grb::Matrix< NonzeroType, backend, RSI, RSI, NZI > &A,
-			const grb::Vector< InputType, backend > &b,
+			grb::Vector< IOType > &x,
+			const grb::Matrix< NonzeroType > &A,
+			const grb::Vector< InputType > &b,
 			const size_t max_iterations,
 			ResidualType tol,
 			size_t &iterations,
 			ResidualType &residual,
-			grb::Vector< IOType, backend > &r,
-			grb::Vector< IOType, backend > &u,
-			grb::Vector< IOType, backend > &temp,
+			grb::Vector< IOType > &r,
+			grb::Vector< IOType > &u,
+			grb::Vector< IOType > &temp,
 			const Ring &ring = Ring(),
 			const Minus &minus = Minus(),
 			const Divide &divide = Divide()
@@ -326,7 +324,7 @@ namespace grb {
 			assert( ret == SUCCESS );
 
 			if( ret == SUCCESS ) {
-				tol *= std::sqrt( grb::utils::is_complex< IOType >::modulus( bnorm ) );
+				tol *= sqrt( grb::utils::is_complex< IOType >::modulus( bnorm ) );
 			}
 
 			size_t iter = 0;
@@ -419,7 +417,7 @@ namespace grb {
 
 			// return correct error code
 			if( ret == SUCCESS ) {
-				if( std::sqrt( residual ) >= tol ) {
+				if( sqrt( residual ) >= tol ) {
 					// did not converge within iterations
 					return FAILED;
 				}

include/graphblas/backends.hpp

@@ -29,9 +29,6 @@
 #ifndef _H_GRB_BACKENDS
 #define _H_GRB_BACKENDS
 
-#include <string>
-#include <iostream>
-
 
 namespace grb {
 
@@ -221,42 +218,6 @@ namespace grb {
 
 	};
 
-	/**
-	 * Converts a backend identifier to a human-readable string.
-	 *
-	 * @param[in] backend The backend whose string to return.
-	 *
-	 * @return The name of the given \a backend as a C++ string.
-	 */
-	static inline std::string toString( const enum grb::Backend backend ) {
-		switch( backend ) {
-			case grb::Backend::reference:     return "reference";
-			case grb::Backend::reference_omp: return "reference_omp";
-			case grb::Backend::hyperdags:     return "hyperdags";
-			case grb::Backend::nonblocking:   return "nonblocking";
-			case grb::Backend::shmem1D:       return "shmem1D";
-			case grb::Backend::NUMA1D:        return "NUMA1D";
-			case grb::Backend::GENERIC_BSP:   return "GENERIC_BSP";
-			case grb::Backend::BSP1D:         return "BSP1D";
-			case grb::Backend::doublyBSP1D:   return "doublyBSP1D";
-			case grb::Backend::BSP2D:         return "BSP2D";
-			case grb::Backend::autoBSP:       return "autoBSP";
-			case grb::Backend::optBSP:        return "optBSP";
-			case grb::Backend::hybrid:        return "hybrid";
-			case grb::Backend::hybridSmall:   return "hybridSmall";
-			case grb::Backend::hybridMid:     return "hybridMid";
-			case grb::Backend::hybridLarge:   return "hybridLarge";
-			case grb::Backend::minFootprint:  return "minFootprint";
-			case grb::Backend::banshee:       return "banshee";
-			case grb::Backend::banshee_ssr:   return "banshee_ssr";
-			default:
-				const int backend_id = static_cast< int >( backend );
-				std::cerr << "Warning, std::string( const grb::Backend ): unknown backend "
-					<< backend_id << " encountered, please submit a bug report.\n";
-				return "unknown_backend(id=" + std::to_string( backend_id ) + ")";
-		}
-	}
-
 } // namespace grb
 
 #endif