[beignet] 01/02: Use std::isnan,isinf to fix Ubuntu FTBFS
Rebecca Palmer
rnpalmer-guest at moszumanska.debian.org
Sat Apr 30 09:46:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
rnpalmer-guest pushed a commit to branch master
in repository beignet.
commit 3ae8ef3067bebba92b1b18bf393a0a6323d6dc18
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date: Sat Apr 30 10:19:27 2016 +0100
Use std::isnan,isinf to fix Ubuntu FTBFS
---
debian/changelog | 3 +-
debian/patches/Enable-test-debug.patch | 8 +-
debian/patches/series | 3 +-
debian/patches/std-isnan-isinf.patch | 248 +++++++++++++++++++++++++++++++++
4 files changed, 256 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 37ceab8..e47770d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-beignet (1.1.2-1) unstable; urgency=medium
+beignet (1.1.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Drop patches applied upstream, refresh others.
@@ -11,6 +11,7 @@ beignet (1.1.2-1) unstable; urgency=medium
* Improve reportbug script.
* Update/clarify update-docs.patch and package description
(mostly what hardware is supported).
+ * Use std::isnan/isinf to fix Ubuntu FTBFS.
-- Rebecca N. Palmer <rebecca_palmer at zoho.com> Mon, 25 Apr 2016 22:37:04 +0100
diff --git a/debian/patches/Enable-test-debug.patch b/debian/patches/Enable-test-debug.patch
index 819b319..1792829 100644
--- a/debian/patches/Enable-test-debug.patch
+++ b/debian/patches/Enable-test-debug.patch
@@ -77,11 +77,11 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
@@ -72,19 +73,19 @@ static void builtin_exp(void)
#if udebug
- if (isinf(cpu_data[index_cur]) && isinf(gpu_data[index_cur])){
+ if (std::isinf(cpu_data[index_cur]) && std::isinf(gpu_data[index_cur])){
- printf(log);
+ printf("%s",log);
}
- else if (isnan(cpu_data[index_cur]) && isnan(gpu_data[index_cur])){
+ else if (std::isnan(cpu_data[index_cur]) && std::isnan(gpu_data[index_cur])){
- printf(log);
+ printf("%s",log);
}
@@ -97,8 +97,8 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
- printf_c(log);
+ printf_c("%s",log);
#else
- if (isinf(cpu_data[index_cur]))
- OCL_ASSERTM(isinf(gpu_data[index_cur]), log);
+ if (std::isinf(cpu_data[index_cur]))
+ OCL_ASSERTM(std::isinf(gpu_data[index_cur]), log);
@@ -97,6 +98,7 @@ static void builtin_exp(void)
#endif
}
diff --git a/debian/patches/series b/debian/patches/series
index 041aa39..626f49b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
Debian-compliant-compiler-flags-handling.patch
-Enable-test-debug.patch
support-kfreebsd.patch
reduce-notfound-output.patch
shared-llvm.patch
@@ -7,3 +6,5 @@ update-docs.patch
allow-+-in-directory.patch
printf-fix-90472.patch
find-llvm37.patch
+std-isnan-isinf.patch
+Enable-test-debug.patch
diff --git a/debian/patches/std-isnan-isinf.patch b/debian/patches/std-isnan-isinf.patch
new file mode 100644
index 0000000..bc4bea6
--- /dev/null
+++ b/debian/patches/std-isnan-isinf.patch
@@ -0,0 +1,248 @@
+Description: Prepend std namespace to isnan and isinf calls.
+
+Needed in Ubuntu to avoid FTBFS.
+
+Origin: upstream 14bd8855dddcf683df8138c1062bc65b05d46f94
+Author: Sean Lynch
+diff --git a/utests/builtin_acos_asin.cpp b/utests/builtin_acos_asin.cpp
+index 0187226..395460b 100644
+--- a/utests/builtin_acos_asin.cpp
++++ b/utests/builtin_acos_asin.cpp
+@@ -59,10 +59,10 @@ static void builtin_acos_asin(void)
+ {
+ index_cur = k * max_function + i;
+ #if udebug
+- if (isinf(cpu_data[index_cur]) && !isinf(gpu_data[index_cur])){
++ if (std::isinf(cpu_data[index_cur]) && !std::isinf(gpu_data[index_cur])){
+ printf_c("%d/%d: %f -> gpu:%f cpu:%f\n", k, i, input_data[k], gpu_data[index_cur], cpu_data[index_cur]);
+ }
+- else if (isnan(cpu_data[index_cur]) && !isnan(gpu_data[index_cur])){
++ else if (std::isnan(cpu_data[index_cur]) && !std::isnan(gpu_data[index_cur])){
+ printf_c("%d/%d: %f -> gpu:%f cpu:%f\n", k, i, input_data[k], gpu_data[index_cur], cpu_data[index_cur]);
+ }
+ else if(fabs(gpu_data[index_cur] - cpu_data[index_cur]) > 1e-3f){
+@@ -71,10 +71,10 @@ static void builtin_acos_asin(void)
+ else
+ printf("%d/%d: %f -> gpu:%f cpu:%f\n", k, i, input_data[k], gpu_data[index_cur], cpu_data[index_cur]);
+ #else
+- if (isinf(cpu_data[index_cur]))
+- OCL_ASSERT(isinf(gpu_data[index_cur]));
+- else if (isnan(cpu_data[index_cur]))
+- OCL_ASSERT(isnan(gpu_data[index_cur]));
++ if (std::isinf(cpu_data[index_cur]))
++ OCL_ASSERT(std::isinf(gpu_data[index_cur]));
++ else if (std::isnan(cpu_data[index_cur]))
++ OCL_ASSERT(std::isnan(gpu_data[index_cur]));
+ else
+ {
+ OCL_ASSERT(fabs(gpu_data[index_cur] - cpu_data[index_cur]) < 1e-3f);
+diff --git a/utests/builtin_exp.cpp b/utests/builtin_exp.cpp
+index d5288c8..406d223 100644
+--- a/utests/builtin_exp.cpp
++++ b/utests/builtin_exp.cpp
+@@ -71,10 +71,10 @@ static void builtin_exp(void)
+ diff/gpu_data[index_cur], 3 * FLT_ULP);
+
+ #if udebug
+- if (isinf(cpu_data[index_cur]) && isinf(gpu_data[index_cur])){
++ if (std::isinf(cpu_data[index_cur]) && std::isinf(gpu_data[index_cur])){
+ printf(log);
+ }
+- else if (isnan(cpu_data[index_cur]) && isnan(gpu_data[index_cur])){
++ else if (std::isnan(cpu_data[index_cur]) && std::isnan(gpu_data[index_cur])){
+ printf(log);
+ }
+ else if( diff / cpu_data[index_cur] < 3 * FLT_ULP \
+@@ -86,10 +86,10 @@ static void builtin_exp(void)
+ else
+ printf_c(log);
+ #else
+- if (isinf(cpu_data[index_cur]))
+- OCL_ASSERTM(isinf(gpu_data[index_cur]), log);
+- else if (isnan(cpu_data[index_cur]))
+- OCL_ASSERTM(isnan(gpu_data[index_cur]), log);
++ if (std::isinf(cpu_data[index_cur]))
++ OCL_ASSERTM(std::isinf(gpu_data[index_cur]), log);
++ else if (std::isnan(cpu_data[index_cur]))
++ OCL_ASSERTM(std::isnan(gpu_data[index_cur]), log);
+ else if ( gpu_data[index_cur] > FLT_ULP || cpu_data[index_cur] > FLT_ULP)
+ OCL_ASSERTM(fabs( diff / cpu_data[index_cur]) < 3 * FLT_ULP, log);
+ else
+diff --git a/utests/builtin_pow.cpp b/utests/builtin_pow.cpp
+index f586448..21fa895 100644
+--- a/utests/builtin_pow.cpp
++++ b/utests/builtin_pow.cpp
+@@ -74,8 +74,8 @@ static void builtin_pow(void)
+ {
+ index_cur = k * max_function + i;
+ #if udebug
+- if ( (isinf(cpu_data[index_cur]) && !isinf(gpu_data[index_cur])) ||
+- (isnan(cpu_data[index_cur]) && !isnan(gpu_data[index_cur])) ||
++ if ( (std::isinf(cpu_data[index_cur]) && !std::isinf(gpu_data[index_cur])) ||
++ (std::isnan(cpu_data[index_cur]) && !std::isnan(gpu_data[index_cur])) ||
+ (fabs(gpu_data[index_cur] - cpu_data[index_cur]) > cl_FLT_ULP(cpu_data[index_cur]) * ULPSIZE_FACTOR
+ && (denormals_supported || gpu_data[index_cur]!=0 || std::fpclassify(cpu_data[index_cur])!=FP_SUBNORMAL) ) )
+
+@@ -85,10 +85,10 @@ static void builtin_pow(void)
+ 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]);
+ #else
+- if (isinf(cpu_data[index_cur]))
+- OCL_ASSERT(isinf(gpu_data[index_cur]));
+- else if (isnan(cpu_data[index_cur]))
+- OCL_ASSERT(isnan(gpu_data[index_cur]));
++ if (std::isinf(cpu_data[index_cur]))
++ OCL_ASSERT(std::isinf(gpu_data[index_cur]));
++ else if (std::isnan(cpu_data[index_cur]))
++ OCL_ASSERT(std::isnan(gpu_data[index_cur]));
+ else
+ {
+ OCL_ASSERT((fabs(gpu_data[index_cur] - cpu_data[index_cur]) < cl_FLT_ULP(cpu_data[index_cur]) * ULPSIZE_FACTOR) ||
+diff --git a/utests/builtin_tgamma.cpp b/utests/builtin_tgamma.cpp
+index db9ab3c..204f49e 100644
+--- a/utests/builtin_tgamma.cpp
++++ b/utests/builtin_tgamma.cpp
+@@ -43,8 +43,8 @@ void builtin_tgamma(void)
+ max_ulp = fabsf(cpu - dst[i]) / cl_FLT_ULP(cpu);
+ max_ulp_at = src[i];
+ }
+- if (isinf(cpu)) {
+- OCL_ASSERT(isinf(dst[i]));
++ if (std::isinf(cpu)) {
++ OCL_ASSERT(std::isinf(dst[i]));
+ } else if (fabsf(cpu - dst[i]) >= cl_FLT_ULP(cpu) * ULPSIZE_FACTOR) {
+ printf("%f %f %f\n", src[i], cpu, dst[i]);
+ OCL_ASSERT(0);
+diff --git a/utests/compiler_half.cpp b/utests/compiler_half.cpp
+index d486193..3af1925 100644
+--- a/utests/compiler_half.cpp
++++ b/utests/compiler_half.cpp
+@@ -229,7 +229,7 @@ static float half_test_src[half_n] = {
+ OCL_ASSERT(((fabs(fdst[i]) < 6e-8f) && (fabs(f) < 6e-8f)) || \
+ (fabs(f - fdst[i]) <= 0.03 * fabs(fdst[i])) || \
+ (isInf && ((infSign && fdst[i] > 65504.0f) || (!infSign && fdst[i] < -65504.0f))) || \
+- (isnan(f) && isnan(fdst[i]))); \
++ (std::isnan(f) && std::isnan(fdst[i]))); \
+ } \
+ OCL_UNMAP_BUFFER(1); \
+ } \
+@@ -303,7 +303,7 @@ HALF_MATH_TEST_1ARG(ceil, ceilf);
+ OCL_ASSERT(((fabs(fdst[i]) < 6e-8f) && (fabs(f) < 6e-8f)) || \
+ (fabs(f - fdst[i]) <= 0.03 * fabs(fdst[i])) || \
+ (isInf && ((infSign && fdst[i] > 65504.0f) || (!infSign && fdst[i] < -65504.0f))) || \
+- (isnan(f) && isnan(fdst[i]))); \
++ (std::isnan(f) && std::isnan(fdst[i]))); \
+ } \
+ OCL_UNMAP_BUFFER(2); \
+ } \
+diff --git a/utests/compiler_math.cpp b/utests/compiler_math.cpp
+index e0c4487..0c238c9 100644
+--- a/utests/compiler_math.cpp
++++ b/utests/compiler_math.cpp
+@@ -72,10 +72,10 @@ static void compiler_math(void)
+ for (int i = 0; i < 16; ++i) {
+ const float cpu = cpu_dst[i];
+ const float gpu = ((float*)buf_data[0])[i];
+- if (isinf(cpu))
+- OCL_ASSERT(isinf(gpu));
+- else if (isnan(cpu))
+- OCL_ASSERT(isnan(gpu));
++ if (std::isinf(cpu))
++ OCL_ASSERT(std::isinf(gpu));
++ else if (std::isnan(cpu))
++ OCL_ASSERT(std::isnan(gpu));
+ else
+ OCL_ASSERT(fabs(gpu-cpu) < 1e-3f);
+ }
+diff --git a/utests/compiler_math_2op.cpp b/utests/compiler_math_2op.cpp
+index 454967d..d771dba 100644
+--- a/utests/compiler_math_2op.cpp
++++ b/utests/compiler_math_2op.cpp
+@@ -65,10 +65,10 @@ static void compiler_math_2op(void)
+ for (int i = 0; i < 16; ++i) {
+ const float cpu = cpu_dst[i];
+ const float gpu = ((float*)buf_data[0])[i];
+- if (isinf(cpu))
+- OCL_ASSERT(isinf(gpu));
+- else if (isnan(cpu))
+- OCL_ASSERT(isnan(gpu));
++ if (std::isinf(cpu))
++ OCL_ASSERT(std::isinf(gpu));
++ else if (std::isnan(cpu))
++ OCL_ASSERT(std::isnan(gpu));
+ else {
+ OCL_ASSERT(fabs(gpu-cpu) < 1e-3f);
+ }
+diff --git a/utests/compiler_math_3op.cpp b/utests/compiler_math_3op.cpp
+index a382b0a..f90f9d6 100644
+--- a/utests/compiler_math_3op.cpp
++++ b/utests/compiler_math_3op.cpp
+@@ -50,10 +50,10 @@ static void compiler_math_3op(void)
+ for (int i = 0; i < 16; ++i) {
+ const float cpu = cpu_dst[i];
+ const float gpu = ((float*)buf_data[0])[i];
+- if (isinf(cpu))
+- OCL_ASSERT(isinf(gpu));
+- else if (isnan(cpu))
+- OCL_ASSERT(isnan(gpu));
++ if (std::isinf(cpu))
++ OCL_ASSERT(std::isinf(gpu));
++ else if (std::isnan(cpu))
++ OCL_ASSERT(std::isnan(gpu));
+ else
+ OCL_ASSERT(fabs(gpu-cpu) < 1e-3f);
+ }
+diff --git a/utests/utest_generator.py b/utests/utest_generator.py
+index 91cc938..25f18c7 100644
+--- a/utests/utest_generator.py
++++ b/utests/utest_generator.py
+@@ -112,10 +112,10 @@ def udebug(ulpSize,returnType,function):
+ ULPSIZE_FACTOR = select_ulpsize(ULPSIZE_FAST_MATH,ULPSIZE_NO_FAST_MATH);
+ bool fast_math = ULPSIZE_FACTOR == ULPSIZE_FAST_MATH;
+
+- if (isinf(cpu_data[index])){
++ if (std::isinf(cpu_data[index])){
+ INFORNAN="INF";
+ }
+- else if (isnan(cpu_data[index])){
++ else if (std::isnan(cpu_data[index])){
+ INFORNAN="NAN";
+ }
+ else{
+@@ -124,14 +124,14 @@ def udebug(ulpSize,returnType,function):
+ }
+
+ #if udebug
+- if (isinf(cpu_data[index])){
+- if (isinf(gpu_data[index]))
++ if (std::isinf(cpu_data[index])){
++ if (std::isinf(gpu_data[index]))
+ printf("%s expect:%s\\n", log, INFORNAN);
+ else
+ printf_c("%s expect:%s\\n", log, INFORNAN);
+ }
+- else if (isnan(cpu_data[index])){
+- if (isnan(gpu_data[index]))
++ else if (std::isnan(cpu_data[index])){
++ if (std::isnan(gpu_data[index]))
+ printf("%s expect:%s\\n", log, INFORNAN);
+ else
+ printf_c("%s expect:%s\\n", log, INFORNAN);
+@@ -142,13 +142,13 @@ def udebug(ulpSize,returnType,function):
+ else
+ printf_c("%s expect:%s\\n", log, ULPSIZE);
+ #else
+- if (isinf(cpu_data[index])){
++ if (std::isinf(cpu_data[index])){
+ sprintf(log, "%s expect:%s\\n", log, INFORNAN);
+- OCL_ASSERTM(isinf(gpu_data[index]) || fast_math,log);
++ OCL_ASSERTM(std::isinf(gpu_data[index]) || fast_math,log);
+ }
+- else if (isnan(cpu_data[index])){
++ else if (std::isnan(cpu_data[index])){
+ sprintf(log, "%s expect:%s\\n", log, INFORNAN);
+- OCL_ASSERTM(isnan(gpu_data[index]) || fast_math,log);
++ OCL_ASSERTM(std::isnan(gpu_data[index]) || fast_math,log);
+ }
+ else{
+ sprintf(log, "%s expect:%s\\n", log, ULPSIZE);
--
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