diff --git a/VadereSimulator/pom.xml b/VadereSimulator/pom.xml
index e32f70abd907d6843c3e09e9a2bb6fe8fa400d7c..2d3596ea0626dd598f33d8d2b265a347afc3f322 100644
--- a/VadereSimulator/pom.xml
+++ b/VadereSimulator/pom.xml
@@ -35,6 +35,19 @@
+
+ com.nativelibs4java
+ maven-javacl-plugin
+ 1.0.0-RC4
+
+
+ generate-sources
+
+ compile
+
+
+
+
org.codehaus.mojo
exec-maven-plugin
@@ -105,6 +118,17 @@
+
+
+ nativelibs4java
+ nativelibs4java Maven2 Repository
+ http://nativelibs4java.sourceforge.net/maven
+
+
+
+ windows-x86_64
+
+
commons-codec
diff --git a/VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/VadereConsole.java b/VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/VadereConsole.java
index 9b29cf9cdd21087456d8bae3563d0a58f51835b5..ee059bc135aa5b9ab500151bf1d29e8d87688360 100644
--- a/VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/VadereConsole.java
+++ b/VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/VadereConsole.java
@@ -38,9 +38,9 @@ public class VadereConsole {
try {
StdOutErrLog.addStdOutErrToLog();
- if (!CLUtils.isOpenCLSupported()) {
- System.out.println("Warning: OpenCL acceleration disabled, since no OpenCL support could be found!");
- }
+ //if (!CLUtils.isOpenCLSupported()) {
+ // System.out.println("Warning: OpenCL acceleration disabled, since no OpenCL support could be found!");
+ //}
Namespace ns = parser.parseArgs(args);
SubCommandRunner sRunner = ns.get("func");
sRunner.run(ns, parser);
diff --git a/VadereUtils/src/org/vadere/util/opencl/CLUtils.java b/VadereUtils/src/org/vadere/util/opencl/CLUtils.java
index 0012db0cfc86ebe638cf7960fa631fd663659d53..473df169d6baa7a1b63e3103ff79556fb6ea5911 100644
--- a/VadereUtils/src/org/vadere/util/opencl/CLUtils.java
+++ b/VadereUtils/src/org/vadere/util/opencl/CLUtils.java
@@ -86,9 +86,12 @@ public class CLUtils {
}
}
}
- }
+ }catch(Exception e){
+ log.warn("No OpenCL support: " + e.getMessage());
+ }
return supportedPlatforms;
+
}
/**
@@ -100,6 +103,7 @@ public class CLUtils {
* @return a pair of addresses (platform address, device address)
*/
public static Optional> getFirstSupportedPlatformAndDevice(final int deviceType) {
+
try (MemoryStack stack = stackPush()) {
IntBuffer pi = stack.mallocInt(1);
InfoUtils.checkCLError(clGetPlatformIDs(null, pi));
@@ -124,7 +128,10 @@ public class CLUtils {
}
}
}
+ } catch (Exception e) {
+ log.warn("No OpenCL device found: " + e.getMessage());
}
+
return Optional.empty();
}
diff --git a/pom.xml b/pom.xml
index e69572c6265b1e012f441ccc69860d32ccd3baec..af285c7fcd009f032e0fcc14154f74eb924feda2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,8 @@
maven-compiler-plugin
3.8.0
+
+ true
${maven-compiler.source.version}
${maven-compiler.target.version}
11