From 3a5c9d44eabc493d5636b8d4351aa8eca8b08f25 Mon Sep 17 00:00:00 2001 From: Luis Mendes Date: Sat, 14 Nov 2020 11:41:21 +0000 Subject: [PATCH] Fix incomplete merge --- .../aparapi/internal/kernel/KernelRunner.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/main/java/com/aparapi/internal/kernel/KernelRunner.java b/src/main/java/com/aparapi/internal/kernel/KernelRunner.java index 78cae2e1..0911abab 100644 --- a/src/main/java/com/aparapi/internal/kernel/KernelRunner.java +++ b/src/main/java/com/aparapi/internal/kernel/KernelRunner.java @@ -1290,11 +1290,7 @@ public class KernelRunner extends KernelRunnerJNI{ } recreateRange(_settings); try { -<<<<<<< HEAD return executeInternalInner(_settings, null, false); -======= - return executeInternalInner(_settings, false); ->>>>>>> c4e5929ebc2d5dee505e2e1aeab0f18214238427 } catch (CompileFailedException e) { logger.log(Level.SEVERE, "KernelRunner#fallBackByExecutionMode() this should never happen...", e); throw new IllegalStateException("This should never happen, since compileOnly is set to false", e); @@ -1371,11 +1367,7 @@ public class KernelRunner extends KernelRunnerJNI{ recreateRange(_settings); try { -<<<<<<< HEAD return executeInternalInner(_settings, null, false); -======= - return executeInternalInner(_settings, false); ->>>>>>> c4e5929ebc2d5dee505e2e1aeab0f18214238427 } catch (CompileFailedException e) { logger.log(Level.SEVERE, "KernelRunner#fallBackToNextDevice() this should never happen, since compileOnly is set to false...", e); throw new IllegalStateException("This should never happen, since compileOnly is set to false", e); @@ -1404,20 +1396,12 @@ public class KernelRunner extends KernelRunnerJNI{ KernelPreferences preferences = KernelManager.instance().getPreferences(kernel); Range range = new Range(device, 1); ExecutionSettings settings = new ExecutionSettings(preferences, profile, _entrypoint, range, 1, false); -<<<<<<< HEAD return executeInternalInner(settings, device, true); -======= - return executeInternalInner(settings, true); ->>>>>>> c4e5929ebc2d5dee505e2e1aeab0f18214238427 } private synchronized Kernel executeInternalOuter(ExecutionSettings _settings) { try { -<<<<<<< HEAD return executeInternalInner(_settings, null, false); -======= - return executeInternalInner(_settings, false); ->>>>>>> c4e5929ebc2d5dee505e2e1aeab0f18214238427 } catch (CompileFailedException e) { logger.log(Level.SEVERE, "KernelRunner#executeInternalOuter() this should never happen, since compileOnly is set to false...", e); throw new IllegalStateException("This should never happen, since compileOnly is set to false", e); -- GitLab