From 0a2946ad872994ccab94b4464339924a1efbad9b Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Sun, 15 Apr 2018 17:23:10 -0400
Subject: [PATCH] docs(javadocs): fixed an unresolved conflict that was hidden
in the Javadocs.
ISSUES CLOSED: #49
---
src/main/java/com/aparapi/Kernel.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/main/java/com/aparapi/Kernel.java b/src/main/java/com/aparapi/Kernel.java
index 72bac0ca..4e85b98d 100644
--- a/src/main/java/com/aparapi/Kernel.java
+++ b/src/main/java/com/aparapi/Kernel.java
@@ -373,17 +373,10 @@ public abstract class Kernel implements Cloneable {
* kernel.execute(values.length);
* </pre></blockquote>
* <p>
-<<<<<<< HEAD:src/main/java/com/codegen/Kernel.java
* Alternatively, the property <code>com.codegen.executionMode</code> can be set to one of <code>JTP,GPU,ACC,CPU,SEQ</code>
* when an application is launched.
* <p><blockquote><pre>
* java -classpath ....;codegen.jar -Dcom.codegen.executionMode=GPU MyApplication
-=======
- * Alternatively, the property <code>com.amd.codegen.executionMode</code> can be set to one of <code>JTP,GPU,ACC,CPU,SEQ</code>
- * when an application is launched.
- * <p><blockquote><pre>
- * java -classpath ....;codegen.jar -Dcom.amd.codegen.executionMode=GPU MyApplication
->>>>>>> b118aad... added method to set execution mode without any fallback:com.amd.codegen/src/java/com/amd/codegen/Kernel.java
* </pre></blockquote><p>
* Generally setting the execution mode is not recommended (it is best to let Aparapi decide automatically) but the option
* provides a way to compare a kernel's performance under multiple execution modes.
--
GitLab