Resolve failing tests with updated dependencies

This commit is contained in:
Glavin Wiechert 2016-04-01 17:22:12 -03:00
parent afa27fd50b
commit 02f02a41e6
6 changed files with 94 additions and 97 deletions

View File

@ -1,15 +1,15 @@
<!doctype html>
<html>
<head>
<title>Test Page</title>
</head>
<head>
<title>Test Page</title>
</head>
<body>
<h1>Hello</h1>
<p>
World!
</p>
</body>
<body>
<h1>Hello</h1>
<p>
World!
</p>
</body>
</html>

View File

@ -1,15 +1,15 @@
<!doctype html>
<html>
<head>
<title>Test Page</title>
</head>
<head>
<title>Test Page</title>
</head>
<body>
<h1>Hello</h1>
<p>
World!
</p>
</body>
<body>
<h1>Hello</h1>
<p>
World!
</p>
</body>
</html>

View File

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html>
<html lang="en-us" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Test</title>
</head>
<body>
<ul>
<li>
<code>foo:bar</code>
</li>
</ul>
</html>
<head>
<title>Test</title>
</head>
<body>
<ul>
<li><code>foo:bar</code></li>
</ul>
</html>

View File

@ -1,6 +1,6 @@
// main: style.less
@import (reference)"variables.less";
@import (reference)"mixins.less";
@import (reference) "variables.less";
@import (reference) "mixins.less";
.modal {
position: fixed;
@ -109,7 +109,6 @@
.slideIn {
.animation(SlideIn, 0.5s);
}
@-webkit-keyframes SlideIn {
0% {
.transform(translateY(-100%));
@ -124,7 +123,6 @@
display: block;
.animation(FadeIn, 0.5s);
}
@-webkit-keyframes FadeIn {
0% {
opacity: 0;
@ -138,7 +136,6 @@
.slideOut {
.animation(SlideOut, 0.5s);
}
@-webkit-keyframes SlideOut {
0% {
.transform(translateY(0%));
@ -152,7 +149,6 @@
.fadeOut {
.animation(FadeOut, 0.5s);
}
@-webkit-keyframes FadeOut {
0% {
opacity: 1;

View File

@ -1,77 +1,77 @@
__kernel void reduce_min(__global const int* A, __global int* B, __local int* scratch) {
//Get local variable data
int id = get_global_id(0);
int lid = get_local_id(0);
int N = get_local_size(0);
//Get local variable data
int id = get_global_id(0);
int lid = get_local_id(0);
int N = get_local_size(0);
//Store valus of global memory into local memory
scratch[lid] = A[id];
//Store valus of global memory into local memory
scratch[lid] = A[id];
//Wait for copying to complete
barrier(CLK_LOCAL_MEM_FENCE);
//Wait for copying to complete
barrier(CLK_LOCAL_MEM_FENCE);
for (int i = 1; i < N; i *= 2) {
if (!(lid % (i * 2)) && ((lid + i) < N)){
if (scratch[lid] > scratch[lid + i])
scratch[lid] = scratch[lid+i];
for (int i = 1; i < N; i *= 2) {
if (!(lid % (i * 2)) && ((lid + i) < N)) {
if (scratch[lid] > scratch[lid + i])
scratch[lid] = scratch[lid+i];
}
barrier(CLK_LOCAL_MEM_FENCE);
}
barrier(CLK_LOCAL_MEM_FENCE);
}
//Store cache in output array
if (!lid)
atomic_min(&B[0], scratch[lid]);
//Store cache in output array
if (!lid)
atomic_min(&B[0], scratch[lid]);
}
__kernel void reduce_max(__global const int* A, __global int* B, __local int* scratch) {
//Get local variable data
int id = get_global_id(0);
int lid = get_local_id(0);
int N = get_local_size(0);
//Get local variable data
int id = get_global_id(0);
int lid = get_local_id(0);
int N = get_local_size(0);
//Store valus of global memory into local memory
scratch[lid] = A[id];
//Store valus of global memory into local memory
scratch[lid] = A[id];
//Wait for copying to complete
barrier(CLK_LOCAL_MEM_FENCE);
//Wait for copying to complete
barrier(CLK_LOCAL_MEM_FENCE);
for (int i = 1; i < N; i *= 2) {
if (!(lid % (i * 2)) && ((lid + i) < N)){
if (scratch[lid] < scratch[lid + i])
scratch[lid] = scratch[lid+i];
for (int i = 1; i < N; i *= 2) {
if (!(lid % (i * 2)) && ((lid + i) < N)) {
if (scratch[lid] < scratch[lid + i])
scratch[lid] = scratch[lid+i];
}
barrier(CLK_LOCAL_MEM_FENCE);
}
barrier(CLK_LOCAL_MEM_FENCE);
}
//Store cache in output array
if (!lid)
atomic_max(&B[0], scratch[lid]);
//Store cache in output array
if (!lid)
atomic_max(&B[0], scratch[lid]);
}
__kernel void reduce_avg(__global const int* A, __global int* B, __local int* scratch) {
//Get local variable data
int id = get_global_id(0);
int lid = get_local_id(0);
int N = get_local_size(0);
//Get local variable data
int id = get_global_id(0);
int lid = get_local_id(0);
int N = get_local_size(0);
//Store valus of global memory into local memory
scratch[lid] = A[id];
//Store valus of global memory into local memory
scratch[lid] = A[id];
//Wait for copying to complete
barrier(CLK_LOCAL_MEM_FENCE);
//Wait for copying to complete
barrier(CLK_LOCAL_MEM_FENCE);
for (int i = 1; i < N; i *= 2) {
if (!(lid % (i * 2)) && ((lid + i) < N))
{
scratch[lid] += scratch[lid+i];
}
barrier(CLK_LOCAL_MEM_FENCE);
}
for (int i = 1; i < N; i *= 2) {
if (!(lid % (i * 2)) && ((lid + i) < N))
{
scratch[lid] += scratch[lid+i];
}
barrier(CLK_LOCAL_MEM_FENCE);
}
//Store cache in output array
if (!lid)
atomic_add(&B[0],scratch[lid]);
//Store cache in output array
if (!lid)
atomic_add(&B[0],scratch[lid]);
}

View File

@ -1,15 +1,15 @@
<!doctype html>
<html>
<head>
<title>Test Page</title>
</head>
<head>
<title>Test Page</title>
</head>
<body>
<h1>Hello</h1>
<p>
World!
</p>
</body>
<body>
<h1>Hello</h1>
<p>
World!
</p>
</body>
</html>