Skip to content

Commit c094bec

Browse files
committed
Revert "Test with no masking"
This reverts commit 1425539.
1 parent 1425539 commit c094bec

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

include/graphblas/algorithms/simulated_annealing_re.hpp

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ namespace grb {
285285
const size_t n_replicas = states.size();
286286
const size_t n = grb::size(states[0]);
287287
(void) n;
288-
(void) n_procs;
289288
(void) s;
290289

291290
grb::RC rc = grb::SUCCESS;
@@ -437,7 +436,7 @@ namespace grb {
437436
}
438437

439438
// add new mask
440-
masks.emplace_back( n );
439+
masks.emplace_back( grb::Vector< bool, backend >( n ) );
441440
auto &new_mask = masks.at(i);
442441
rc = rc ? rc : grb::resize( new_mask, n );
443442
rc = rc ? rc : grb::set< descr >( new_mask, frontier, static_cast< MaskType >(true) );
@@ -595,22 +594,9 @@ namespace grb {
595594
rc = rc ? rc : grb::resize( dn, n );
596595
rc = rc ? rc : grb::resize( accept, n );
597596

598-
std::vector< grb::Vector< bool, backend > > masks;
597+
std::vector< grb::Vector< bool, backend > > masks ;
599598
rc = rc ? rc : matrix_partition< descr >( masks, couplings, h, rand, seed );
600-
601-
std::vector< grb::Vector< bool, backend > > trivial_masks;
602-
603-
for(const auto &mask : masks ){
604-
for( const auto &x : mask ){
605-
trivial_masks.emplace_back( n );
606-
grb::setElement( trivial_masks.back(), x.second, x.first );
607-
}
608-
}
609-
assert( trivial_masks.size() == n );
610-
611-
masks = trivial_masks;
612-
613-
rc = rc ? rc : grb::clear( h );
599+
rc = rc ? rc : grb::clear(h);
614600
constexpr auto dense_descr = descr | grb::descriptors::dense;
615601

616602
auto sweep_data = std::tie(

0 commit comments

Comments
 (0)