[beignet] 07/07: Refresh patches
Rebecca Palmer
rnpalmer-guest at moszumanska.debian.org
Sun Aug 9 15:34:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
rnpalmer-guest pushed a commit to branch master
in repository beignet.
commit 5bb6df60cca6a2b2a4c42422019152bc4bd09838
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date: Sun Aug 9 15:44:21 2015 +0100
Refresh patches
---
debian/changelog | 2 +-
.../Debian-compliant-compiler-flags-handling.patch | 2 +-
debian/patches/Enable-test-debug.patch | 22 +++++++++++-----------
debian/patches/reduce-notfound-output.patch | 6 +++---
debian/patches/shared-llvm.patch | 2 +-
debian/patches/support-kfreebsd.patch | 10 +++++-----
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 19f3de0..d4fd192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ beignet (1.1.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Update and improve d/copyright.
- * Drop patches applied upstream.
+ * Drop patches applied upstream, refresh others.
* Update update-docs.patch.
* Drop outdated README.Debian.
diff --git a/debian/patches/Debian-compliant-compiler-flags-handling.patch b/debian/patches/Debian-compliant-compiler-flags-handling.patch
index 10c1f12..0ea9a26 100644
--- a/debian/patches/Debian-compliant-compiler-flags-handling.patch
+++ b/debian/patches/Debian-compliant-compiler-flags-handling.patch
@@ -16,7 +16,7 @@ Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
INCLUDE (GNUInstallDirs OPTIONAL)
# support old CMake without GNUInstallDirs
-@@ -73,14 +72,14 @@ elseif (COMPILER STREQUAL "CLANG")
+@@ -79,14 +78,14 @@ elseif (COMPILER STREQUAL "CLANG")
# compiler flag setting
if (COMPILER STREQUAL "GCC")
diff --git a/debian/patches/Enable-test-debug.patch b/debian/patches/Enable-test-debug.patch
index 0619892..02aec8f 100644
--- a/debian/patches/Enable-test-debug.patch
+++ b/debian/patches/Enable-test-debug.patch
@@ -174,19 +174,19 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
// Setup kernel and buffers
int k, i, index_cur;
+ int status = 0;
+ float ULPSIZE_NO_FAST_MATH = 16.0;
float gpu_data[max_function * count_input] = {0}, cpu_data[max_function * count_input] = {0};
- for(i=0; i<count_input_ori;i++)
-@@ -77,7 +78,7 @@ static void builtin_pow(void)
- (isnan(cpu_data[index_cur]) && !isnan(gpu_data[index_cur])) ||
- (fabs(gpu_data[index_cur] - cpu_data[index_cur]) > cl_FLT_ULP(cpu_data[index_cur]) * ULPSIZE_FACTOR) )
+@@ -80,7 +81,7 @@ static void builtin_pow(void)
+ && (denormals_supported || gpu_data[index_cur]!=0 || std::fpclassify(cpu_data[index_cur])!=FP_SUBNORMAL) ) )
+
{
- printf_c("%d/%d: x:%f, y:%f -> gpu:%f cpu:%f\n", k, i, input_data1[k], input_data2[k], gpu_data[index_cur], cpu_data[index_cur]);
+ printf_c("%d/%d: x:%f, y:%f -> gpu:%e cpu:%e err: %e ULP: %e\n", k, i, input_data1[k], input_data2[k], gpu_data[index_cur], cpu_data[index_cur],gpu_data[index_cur]-cpu_data[index_cur],cl_FLT_ULP(cpu_data[index_cur]));
}
else
printf("%d/%d: x:%f, y:%f -> gpu:%f cpu:%f\n", k, i, input_data1[k], input_data2[k], gpu_data[index_cur], cpu_data[index_cur]);
-@@ -93,6 +94,7 @@ static void builtin_pow(void)
+@@ -97,6 +98,7 @@ static void builtin_pow(void)
#endif
}
}
@@ -196,16 +196,16 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
MAKE_UTEST_FROM_FUNCTION(builtin_pow)
--- a/utests/setenv.sh.in
+++ b/utests/setenv.sh.in
-@@ -6,3 +6,6 @@ export OCL_PCH_PATH=@LOCAL_OCL_PCH_OBJEC
- export OCL_KERNEL_PATH=@CMAKE_CURRENT_SOURCE_DIR@/../kernels
- export OCL_GBE_PATH=@LOCAL_GBE_OBJECT_DIR@
+@@ -8,3 +8,6 @@ export OCL_PCH_PATH=@LOCAL_OCL_PCH_OBJEC
export OCL_INTERP_PATH=@LOCAL_INTERP_OBJECT_DIR@
+ #disable self-test so we can get something more precise than "doesn't work"
+ export OCL_IGNORE_SELF_TEST=1
+obj-`dpkg-architecture -qDEB_HOST_MULTIARCH`/utests/utest_run -a
+export OCL_STRICT_CONFORMANCE=0
+obj-`dpkg-architecture -qDEB_HOST_MULTIARCH`/utests/utest_run -a
--- a/utests/utest_generator.py
+++ b/utests/utest_generator.py
-@@ -161,6 +161,7 @@ def udebug(ulpSize,returnType,function):
+@@ -158,6 +158,7 @@ def udebug(ulpSize,returnType,function):
}
#endif
}
@@ -213,7 +213,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
}\n'''%(returnType,Min_ulp(function),\
ulpUnit(ulpSize),ulpNum(ulpSize),\
ulpNum(ulpSize), ulpNum(ulpSize),\
-@@ -227,16 +228,16 @@ which can print more values and informat
+@@ -224,16 +225,16 @@ which can print more values and informat
#include <algorithm>
#include <string.h>
@@ -233,7 +233,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
}
'''
#########Execute class itself
-@@ -336,6 +337,7 @@ which can print more values and informat
+@@ -333,6 +334,7 @@ which can print more values and informat
static void %s_%s(void)
{
int index;
diff --git a/debian/patches/reduce-notfound-output.patch b/debian/patches/reduce-notfound-output.patch
index 2be1895..722cbd2 100644
--- a/debian/patches/reduce-notfound-output.patch
+++ b/debian/patches/reduce-notfound-output.patch
@@ -8,7 +8,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
--- beignet-1.0.1.orig/src/cl_device_id.c
+++ beignet-1.0.1/src/cl_device_id.c
-@@ -394,10 +394,10 @@ brw_gt3_break:
+@@ -527,10 +527,10 @@ brw_gt3_break:
case PCI_CHIP_SANDYBRIDGE_BRIDGE_S:
case PCI_CHIP_SANDYBRIDGE_S_GT:
// Intel(R) HD Graphics SandyBridge not supported yet
@@ -23,7 +23,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
if (ret == NULL)
--- beignet-1.0.1.orig/src/intel/intel_driver.c
+++ beignet-1.0.1/src/intel/intel_driver.c
-@@ -236,7 +236,6 @@ intel_driver_open(intel_driver_t *intel,
+@@ -242,7 +242,6 @@ intel_driver_open(intel_driver_t *intel,
}
if(!intel_driver_is_active(intel)) {
@@ -31,7 +31,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
return CL_DEVICE_NOT_FOUND;
}
-@@ -293,7 +292,6 @@ intel_driver_init_master(intel_driver_t
+@@ -299,7 +298,6 @@ intel_driver_init_master(intel_driver_t
// usually dev_name = "/dev/dri/card%d"
dev_fd = open(dev_name, O_RDWR);
if (dev_fd == -1) {
diff --git a/debian/patches/shared-llvm.patch b/debian/patches/shared-llvm.patch
index cd87d93..2a68f15 100644
--- a/debian/patches/shared-llvm.patch
+++ b/debian/patches/shared-llvm.patch
@@ -7,7 +7,7 @@ Author: Rebecca Palmer <rebecca_palmer at zoho.com>
--- beignet-1.0.2.orig/CMake/FindLLVM.cmake
+++ beignet-1.0.2/CMake/FindLLVM.cmake
-@@ -93,20 +93,7 @@ execute_process(
+@@ -87,20 +87,7 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE
)
diff --git a/debian/patches/support-kfreebsd.patch b/debian/patches/support-kfreebsd.patch
index 50ba450..88e9ef3 100644
--- a/debian/patches/support-kfreebsd.patch
+++ b/debian/patches/support-kfreebsd.patch
@@ -8,7 +8,7 @@ Author: Koop Mast, Rebecca Palmer
--- a/src/cl_device_id.c
+++ b/src/cl_device_id.c
-@@ -33,7 +33,12 @@
+@@ -34,7 +34,12 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -21,15 +21,15 @@ Author: Koop Mast, Rebecca Palmer
#ifndef CL_VERSION_1_2
#define CL_DEVICE_BUILT_IN_KERNELS 0x103F
-@@ -424,6 +429,7 @@ skl_gt4_break:
- cl_driver_delete(dummy);
- #endif
+@@ -546,6 +551,7 @@ skl_gt4_break:
+ /* Apply any driver-dependent updates to the device info */
+ cl_driver_update_device_info(ret);
+#if defined(linux) || defined(__linux__) || defined(__LINUX__)
struct sysinfo info;
if (sysinfo(&info) == 0) {
uint64_t two_gb = 2 * 1024 * 1024 * 1024ul;
-@@ -432,6 +438,22 @@ skl_gt4_break:
+@@ -554,6 +559,22 @@ skl_gt4_break:
two_gb : info.totalram;
ret->max_mem_alloc_size = ret->global_mem_size / 2;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git
More information about the Pkg-opencl-commits
mailing list