|
25 | 25 | #include <inttypes.h> |
26 | 26 |
|
27 | 27 | #include <graphblas/algorithms/triangle_count.hpp> |
28 | | -#include <graphblas/utils/Timer.hpp> |
| 28 | +#include <graphblas/utils/timer.hpp> |
29 | 29 | #include <graphblas/utils/parser.hpp> |
30 | 30 |
|
31 | 31 | #include <graphblas.hpp> |
@@ -81,12 +81,12 @@ void grbProgram( const input & data_in, output & out ) { |
81 | 81 |
|
82 | 82 | timer.reset(); |
83 | 83 | // Create a local parser |
84 | | - grb::utils::MatrixFileReader< |
| 84 | + grb::utils::MatrixFileReader< |
85 | 85 | void, |
86 | 86 | std::conditional< |
87 | 87 | ( sizeof( grb::config::RowIndexType ) > sizeof( grb::config::ColIndexType ) ), |
88 | 88 | grb::config::RowIndexType, |
89 | | - grb::config::ColIndexType |
| 89 | + grb::config::ColIndexType |
90 | 90 | >::type |
91 | 91 | > parser( data_in.filename, data_in.direct ); |
92 | 92 | assert( parser.m() == parser.n() ); |
@@ -134,12 +134,12 @@ void grbProgram( const input & data_in, output & out ) { |
134 | 134 | if( p.first == p.second ) { |
135 | 135 | continue; |
136 | 136 | } |
137 | | - |
| 137 | + |
138 | 138 | rows.push_back( p.first ); |
139 | 139 | cols.push_back( p.second ); |
140 | 140 | } |
141 | 141 | std::vector< IntegerType > values( rows.size(), static_cast< IntegerType >( 1 ) ); |
142 | | - assert( SUCCESS == |
| 142 | + assert( SUCCESS == |
143 | 143 | buildMatrixUnique( A, rows.data(), cols.data(), values.data(), values.size(), IOMode::SEQUENTIAL ) |
144 | 144 | ); |
145 | 145 | } |
@@ -183,9 +183,9 @@ int main( int argc, char ** argv ) { |
183 | 183 | if( !parse_arguments( argc, argv, in, err ) ) { |
184 | 184 | return err; |
185 | 185 | } |
186 | | - |
| 186 | + |
187 | 187 | std::cout << "Executable called with parameters " << in.filename << ", " |
188 | | - << "inner repititions = " << in.inner_rep << ", and outer reptitions = " |
| 188 | + << "inner repititions = " << in.inner_rep << ", and outer reptitions = " |
189 | 189 | << in.outer_rep << std::endl; |
190 | 190 |
|
191 | 191 | // Run the test for all algorithms |
@@ -248,8 +248,8 @@ int main( int argc, char ** argv ) { |
248 | 248 | bool parse_arguments( int argc, char ** argv, input & in, int& err ) { |
249 | 249 | // Check if we are testing on a file |
250 | 250 | if( argc < 4 || argc > 6 ) { |
251 | | - std::cerr << "Usages: \n\t" |
252 | | - << argv[ 0 ] << " <graph_filepath> <direct/indirect> <expected_triangle_count> (inner iterations) (outer iterations)" |
| 251 | + std::cerr << "Usages: \n\t" |
| 252 | + << argv[ 0 ] << " <graph_filepath> <direct/indirect> <expected_triangle_count> (inner iterations) (outer iterations)" |
253 | 253 | << std::endl; |
254 | 254 | err = 1; |
255 | 255 | return false; |
|
0 commit comments