Skip to content

TornadoOptions and Logger improved #418

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
merged 11 commits into from
May 14, 2024
Merged

TornadoOptions and Logger improved #418

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9b5277a
[refactor] simpliying options
jjfumero May 13, 2024
10b3bb3
SHOULD_LOAD_RMI option removed
jjfumero May 13, 2024
0e7cca5
[option] full debug mode option moved to TornadoOptions
jjfumero May 13, 2024
d3a0b71
[options] Kernel Debugging option moved to TornadoOptions
jjfumero May 13, 2024
36910b0
sync options moved to the TornadoOptions class
jjfumero May 13, 2024
1edf248
Remove option Tornado.FPGA_DUMP_LOG. use TornadoOptions.FULL_DEBUG in…
jjfumero May 13, 2024
e9ca72d
Debug option moved to TornadoOptions
jjfumero May 13, 2024
64ab4f5
Event options moved to TornadoOptions
jjfumero May 13, 2024
af80fd3
All options moved to the TornadoOptions class
jjfumero May 13, 2024
0989dcd
[wip] Refactoring Tornado Logger
jjfumero May 13, 2024
f93376e
Tornado debugger moved to the TornadoLogger class
jjfumero May 13, 2024
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
Prev Previous commit
Next Next commit
SHOULD_LOAD_RMI option removed
  • Loading branch information
@jjfumero
jjfumero committed May 13, 2024
commit 10b3bb346e80662f59be060cfc68b9a25974ac13
14 changes: 5 additions & 9 deletions tornado-runtime/src/main/java/uk/ac/manchester/tornado/runtime/TornadoCoreRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import static org.graalvm.compiler.debug.GraalError.guarantee;
import static uk.ac.manchester.tornado.api.exceptions.TornadoInternalError.shouldNotReachHere;
import static uk.ac.manchester.tornado.runtime.common.Tornado.SHOULD_LOAD_RMI;

import java.lang.reflect.Method;
import java.util.List;
Expand Down Expand Up @@ -160,15 +159,12 @@ private TornadoAcceleratorBackend[] loadBackends() {
int index = 0;
for (TornadoBackendProvider provider : providerList) {
if (Tornado.FULL_DEBUG) {
System.out.println(STR."[INFO] Loading Backend: \{provider}");
System.out.println("[INFO] TornadoVM Loading Backend: " + provider.getName());
}
boolean isRMI = provider.getName().equalsIgnoreCase("RMI Backend");
if ((!isRMI) || (isRMI && SHOULD_LOAD_RMI)) {
TornadoAcceleratorBackend backend = provider.createBackend(options, vmRuntime, vmConfig);
if (backend != null) {
tornadoAcceleratorBackends[index] = backend;
index++;
}
TornadoAcceleratorBackend backend = provider.createBackend(options, vmRuntime, vmConfig);
if (backend != null) {
tornadoAcceleratorBackends[index] = backend;
index++;
}
}
backendCount = index;
Expand Down
1 change: 0 additions & 1 deletion tornado-runtime/src/main/java/uk/ac/manchester/tornado/runtime/common/Tornado.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public final class Tornado implements TornadoSettingInterface {
public static final boolean FPGA_DUMP_LOG = Boolean.parseBoolean(settings.getProperty("tornado.fpgaDumpLog", "False"));

public static final boolean FULL_DEBUG = Boolean.parseBoolean(settings.getProperty("tornado.fullDebug", "False"));
public static final boolean SHOULD_LOAD_RMI = Boolean.parseBoolean(settings.getProperty("tornado.rmi.enable", "false"));
private static final String TORNADO_SDK_VARIABLE = "TORNADO_SDK";
public static boolean FORCE_BLOCKING_API_CALLS = false;

Expand Down