From 822c27e59840048d7ce0a6fd49c69cecdd2ac6cb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Jan 19 2017 20:55:47 +0000 Subject: update patches Signed-off-by: Igor Gnatenko --- diff --git a/0001-use-system-compyte.patch b/0001-use-system-compyte.patch index 1b53e40..44ab3b1 100644 --- a/0001-use-system-compyte.patch +++ b/0001-use-system-compyte.patch @@ -1,4 +1,4 @@ -From f7d34a2760c90f99fc5320ab8acd0aca141e449b Mon Sep 17 00:00:00 2001 +From 98b0464349a51590eee21297d935feea7dd3a6ce Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 24 Oct 2015 12:51:23 +0200 Subject: [PATCH 1/3] use system compyte @@ -12,7 +12,7 @@ Signed-off-by: Igor Gnatenko 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyopencl/array.py b/pyopencl/array.py -index e7a7b78..63dc58d 100644 +index a03227f..5b58dd9 100644 --- a/pyopencl/array.py +++ b/pyopencl/array.py @@ -34,7 +34,7 @@ import numpy as np @@ -25,11 +25,11 @@ index e7a7b78..63dc58d 100644 f_contiguous_strides as _f_contiguous_strides, c_contiguous_strides as _c_contiguous_strides, diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py -index ecb4239..d704718 100644 +index 45a0ab0..7ec75ab 100644 --- a/pyopencl/cffi_cl.py +++ b/pyopencl/cffi_cl.py -@@ -34,7 +34,7 @@ import numpy as np - import sys +@@ -37,7 +37,7 @@ import sys + from pytools import memoize_method from pyopencl._cffi import ffi as _ffi -from .compyte.array import f_contiguous_strides, c_contiguous_strides @@ -38,10 +38,10 @@ index ecb4239..d704718 100644 from pyopencl._cffi import lib as _lib diff --git a/pyopencl/reduction.py b/pyopencl/reduction.py -index 689763f..7ae005d 100644 +index 7c01741..acb96d1 100644 --- a/pyopencl/reduction.py +++ b/pyopencl/reduction.py -@@ -446,7 +446,7 @@ def _get_dot_expr(dtype_out, dtype_a, dtype_b, conjugate_first, +@@ -514,7 +514,7 @@ def _get_dot_expr(dtype_out, dtype_a, dtype_b, conjugate_first, dtype_b = dtype_a if dtype_out is None: @@ -51,7 +51,7 @@ index 689763f..7ae005d 100644 dtype_a.type(0), dtype_b.type(0), has_double_support) diff --git a/pyopencl/tools.py b/pyopencl/tools.py -index ac991d6..82f7f92 100644 +index c7bd5ed..8900a0a 100644 --- a/pyopencl/tools.py +++ b/pyopencl/tools.py @@ -39,13 +39,13 @@ from pyopencl.cffi_cl import _lib @@ -70,7 +70,7 @@ index ac991d6..82f7f92 100644 TYPE_REGISTRY, fill_registry_with_opencl_c_types) fill_registry_with_opencl_c_types(TYPE_REGISTRY) -@@ -338,7 +338,7 @@ def parse_c_arg(c_arg, with_offset=False): +@@ -341,7 +341,7 @@ def parse_c_arg(c_arg, with_offset=False): else: vec_arg_factory = VectorArg @@ -79,7 +79,7 @@ index ac991d6..82f7f92 100644 return parse_c_arg_backend(c_arg, ScalarArg, vec_arg_factory) -@@ -760,7 +760,7 @@ class _TemplateRenderer(object): +@@ -777,7 +777,7 @@ class _TemplateRenderer(object): try: return self.type_aliases[typename] except KeyError: @@ -88,7 +88,7 @@ index ac991d6..82f7f92 100644 return NAME_TO_DTYPE[typename] else: return np.dtype(typename) -@@ -798,7 +798,7 @@ class _TemplateRenderer(object): +@@ -815,7 +815,7 @@ class _TemplateRenderer(object): else: vec_arg_factory = _VectorArgPlaceholder @@ -98,5 +98,5 @@ index ac991d6..82f7f92 100644 for arg in all_args: if isinstance(arg, str): -- -2.4.3 +2.11.0 diff --git a/0002-disable-executing-git-submodule.patch b/0002-disable-executing-git-submodule.patch index 71344b0..0c1c914 100644 --- a/0002-disable-executing-git-submodule.patch +++ b/0002-disable-executing-git-submodule.patch @@ -1,4 +1,4 @@ -From 11c02f11f54a79a005c83289bd552bf7cf8421f4 Mon Sep 17 00:00:00 2001 +From c0a33b3849d26fd744157b54a0748199eb4dfb0c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 24 Oct 2015 12:55:47 +0200 Subject: [PATCH 2/3] disable executing git submodule @@ -9,10 +9,10 @@ Signed-off-by: Igor Gnatenko 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py -index 4a1073e..8a52e06 100644 +index 1d73590..4588194 100644 --- a/setup.py +++ b/setup.py -@@ -88,9 +88,7 @@ def get_config_schema(): +@@ -93,9 +93,7 @@ def get_config_schema(): def main(): from setuptools import find_packages @@ -24,5 +24,5 @@ index 4a1073e..8a52e06 100644 hack_distutils() conf = get_config(get_config_schema(), -- -2.4.3 +2.11.0 diff --git a/0003-don-t-hack-distutils-with-C-LDFLAGS.patch b/0003-don-t-hack-distutils-with-C-LDFLAGS.patch index c30630c..bf4042c 100644 --- a/0003-don-t-hack-distutils-with-C-LDFLAGS.patch +++ b/0003-don-t-hack-distutils-with-C-LDFLAGS.patch @@ -1,4 +1,4 @@ -From 9f12b578c27c93a76a0b99545d2ba9d36ec0c633 Mon Sep 17 00:00:00 2001 +From 803b31bc9a8078a1540ae2c970bf78c4a2e4b541 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 24 Oct 2015 13:11:13 +0200 Subject: [PATCH 3/3] don't hack distutils with C/LDFLAGS @@ -9,10 +9,10 @@ Signed-off-by: Igor Gnatenko 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py -index 8a52e06..7f577d9 100644 +index 4588194..9bcdbdb 100644 --- a/setup.py +++ b/setup.py -@@ -90,7 +90,6 @@ def main(): +@@ -95,7 +95,6 @@ def main(): from setuptools import find_packages from aksetup_helper import (hack_distutils, get_config, setup) @@ -21,5 +21,5 @@ index 8a52e06..7f577d9 100644 warn_about_no_config=False) -- -2.4.3 +2.11.0