diff options
| author | Thomas White <taw@physics.org> | 2014-07-25 18:06:45 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2014-08-04 14:23:57 +0200 |
| commit | 18d00d8f6f82faf17067425b0f6ca6e271f18c7c (patch) | |
| tree | 24df1f1ba15d00846ce48e2f9258a4d020189625 /src/cl-utils.c | |
| parent | bd760024d5dfb16d8beaac01ca4dec9102d236f1 (diff) | |
A better way of doing GPU symmetry
Diffstat (limited to 'src/cl-utils.c')
| -rw-r--r-- | src/cl-utils.c | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/src/cl-utils.c b/src/cl-utils.c index 97efe2f8..9f984169 100644 --- a/src/cl-utils.c +++ b/src/cl-utils.c @@ -3,11 +3,11 @@ * * OpenCL utility functions * - * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY, - * a research centre of the Helmholtz Association. + * Copyright © 2012-2014 Deutsches Elektronen-Synchrotron DESY, + * a research centre of the Helmholtz Association. * * Authors: - * 2010-2012 Thomas White <taw@physics.org> + * 2010-2014 Thomas White <taw@physics.org> * * This file is part of CrystFEL. * @@ -215,7 +215,8 @@ static void show_build_log(cl_program prog, cl_device_id dev) cl_program load_program(const char *filename, cl_context ctx, - cl_device_id dev, cl_int *err, const char *extra_cflags) + cl_device_id dev, cl_int *err, const char *extra_cflags, + const char *insert_stuff) { FILE *fh; cl_program prog; @@ -223,6 +224,8 @@ cl_program load_program(const char *filename, cl_context ctx, size_t len; cl_int r; char cflags[1024] = ""; + char *insert_pos; + size_t il; fh = fopen(filename, "r"); if ( fh == NULL ) { @@ -231,10 +234,31 @@ cl_program load_program(const char *filename, cl_context ctx, return 0; } source = malloc(16384); + if ( source == NULL ) return 0; len = fread(source, 1, 16383, fh); fclose(fh); source[len] = '\0'; + if ( insert_stuff != NULL ) { + insert_pos = strstr(source, "INSERT_HERE"); + + if ( insert_pos != NULL ) { + + char *source2; + source2 = malloc(strlen(source)+strlen(insert_stuff)+1); + if ( source2 == NULL ) return 0; + + il = insert_pos - source; + memcpy(source2, source, il); + memcpy(source2+il, insert_stuff, strlen(insert_stuff)+1); + memcpy(source2+il+strlen(insert_stuff), + source+il+11, strlen(source+il+11)+1); + source = source2; + free(source); + + } + } + prog = clCreateProgramWithSource(ctx, 1, (const char **)&source, NULL, err); if ( *err != CL_SUCCESS ) { |