aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2010-02-19 22:43:11 +0100
committerThomas White <taw@bitwiz.org.uk>2010-02-19 22:43:38 +0100
commitdca8cc2962e2768a7cb69b5d9717b6e5c78be288 (patch)
treed89d9bf32b37a3d9c781321bcc4f523f7586b48c /src
parentc7e0450702ab668cdcda34541e6bf815d50be8a8 (diff)
Move critical array size definitions to share between CPU and GPU versions
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/diffraction-gpu.c3
-rw-r--r--src/diffraction-gpu.h21
-rw-r--r--src/utils.h6
4 files changed, 22 insertions, 10 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 19e8ca41..887271ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,3 +36,5 @@ get_hkl_LDADD = @LIBS@
compare_hkl_SOURCES = compare_hkl.c sfac.c cell.c utils.c reflections.c
compare_hkl_LDADD = @LIBS@
+
+INCLUDES = "-I$(top_srcdir)/data"
diff --git a/src/diffraction-gpu.c b/src/diffraction-gpu.c
index 133c0bc1..1d0cb4dd 100644
--- a/src/diffraction-gpu.c
+++ b/src/diffraction-gpu.c
@@ -129,7 +129,8 @@ static cl_program load_program(const char *filename, cl_context ctx,
return 0;
}
- r = clBuildProgram(prog, 0, NULL, "-Werror", NULL, NULL);
+ r = clBuildProgram(prog, 0, NULL, "-Werror -I"DATADIR"/crystfel/",
+ NULL, NULL);
if ( r != CL_SUCCESS ) {
ERROR("Couldn't build program '%s'\n", filename);
show_build_log(prog, dev);
diff --git a/src/diffraction-gpu.h b/src/diffraction-gpu.h
index a7446a98..f3bed8bf 100644
--- a/src/diffraction-gpu.h
+++ b/src/diffraction-gpu.h
@@ -22,19 +22,32 @@
struct gpu_context;
#if HAVE_OPENCL
+
extern void get_diffraction_gpu(struct gpu_context *gctx, struct image *image,
int na, int nb, int nc);
+extern struct gpu_context *setup_gpu(int no_sfac, struct image *image,
+ struct molecule *molecule);
+extern void cleanup_gpu(struct gpu_context *gctx);
+
#else
+
static void get_diffraction_gpu(struct gpu_context *gctx, struct image *image,
int na, int nb, int nc)
{
/* Do nothing */
ERROR("This copy of CrystFEL was not compiled with OpenCL support.\n");
}
-#endif
-extern struct gpu_context *setup_gpu(int no_sfac, struct image *image,
- struct molecule *molecule);
-extern void cleanup_gpu(struct gpu_context *gctx);
+static struct gpu_context *setup_gpu(int no_sfac, struct image *image,
+ struct molecule *molecule)
+{
+ return NULL;
+}
+
+static void cleanup_gpu(struct gpu_context *gctx)
+{
+}
+
+#endif
#endif /* DIFFRACTION_GPU_H */
diff --git a/src/utils.h b/src/utils.h
index d9d0a0af..d9025fa0 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -137,11 +137,7 @@ static inline double angle_between(double x1, double y1, double z1,
/* -------------------- Indexed lists for specified types ------------------- */
-/* Maxmimum index to hold values up to (can be increased if necessary) */
-#define INDMAX 70
-
-/* Array size */
-#define IDIM (INDMAX*2 +1)
+#include "defs.h"
#define LIST_SIZE (IDIM*IDIM*IDIM)