Some fixes and improvements in SARE

Author: GiovaGa

include/graphblas/algorithms/simulated_annealing_re.hpp

@@ -33,7 +33,10 @@
 #include <algorithm>
 #include <cstdlib>
 #include <cmath>
+
+#if __has_include("mpi.h")
 #include <mpi.h>
+#endif
 
 #ifdef TIMING
 #include <iomanip>
@@ -103,6 +106,7 @@ namespace grb {
 			return rc;
 		}
 
+#if __has_include("mpi.h")
 		template<
 			typename TempType,
 			typename EnergyType
@@ -151,9 +155,6 @@ namespace grb {
 				msg = new struct data< TempType, EnergyType > [2];
 				pt_tmp = new grb::Vector< StateType, backend >( n );
 				rc = rc ? rc : grb::set( *pt_tmp, static_cast< StateType >( 0 ) );
-				// rc = rc ? rc : grb::rdma<>::register_global( msg[ 0 ] );
-				// rc = rc ? rc : grb::rdma<>::register_global( msg[ 1 ] );
-				// rc = rc ? rc : grb::rdma<>::register_global( *pt_tmp );
 			}
 			grb::Vector< StateType, backend > &tmp = *pt_tmp;
 
@@ -182,7 +183,6 @@ namespace grb {
 					rc = rc ? rc : grb::setElement( energies, msg[ 1 ].e, n_replicas - 1 );
 				}
 			}
-			// std::cerr << s << " " << "A done." << std::endl;
 
 			for( size_t i = n_replicas - 1 ; i > 0 ; --i ){
 				const EnergyType de = ( energies[ i ] - energies[ i-1 ]) * (betas[ i ] - betas[ i-1 ]);
@@ -221,6 +221,7 @@ namespace grb {
 #endif
 			return rc;
 		}
+#endif
 
 
 		/*
@@ -406,13 +407,15 @@ namespace grb {
 				// TODO: update best state to match best energy
 			}
 
+#if __has_include("mpi.h")
 			if( msg != nullptr ){
 				// rc = rc ? rc : grb::rdma<>::deregister( msg[ 0 ] );
 				// rc = rc ? rc : grb::rdma<>::deregister( msg[ 1 ] );
 				// rc = rc ? rc : grb::rdma<>::deregister( *pt_tmp );
 				delete msg; msg = nullptr;
 				delete pt_tmp; pt_tmp = nullptr;
 			}
+#endif
 			return rc;
 		}
 
@@ -496,7 +499,7 @@ namespace grb {
 				}
 
 				// add new mask
-				masks.emplace_back( grb::Vector< bool, backend >( n ) );
+				masks.emplace_back( grb::Vector< MaskType, backend >( n ) );
 				auto &new_mask = masks.at(i);
 				rc = rc ? rc : grb::resize( new_mask, n );
 				rc = rc ? rc : grb::set< descr >( new_mask, frontier, static_cast< MaskType >(true) );
@@ -618,7 +621,7 @@ namespace grb {
 
 #ifdef TIMING
 			if( s == 0 ){
-				std::cerr << "Starting simulated_annealing_RE_ising" << "\n";
+				std::cerr << "Starting simulated_annealing_RE_Ising" << "\n";
 			}
 			auto start = std::chrono::high_resolution_clock::now();
 #endif
@@ -682,7 +685,8 @@ namespace grb {
 			start = std::chrono::high_resolution_clock::now();
 #endif
 
-			std::vector< grb::Vector< bool, backend > > masks ;
+			using MaskType = bool;
+			std::vector< grb::Vector< MaskType, backend > > masks ;
 			rc = rc ? rc : matrix_partition< descr >( masks, couplings, h, rand, seed );
 #ifdef TIMING
 				end = std::chrono::high_resolution_clock::now();
@@ -896,7 +900,7 @@ namespace grb {
 				EnergyType &best_energy,
 				const size_t &n_sweeps,
 				const EnergyType &goal = 0,
-				const size_t &pt_time = false,
+				const size_t &pt_time = 0,
 				const int seed = 42,
 				const Ring &ring = Ring()
 				){