Re: [Gegl-developer] [PATCH 1/1] video-degradation: Don't crash when CL build fails

[Jan Vesely <jan vesely rutgers edu>]

On Sun, 2016-05-15 at 14:12 +0200, Øyvind Kolås wrote:
> Please use bugzilla which is GEGLs normal patch/bug handling system.
> I've pushed these changes to git master - albeit with slightly
> deteriorated meta data since the diffs were manually incorporated.
thank you, I'll use bugzilla next time. I assumed everybody just uses
git am.

The unexpected part is that the test now passes, despite not doing any
processing. I have attached diff between reference and OpenCL result.
note that CPU version of the algorithm produces the exact same picture
as OpenCL (which did no processing)


Jan

> /pippin
>
> On Sun, May 15, 2016 at 1:04 AM, Jan Vesely <jan vesely rutgers edu>
> wrote:
> > Signed-off-by: Jan Vesely <jan vesely rutgers edu>
> > ---
> > Â operations/common/video-degradation.c | 16 ++++++++++------
> > Â 1 file changed, 10 insertions(+), 6 deletions(-)
> >
> > diff --git a/operations/common/video-degradation.c
> > b/operations/common/video-degradation.c
> > index 29197ff..5b84e2a 100644
> > --- a/operations/common/video-degradation.c
> > +++ b/operations/common/video-degradation.c
> > @@ -201,13 +201,17 @@ cl_process (GeglOperation       *operation,
> > Â Â Â const size_t gbl_size[2] = {roi->width, roi->height};
> > Â Â Â const size_t gbl_off[2]Â Â = {roi->x, roi->y};
> > Â Â Â cl_int cl_err = 0;
> > +Â Â cl_mem filter_pat = NULL;
> >
> > -Â Â cl_mem filter_pat = gegl_clCreateBuffer (gegl_cl_get_context (),
> > -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â CL_MEM_READ_ONLY |
> > CL_MEM_COPY_HOST_PTR,
> > -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pattern_width[o-
> > > pattern] *
> > -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pattern_height[o-
> > > pattern] * sizeof(cl_int),
> > -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (void*)pattern[o-
> > > pattern],
> > -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &cl_err);
> > +Â Â if (!cl_data)
> > +Â Â Â Â goto error;
> > +
> > +Â Â filter_pat = gegl_clCreateBuffer (gegl_cl_get_context (),
> > +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â CL_MEM_READ_ONLY |
> > CL_MEM_COPY_HOST_PTR,
> > +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pattern_width[o->pattern] *
> > +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pattern_height[o->pattern] *
> > sizeof(cl_int),
> > +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (void*)pattern[o->pattern],
> > +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &cl_err);
> > Â Â Â CL_CHECK;
> > Â Â Â cl_err = gegl_cl_set_kernel_args (cl_data->kernel[0],
> > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â sizeof(cl_mem), &in_buf,
> > --
> > 2.5.5
> >
> > _______________________________________________
> > gegl-developer-list mailing list
> > List address:Â Â Â Â gegl-developer-list gnome org
> > List membership: https://mail.gnome.org/mailman/listinfo/gegl-devel
> > oper-list
-- 
Jan Vesely <jan vesely rutgers edu>

Attachment: diff.png
Description: PNG image

Attachment: signature.asc
Description: This is a digitally signed message part