Skip to content

Barrier log fixes #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapids-bot merged 2 commits into from
Oct 10, 2025
Merged

Barrier log fixes #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cfc63b
Barrier log fixes
chris-maes Oct 9, 2025
dda0c5a
Merge branch 'branch-25.10' into barrier_log_fixes
chris-maes Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cpp/src/dual_simplex/barrier.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,7 +1487,6 @@ int barrier_solver_t<i_t, f_t>::initial_point(iteration_data_t<i_t, f_t>& data)
// Perform a numerical factorization
i_t status;
if (use_augmented) {
settings.log.printf("Factorizing augmented\n");
status = data.chol->factorize(data.augmented);
} else {
if (use_gpu) {
Expand Down Expand Up @@ -3329,9 +3328,9 @@ lp_status_t barrier_solver_t<i_t, f_t>::solve(f_t start_time,
i_t iter = 0;
settings.log.printf("\n");
settings.log.printf(
" Objective Infeasibility Time\n");
" Objective Infeasibility Time\n");
settings.log.printf(
"Iter Primal Dual Primal Dual Compl. Elapsed\n");
"Iter Primal Dual Primal Dual Compl. Elapsed\n");
float64_t elapsed_time = toc(start_time);
settings.log.printf("%3d %+.12e %+.12e %.2e %.2e %.2e %.1f\n",
iter,
Expand Down
8 changes: 4 additions & 4 deletions cpp/src/dual_simplex/sparse_cholesky.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ class sparse_cholesky_cudss_t : public sparse_cholesky_base_t<i_t, f_t> {
}

if (first_factor) {
settings_.log.printf("Factorization time : %.2fs\n", numeric_time);
settings_.log.debug("Factorization time : %.2fs\n", numeric_time);
first_factor = false;
}
if (status != CUDSS_STATUS_SUCCESS) {
Expand Down Expand Up @@ -635,7 +635,7 @@ class sparse_cholesky_cudss_t : public sparse_cholesky_base_t<i_t, f_t> {

f_t symbolic_time = toc(start_symbolic);
f_t analysis_time = toc(start_analysis);
settings_.log.printf("Symbolic factorization time: %.2fs\n", symbolic_time);
settings_.log.printf("Symbolic factorization time : %.2fs\n", symbolic_time);
if (settings_.concurrent_halt != nullptr && *settings_.concurrent_halt == 1) {
RAFT_CUDA_TRY(cudaStreamSynchronize(stream));
handle_ptr_->get_stream().synchronize();
Expand All @@ -647,7 +647,7 @@ class sparse_cholesky_cudss_t : public sparse_cholesky_base_t<i_t, f_t> {
cudssDataGet(handle, solverData, CUDSS_DATA_LU_NNZ, &lu_nz, sizeof(int64_t), &size_written),
status,
"cudssDataGet for LU_NNZ");
settings_.log.printf("Symbolic nonzeros in factor: %e\n", static_cast<f_t>(lu_nz) / 2.0);
settings_.log.printf("Symbolic nonzeros in factor : %.2e\n", static_cast<f_t>(lu_nz) / 2.0);
RAFT_CUDA_TRY(cudaStreamSynchronize(stream));
handle_ptr_->get_stream().synchronize();
// TODO: Is there any way to get nonzeros in the factors?
Expand Down Expand Up @@ -703,7 +703,7 @@ class sparse_cholesky_cudss_t : public sparse_cholesky_base_t<i_t, f_t> {
}

if (first_factor) {
settings_.log.printf("Factor time %.2fs\n", numeric_time);
settings_.log.debug("Factorization time : %.2fs\n", numeric_time);
Copy link
Contributor

@hlinsen hlinsen Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the same indentation as Symbolic factorization time

Copy link
Contributor

@hlinsen hlinsen Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if it is intended

Copy link
Contributor Author

@chris-maes chris-maes Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. This is ok, because it is in debug mode.

first_factor = false;
}
if (status != CUDSS_STATUS_SUCCESS) {
Expand Down