From 220de87fd50c5b5e078669a8c81fe0c64066668b Mon Sep 17 00:00:00 2001
From: CoreRasurae <luis.p.mendes@gmail.com>
Date: Thu, 31 May 2018 12:06:39 +0100
Subject: [PATCH] Fix: Commented out unreliable execution time checks from
integration test, fixed Javadoc tags
---
src/main/java/com/aparapi/IProfileReportObserver.java | 6 +++---
.../aparapi/runtime/ProfileReportBackwardsCompatTest.java | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/aparapi/IProfileReportObserver.java b/src/main/java/com/aparapi/IProfileReportObserver.java
index c2f9b903..be3cfa58 100644
--- a/src/main/java/com/aparapi/IProfileReportObserver.java
+++ b/src/main/java/com/aparapi/IProfileReportObserver.java
@@ -28,15 +28,15 @@ public interface IProfileReportObserver {
/**
* The listener method will be invoked each time a profile report becomes available for each Aparapi Kernel which has
- * a registered observer.<br/>
+ * a registered observer.<br>
* <b>Note1: </b>A report will be generated by a thread executing a kernel. If multiple threads execute the same kernel,
* concurrently, this method can be called concurrently too, thus classes implementing this interface need to provide
* a thread safe method.
- * <br/>
+ * <br>
* <b>Note2: </b>If profiling information is to be stored has a {@link com.aparapi.ProfileReport}, it is necessary to clone
* the profileInfo object with {@link com.aparapi.ProfileReport#clone()}. A WeakReference is used to help differentiate such
* need, however it is guaranteed that profileInfo will not be null, during the method execution.
- * <br/>
+ * <br>
* @param kernelClass the class of the kernel to which the profile report pertains
* @param device the device on which the kernel ran, producing the profile report
* @param profileInfo the profile report for the given Aparapi kernel and device pair
diff --git a/src/test/java/com/aparapi/runtime/ProfileReportBackwardsCompatTest.java b/src/test/java/com/aparapi/runtime/ProfileReportBackwardsCompatTest.java
index 180fdc45..f42352ec 100644
--- a/src/test/java/com/aparapi/runtime/ProfileReportBackwardsCompatTest.java
+++ b/src/test/java/com/aparapi/runtime/ProfileReportBackwardsCompatTest.java
@@ -238,7 +238,8 @@ public class ProfileReportBackwardsCompatTest {
assertEquals("Aparapi Accumulated execution time doesn't match", results[0].accumulatedExecutionTime, kernel1.getAccumulatedExecutionTime(), 1e-10);
assertEquals("Aparapi last execution time doesn't match last report", results[0].lastExecutionTime, report.getExecutionTime(), 1e-10);
assertEquals("Aparapi last conversion time doesn't match last report", results[0].lastConversionTime, report.getConversionTime(), 1e-10);
- assertEquals("Test estimated accumulated time doesn't match within 300ms window", results[0].runTime, results[0].accumulatedExecutionTime, 300);
+ //FIXME Commented out as time accounting method is not reliable on some situtations
+ //assertEquals("Test estimated accumulated time doesn't match within 300ms window", results[0].runTime, results[0].accumulatedExecutionTime, 300);
assertTrue(validateBasic1Kernel(inputArray, results[0].outputArray));
//Validate kernel2 reports
@@ -248,7 +249,8 @@ public class ProfileReportBackwardsCompatTest {
assertEquals("Aparapi Accumulated execution time doesn't match", results[1].accumulatedExecutionTime, kernel2.getAccumulatedExecutionTime(), 1e-10);
assertEquals("Aparapi last execution time doesn't match last report", results[1].lastExecutionTime, report.getExecutionTime(), 1e-10);
assertEquals("Aparapi last conversion time doesn't match last report", results[1].lastConversionTime, report.getConversionTime(), 1e-10);
- assertEquals("Test estimated accumulated time doesn't match within 300ms window", results[1].runTime, results[1].accumulatedExecutionTime, 300);
+ //FIXME Commented out as time accounting method is not reliable on some situtations
+ //assertEquals("Test estimated accumulated time doesn't match within 300ms window", results[1].runTime, results[1].accumulatedExecutionTime, 300);
assertTrue(validateBasic2Kernel(inputArray, results[1].outputArray));
} finally {
kernel1.registerProfileReportObserver(null);
--
GitLab