summaryrefslogtreecommitdiffstats
path: root/cuda
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-22 14:03:43 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-12-22 14:03:43 +0100
commit61c73bb7a71dd9a8b5126879662b21a748224bbf (patch)
tree205133660d0cf6a9e4eb0ff509db176a44eaec2d /cuda
parent27bb093fb52ee768b00f52cf12075e8488e63452 (diff)
parentc66e4b030467ddadac71e5bd4803737cf94c0a07 (diff)
downloadastra-61c73bb7a71dd9a8b5126879662b21a748224bbf.tar.gz
astra-61c73bb7a71dd9a8b5126879662b21a748224bbf.tar.bz2
astra-61c73bb7a71dd9a8b5126879662b21a748224bbf.tar.xz
astra-61c73bb7a71dd9a8b5126879662b21a748224bbf.zip
Merge branch 'master'
Diffstat (limited to 'cuda')
-rw-r--r--cuda/3d/cone_fp.cu2
-rw-r--r--cuda/3d/par3d_fp.cu2
2 files changed, 2 insertions, 2 deletions
diff --git a/cuda/3d/cone_fp.cu b/cuda/3d/cone_fp.cu
index b36d2bc..13b184f 100644
--- a/cuda/3d/cone_fp.cu
+++ b/cuda/3d/cone_fp.cu
@@ -49,7 +49,7 @@ namespace astraCUDA3d {
static const unsigned int g_anglesPerBlock = 4;
// thickness of the slices we're splitting the volume up into
-static const unsigned int g_blockSlices = 64;
+static const unsigned int g_blockSlices = 32;
static const unsigned int g_detBlockU = 32;
static const unsigned int g_detBlockV = 32;
diff --git a/cuda/3d/par3d_fp.cu b/cuda/3d/par3d_fp.cu
index b14c494..3ce3d42 100644
--- a/cuda/3d/par3d_fp.cu
+++ b/cuda/3d/par3d_fp.cu
@@ -49,7 +49,7 @@ namespace astraCUDA3d {
static const unsigned int g_anglesPerBlock = 4;
// thickness of the slices we're splitting the volume up into
-static const unsigned int g_blockSlices = 64;
+static const unsigned int g_blockSlices = 32;
static const unsigned int g_detBlockU = 32;
static const unsigned int g_detBlockV = 32;