diff --git a/cpp/src/barrier/barrier.cu b/cpp/src/barrier/barrier.cu index c164296a2..e8c418553 100644 --- a/cpp/src/barrier/barrier.cu +++ b/cpp/src/barrier/barrier.cu @@ -228,7 +228,8 @@ class iteration_data_t { i_t num_upper_bounds, const std::vector& direct_free_variables, const csc_matrix_t& Qin, - const simplex_solver_settings_t& settings) + const simplex_solver_settings_t& settings, + f_t start_time) : upper_bounds(num_upper_bounds), c(lp.objective), b(lp.rhs), @@ -664,6 +665,7 @@ class iteration_data_t { } if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) { return; } symbolic_status = chol->analyze(device_augmented); + settings.log.printf("Elapsed time for augmented : %.3f seconds\n", toc(start_time)); } else { { raft::common::nvtx::range form_scope("Barrier: LP Data: form ADAT"); @@ -671,8 +673,10 @@ class iteration_data_t { } if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) { return; } symbolic_status = chol->analyze(device_ADAT); + settings.log.printf("Elapsed time for ADAT : %.3f seconds\n", toc(start_time)); } } + settings.log.printf("Elapsed time : %.3f seconds\n", toc(start_time)); } bool has_cones() const { return cones_.has_value(); } @@ -4099,7 +4103,7 @@ lp_status_t barrier_solver_t::check_for_suboptimal_solution( template lp_status_t barrier_solver_t::solve(f_t start_time, lp_solution_t& solution) { - settings.log.printf("Barrier solver started at %.2f seconds\n", toc(start_time)); + settings.log.printf("Barrier solver started at %.3f seconds\n", toc(start_time)); try { raft::common::nvtx::range fun_scope("Barrier: solve"); @@ -4136,7 +4140,7 @@ lp_status_t barrier_solver_t::solve(f_t start_time, lp_solution_t 0) { create_Q(lp, Q); } iteration_data_t data( - lp, num_upper_bounds, presolve_info.direct_free_variables, Q, settings); + lp, num_upper_bounds, presolve_info.direct_free_variables, Q, settings, start_time); if (settings.concurrent_halt != nullptr && *settings.concurrent_halt == 1) { settings.log.printf("Barrier solver halted\n"); return lp_status_t::CONCURRENT_LIMIT; @@ -4156,7 +4160,6 @@ lp_status_t barrier_solver_t::solve(f_t start_time, lp_solution_t settings.time_limit) { settings.log.printf("Barrier time limit exceeded\n"); @@ -4238,9 +4241,15 @@ lp_status_t barrier_solver_t::solve(f_t start_time, lp_solution_t::solve(f_t start_time, lp_solution_t::solve(f_t start_time, lp_solution_t::solve(f_t start_time, lp_solution_t::solve(f_t start_time, lp_solution_t { return -1; } f_t reordering_time = toc(start_symbolic); - settings_.log.printf("Reordering time : %.2fs\n", reordering_time); + settings_.log.printf("Reordering time : %.3fs\n", reordering_time); start_symbolic_factor = tic(); status = cudssExecute( @@ -511,7 +511,7 @@ class sparse_cholesky_cudss_t : public sparse_cholesky_base_t { } RAFT_CUDA_TRY(cudaStreamSynchronize(stream)); f_t symbolic_factorization_time = toc(start_symbolic_factor); - settings_.log.printf("Symbolic factorization time : %.2fs\n", symbolic_factorization_time); + settings_.log.printf("Symbolic factorization time : %.3fs\n", symbolic_factorization_time); int64_t lu_nz = 0; size_t size_written = 0; CUDSS_CALL_AND_CHECK(