From f7d241709d39be2301f7c71d4dcd3da85b84afc1 Mon Sep 17 00:00:00 2001 From: TeachRaccooon Date: Tue, 16 Apr 2024 09:16:54 -0700 Subject: [PATCH] Fix per Riley's comments --- benchmark/bench_CQRRP/CQRRP_pivot_quality.cc | 2 +- benchmark/bench_CQRRP/CQRRP_single_precision.cc | 2 +- benchmark/bench_CQRRP/CQRRP_speed_comparisons.cc | 2 +- benchmark/bench_CQRRPT/CQRRPT_pivot_quality.cc | 2 +- benchmark/bench_CQRRPT/CQRRPT_runtime_breakdown.cc | 4 ++-- benchmark/bench_CQRRPT/CQRRPT_speed_comparisons.cc | 4 ++-- test/comps/test_preconditioners.cc | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/benchmark/bench_CQRRP/CQRRP_pivot_quality.cc b/benchmark/bench_CQRRP/CQRRP_pivot_quality.cc index 5670d7a2..d179d681 100644 --- a/benchmark/bench_CQRRP/CQRRP_pivot_quality.cc +++ b/benchmark/bench_CQRRP/CQRRP_pivot_quality.cc @@ -40,7 +40,7 @@ static void data_regen(RandLAPACK::gen::mat_gen_info m_info, QR_speed_benchmark_data &all_data, RandBLAS::RNGState &state) { - RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); + RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); std::fill(all_data.tau.begin(), all_data.tau.end(), 0.0); std::fill(all_data.J.begin(), all_data.J.end(), 0); } diff --git a/benchmark/bench_CQRRP/CQRRP_single_precision.cc b/benchmark/bench_CQRRP/CQRRP_single_precision.cc index e06fc88c..c3a9a14c 100644 --- a/benchmark/bench_CQRRP/CQRRP_single_precision.cc +++ b/benchmark/bench_CQRRP/CQRRP_single_precision.cc @@ -38,7 +38,7 @@ static void data_regen(RandLAPACK::gen::mat_gen_info m_info, QR_speed_benchmark_data &all_data, RandBLAS::RNGState &state, int apply_itoa) { - RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); + RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); std::fill(all_data.tau.begin(), all_data.tau.end(), 0.0); if (apply_itoa) { std::iota(all_data.J.begin(), all_data.J.end(), 1); diff --git a/benchmark/bench_CQRRP/CQRRP_speed_comparisons.cc b/benchmark/bench_CQRRP/CQRRP_speed_comparisons.cc index d58a66fe..e283062a 100644 --- a/benchmark/bench_CQRRP/CQRRP_speed_comparisons.cc +++ b/benchmark/bench_CQRRP/CQRRP_speed_comparisons.cc @@ -45,7 +45,7 @@ static void data_regen(RandLAPACK::gen::mat_gen_info m_info, QR_speed_benchmark_data &all_data, RandBLAS::RNGState &state, int apply_itoa) { - RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); + RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); std::fill(all_data.tau.begin(), all_data.tau.end(), 0.0); if (apply_itoa) { std::iota(all_data.J.begin(), all_data.J.end(), 1); diff --git a/benchmark/bench_CQRRPT/CQRRPT_pivot_quality.cc b/benchmark/bench_CQRRPT/CQRRPT_pivot_quality.cc index 8f66d73b..97b713ab 100644 --- a/benchmark/bench_CQRRPT/CQRRPT_pivot_quality.cc +++ b/benchmark/bench_CQRRPT/CQRRPT_pivot_quality.cc @@ -42,7 +42,7 @@ static void data_regen(RandLAPACK::gen::mat_gen_info m_info, QR_benchmark_data &all_data, RandBLAS::RNGState &state) { - RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); + RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); std::fill(all_data.R.begin(), all_data.R.end(), 0.0); std::fill(all_data.tau.begin(), all_data.tau.end(), 0.0); std::fill(all_data.J.begin(), all_data.J.end(), 0); diff --git a/benchmark/bench_CQRRPT/CQRRPT_runtime_breakdown.cc b/benchmark/bench_CQRRPT/CQRRPT_runtime_breakdown.cc index be8749ae..004ec811 100644 --- a/benchmark/bench_CQRRPT/CQRRPT_runtime_breakdown.cc +++ b/benchmark/bench_CQRRPT/CQRRPT_runtime_breakdown.cc @@ -46,7 +46,7 @@ static void data_regen(RandLAPACK::gen::mat_gen_info m_info, QR_benchmark_data &all_data, RandBLAS::RNGState &state) { - RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); + RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); std::fill(all_data.R.begin(), all_data.R.end(), 0.0); std::fill(all_data.tau.begin(), all_data.tau.end(), 0.0); std::fill(all_data.J.begin(), all_data.J.end(), 0); @@ -124,7 +124,7 @@ int main() { + ".dat", std::fstream::app); for (;n_start <= n_stop; n_start *= 2) { - res = call_all_algs(m_info, numruns, n_start, all_data, state_constant); + res = call_all_algs(m_info, numruns, n_start, all_data, state_constant); file << res[0] << ", " << res[1] << ", " << res[2] << ", " << res[3] << ", " << res[4] << ", " << res[5] << ", " << res[6] << ", " << res[7] << ",\n"; } } \ No newline at end of file diff --git a/benchmark/bench_CQRRPT/CQRRPT_speed_comparisons.cc b/benchmark/bench_CQRRPT/CQRRPT_speed_comparisons.cc index 706204d6..488cc2b6 100644 --- a/benchmark/bench_CQRRPT/CQRRPT_speed_comparisons.cc +++ b/benchmark/bench_CQRRPT/CQRRPT_speed_comparisons.cc @@ -47,7 +47,7 @@ static void data_regen(RandLAPACK::gen::mat_gen_info m_info, QR_benchmark_data &all_data, RandBLAS::RNGState &state) { - RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); + RandLAPACK::gen::mat_gen(m_info, all_data.A.data(), state); std::fill(all_data.R.begin(), all_data.R.end(), 0.0); std::fill(all_data.tau.begin(), all_data.tau.end(), 0.0); std::fill(all_data.J.begin(), all_data.J.end(), 0); @@ -207,7 +207,7 @@ int main() { + ".dat", std::fstream::app); for (;n_start <= n_stop; n_start *= 2) { - res = call_all_algs(m_info, numruns, n_start, all_data, state_constant); + res = call_all_algs(m_info, numruns, n_start, all_data, state_constant); file << res[0] << ", " << res[1] << ", " << res[2] << ", " << res[3] << ", " << res[4] << ", " << res[5] << ",\n"; } } diff --git a/test/comps/test_preconditioners.cc b/test/comps/test_preconditioners.cc index c712522b..3b7c3fc6 100644 --- a/test/comps/test_preconditioners.cc +++ b/test/comps/test_preconditioners.cc @@ -278,7 +278,7 @@ TEST_F(TestNystromPrecond, basictest) { mat_info.exponent = 2.0; std::vector A(m * m, 0.0); RandBLAS::RNGState data_state(0); - RandLAPACK::gen::mat_gen(mat_info, A.data(), data_state); + RandLAPACK::gen::mat_gen(mat_info, A.data(), data_state); std::vector G(m * m, 0.0); blas::syrk(Layout::ColMajor, Uplo::Lower, Op::NoTrans, m, m, 1.0, A.data(), m, 0.0, G.data(), m