[pocl] 08/18: refresh typos.patch
Andreas Beckmann
anbe at moszumanska.debian.org
Thu Dec 14 01:54:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to annotated tag debian/0.14-1
in repository pocl.
commit fe89defe7d446a07cfb215f35404e67bc9fe9863
Author: Andreas Beckmann <anbe at debian.org>
Date: Mon Dec 11 03:24:55 2017 +0100
refresh typos.patch
---
debian/patches/typos.patch | 76 ++++++++++++++++++++++++----------------------
1 file changed, 40 insertions(+), 36 deletions(-)
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index 3f1b84a..dbd2f17 100644
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -3,7 +3,7 @@ Description: fix typos found by lintian
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -223,7 +223,7 @@ endif()
+@@ -269,7 +269,7 @@ endif()
######################################################################################
@@ -12,7 +12,7 @@ Description: fix typos found by lintian
# also, if DEFAULT_FEATURE_X is 0, prevents FEATURE_X being 1
# since it takes DEFAULT_FEATURE_X=0 to mean "FEATURE_X is unavailable"
macro(setup_cached_var VARNAME DESCRIPTION DOCS_FEATURE_IS_UNAVAILABLE DOCS_REQUESTED_DISABLING_FEATURE)
-@@ -298,7 +298,7 @@ if(NOT DEFINED DEFAULT_USE_VECMATHLIB)
+@@ -329,7 +329,7 @@ if(NOT DEFINED DEFAULT_USE_VECMATHLIB)
endif()
setup_cached_var(USE_VECMATHLIB "Vecmathlib use"
@@ -21,16 +21,16 @@ Description: fix typos found by lintian
"Vecmathlib is usable, but requested disabling it")
# vecmathlib does not compile with fp16 currently
-@@ -429,7 +429,7 @@ if(NOT DEFINED DEFAULT_ENABLE_ICD)
+@@ -496,7 +496,7 @@ else()
- set(HAVE_OCL_ICD 1)
+ set(HAVE_OCL_ICD 1 CACHE INTERNAL "ICL library is ocl-icd")
set(OPENCL_FOUND 1 CACHE INTERNAL "opencl ICD/library found")
-- set(OPENCL_LIBRARIES "OpenCL" CACHE INTERNAL "opencl ICD/library paths") # duh, why doesnt ocl-icd set this in .pc file ??
-+ set(OPENCL_LIBRARIES "OpenCL" CACHE INTERNAL "opencl ICD/library paths") # duh, why doesn't ocl-icd set this in .pc file ??
- set(DEFAULT_ENABLE_ICD 1 CACHE INTERNAL "ICD loader availability")
- set(DEFAULT_DIRECT_LINKAGE 0 CACHE INTERNAL "direct linkage")
- set(DEFAULT_TESTS_USE_ICD 1 CACHE INTERNAL "tests use ICD")
-@@ -837,7 +837,7 @@ endif()
+- # duh, why doesnt ocl-icd set this in it's .pc file ??
++ # duh, why doesn't ocl-icd set this in its .pc file ??
+ if (CMAKE_CROSSCOMPILING)
+ set(OPENCL_LIBRARIES "${OCL_ICD_LIBRARIES}" CACHE INTERNAL "opencl ICD/library paths")
+ else()
+@@ -864,7 +864,7 @@ endif()
##########################################################
# POCL_DEVICE_ADDRESS_BITS
@@ -39,7 +39,7 @@ Description: fix typos found by lintian
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(POCL_DEVICE_ADDRESS_BITS 64)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-@@ -875,7 +875,7 @@ endif()
+@@ -902,7 +902,7 @@ endif()
# libpocl.so should get only API additions as we are implementing a standard.
#
# The library version encodings into the library file name are platform
@@ -48,17 +48,17 @@ Description: fix typos found by lintian
# creation to succeed (see Makefile.am).
# Chiefly, GNU differs from BSD, and others are untested. See e.g.
# http://en.opensuse.org/openSUSE%3aShared_library_packaging_policy#Versioning_schemes
---- a/lib/CL/clBuildProgram.c
-+++ b/lib/CL/clBuildProgram.c
-@@ -153,7 +153,7 @@ CL_API_SUFFIX__VERSION_1_0
- }
- else if (strstr (cl_parameters_not_yet_supported_by_clang, token))
- {
-- APPEND_TO_MAIN_BUILD_LOG("Build option isnt yet supported by clang: %s\n", token);
-+ APPEND_TO_MAIN_BUILD_LOG("Build option isn't yet supported by clang: %s\n", token);
- token = strtok_r (NULL, " ", &saveptr);
- continue;
- }
+--- a/lib/CL/devices/hsa/pocl-hsa.c
++++ b/lib/CL/devices/hsa/pocl-hsa.c
+@@ -1387,7 +1387,7 @@ pocl_hsa_launch(pocl_hsa_device_data_t *
+ while ((packet_id - hsa_queue_load_read_index_acquire(last_queue))
+ >= last_queue->size)
+ {
+- /* device queue is full. TODO this isnt the optimal solution */
++ /* device queue is full. TODO this isn't the optimal solution */
+ POCL_MSG_WARN("pocl-hsa: queue %" PRIuS " overloaded\n", dd->last_queue);
+ usleep(2000);
+ }
--- a/lib/kernel/hsail64/hsail_templates.h
+++ b/lib/kernel/hsail64/hsail_templates.h
@@ -224,7 +224,7 @@
@@ -72,43 +72,47 @@ Description: fix typos found by lintian
IMPLEMENT_LLVM_INTRIN_V_VI_ALL(NAME, float, int, BUILTIN, .f32) \
--- a/tests/runtime/test_clGetKernelArgInfo.c
+++ b/tests/runtime/test_clGetKernelArgInfo.c
-@@ -118,27 +118,27 @@ int test_program(cl_program program, int
+@@ -124,31 +124,31 @@ int test_program(cl_program program, int
err = clGetKernelArgInfo(test_kernel, 0, CL_KERNEL_ARG_TYPE_NAME,
BUF_LEN, &kernel_arg.string, &retsize);
CHECK_OPENCL_ERROR_IN("clGetKernelArgInfo");
- TEST_ASSERT((retsize==6) && " arg type name size of test_kernel doesnt fit");
-- TEST_ASSERT((strncmp(kernel_arg.string, "char*", 6)==0) && " arg type name of test_kernel doesnt compare");
+ TEST_ASSERT((retsize==6) && " arg type name size of test_kernel doesn't fit");
-+ TEST_ASSERT((strncmp(kernel_arg.string, "char*", 6)==0) && " arg type name of test_kernel doesn't compare");
+ TEST_ASSERT((strncmp(kernel_arg.string, "char*", 6)==0) &&
+- " arg type name of test_kernel doesnt compare");
++ " arg type name of test_kernel doesn't compare");
err = clGetKernelArgInfo(test_kernel, 1, CL_KERNEL_ARG_TYPE_NAME,
BUF_LEN, &kernel_arg.string, &retsize);
CHECK_OPENCL_ERROR_IN("clGetKernelArgInfo");
- TEST_ASSERT((retsize==7) && " arg type name size of test_kernel doesnt fit");
-- TEST_ASSERT((strncmp(kernel_arg.string, "float*", 7)==0) && " arg type name of test_kernel doesnt compare");
+ TEST_ASSERT((retsize==7) && " arg type name size of test_kernel doesn't fit");
-+ TEST_ASSERT((strncmp(kernel_arg.string, "float*", 7)==0) && " arg type name of test_kernel doesn't compare");
+ TEST_ASSERT((strncmp(kernel_arg.string, "float*", 7)==0) &&
+- " arg type name of test_kernel doesnt compare");
++ " arg type name of test_kernel doesn't compare");
err = clGetKernelArgInfo(test_kernel, 3, CL_KERNEL_ARG_TYPE_NAME,
BUF_LEN, &kernel_arg.string, &retsize);
CHECK_OPENCL_ERROR_IN("clGetKernelArgInfo");
- TEST_ASSERT((retsize==6) && " arg type name size of test_kernel doesnt fit");
-- TEST_ASSERT((strncmp(kernel_arg.string, "float", 6)==0) && " arg type name of test_kernel doesnt compare");
+ TEST_ASSERT((retsize==6) && " arg type name size of test_kernel doesn't fit");
-+ TEST_ASSERT((strncmp(kernel_arg.string, "float", 6)==0) && " arg type name of test_kernel doesn't compare");
+ TEST_ASSERT((strncmp(kernel_arg.string, "float", 6)==0) &&
+- " arg type name of test_kernel doesnt compare");
++ " arg type name of test_kernel doesn't compare");
err = clGetKernelArgInfo(test_kernel, 4, CL_KERNEL_ARG_TYPE_NAME,
BUF_LEN, &kernel_arg.string, &retsize);
CHECK_OPENCL_ERROR_IN("clGetKernelArgInfo");
- TEST_ASSERT((retsize==5) && " arg type name size of test_kernel doesnt fit");
-- TEST_ASSERT((strncmp(kernel_arg.string, "int*", 5)==0) && " arg type name of test_kernel doesnt compare");
+ TEST_ASSERT((retsize==5) && " arg type name size of test_kernel doesn't fit");
-+ TEST_ASSERT((strncmp(kernel_arg.string, "int*", 5)==0) && " arg type name of test_kernel doesn't compare");
+ TEST_ASSERT((strncmp(kernel_arg.string, "int*", 5)==0) &&
+- " arg type name of test_kernel doesnt compare");
++ " arg type name of test_kernel doesn't compare");
/* TYPE QUALIFIER tests */
// constant char* msg, global volatile float* in, global float* out, const float j, local int* c
-@@ -172,8 +172,8 @@ int test_program(cl_program program, int
+@@ -186,8 +186,8 @@ int test_program(cl_program program, int
printf("arg name not available (this is normal for SPIR)\n");
} else {
CHECK_OPENCL_ERROR_IN("clGetKernelArgInfo");
@@ -119,7 +123,7 @@ Description: fix typos found by lintian
}
err = clGetKernelArgInfo(test_kernel, 1, CL_KERNEL_ARG_NAME,
-@@ -182,8 +182,8 @@ int test_program(cl_program program, int
+@@ -196,8 +196,8 @@ int test_program(cl_program program, int
printf("arg name not available (this is normal for SPIR)\n");
} else {
CHECK_OPENCL_ERROR_IN("clGetKernelArgInfo");
@@ -130,7 +134,7 @@ Description: fix typos found by lintian
}
err = clGetKernelArgInfo(test_kernel, 2, CL_KERNEL_ARG_NAME,
-@@ -192,8 +192,8 @@ int test_program(cl_program program, int
+@@ -206,8 +206,8 @@ int test_program(cl_program program, int
printf("arg name not available (this is normal for SPIR)\n");
} else {
CHECK_OPENCL_ERROR_IN("clGetKernelArgInfo");
@@ -141,7 +145,7 @@ Description: fix typos found by lintian
}
err = clGetKernelArgInfo(test_kernel, 3, CL_KERNEL_ARG_NAME,
-@@ -202,8 +202,8 @@ int test_program(cl_program program, int
+@@ -216,8 +216,8 @@ int test_program(cl_program program, int
printf("arg name not available (this is normal for SPIR)\n");
} else {
CHECK_OPENCL_ERROR_IN("clGetKernelArgInfo");
@@ -152,7 +156,7 @@ Description: fix typos found by lintian
}
/* ACCESS QUALIFIER tests for test_kernel2 */
-@@ -228,8 +228,8 @@ int test_program(cl_program program, int
+@@ -242,8 +242,8 @@ int test_program(cl_program program, int
err = clGetKernelArgInfo(test_kernel2, 0, CL_KERNEL_ARG_TYPE_NAME,
BUF_LEN, &kernel_arg.string, &retsize);
CHECK_OPENCL_ERROR_IN("clGetKernelArgInfo");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git
More information about the Pkg-opencl-commits
mailing list