-
Notifications
You must be signed in to change notification settings - Fork 226
Route Java console logging through System.out instead of native stdout #1825
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.
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
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
2b87330
Route Java console logging through System.out instead of native stdout
ramakrishnap-nv 99a33fc
Fix pre-commit findings: copyright year and clang-format alignment
ramakrishnap-nv 2973059
Patch vendored PSLP to respect verbose=false for its infeasible message
ramakrishnap-nv aeeb1a1
Strip trailing whitespace from the PSLP patch file (pre-commit)
ramakrishnap-nv dba0539
Drop the trailing blank context line from the PSLP patch (pre-commit)
ramakrishnap-nv 1956a4c
Pin PSLP past v0.0.11 to the merged fix commit instead of patching
ramakrishnap-nv 469fc5c
Address CodeRabbit review: add console-log-sink test coverage, fix a …
ramakrishnap-nv cbb0a81
Merge remote-tracking branch 'origin/main' into java-console-log-call…
ramakrishnap-nv 1602ef8
Revert PSLP pin to v0.0.11; split into its own PR
ramakrishnap-nv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
cpp/cmake/patches/pslp/respect_verbose_for_infeasible_message.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| diff --git a/src/core/Presolver.c b/src/core/Presolver.c | ||
| index c0bdc9e..426008e 100644 | ||
| --- a/src/core/Presolver.c | ||
| +++ b/src/core/Presolver.c | ||
| @@ -720,7 +720,10 @@ PresolveStatus run_presolver(Presolver *presolver) | ||
| if (status != UNCHANGED) | ||
| { | ||
| // problem detected to be infeasible or unbounded | ||
| - print_infeas_or_unbnd_message(status); | ||
| + if (stgs->verbose) | ||
| + { | ||
| + print_infeas_or_unbnd_message(status); | ||
| + } | ||
| return status; | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
java/cuopt/src/main/java/com/nvidia/cuopt/mathematicaloptimization/NativeLogSink.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package com.nvidia.cuopt.mathematicaloptimization; | ||
|
|
||
| /** | ||
| * Receives cuOpt's console log lines from native code and writes them through {@link | ||
| * System#out}, rather than the native library writing to the process's stdout stream directly. | ||
| * | ||
| * <p>A direct native write bypasses {@code System.out}, so it is invisible to anything that | ||
| * intercepts or redirects it -- {@link System#setOut}, a logging framework bridge, or Maven | ||
| * Surefire, which uses the forked JVM's stdout as its own communication channel and can | ||
| * misinterpret an unexpected raw write on it as the forked process having crashed. | ||
| * | ||
| * <p>Called from {@code cuopt_jni.cpp}; not part of the public API. | ||
| */ | ||
| final class NativeLogSink { | ||
| private NativeLogSink() {} | ||
|
|
||
| static void onLogLine(String message) { | ||
| System.out.print(message); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.