Update to repa3 (Ben Lippmeier).

[spline3.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index 80f5e97fb874809fb4634c904fba98133ad0211d..cfd17247b27de3c146096fd04acf503d1fecb329 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -32,11 +32,11 @@ main3d = do
   let zoom_factor = (scale, scale, scale)
   let out_file = "output.bin"
   arr <- read_word16s in_file
-  let arr' = swap_bytes arr
-  let arrMRI = R.reshape mri_shape arr'
-  let dbl_data = R.force $ R.map fromIntegral arrMRI
-  let output = zoom dbl_data zoom_factor
-  let word16_output = round_array output
+  let arr'          = swap_bytes arr
+  let arrMRI        = R.reshape mri_shape arr'
+  let dbl_data      = R.compute $ R.map fromIntegral arrMRI
+  let output        = zoom dbl_data zoom_factor
+  let word16_output = R.compute $ round_array output
   write_word16s out_file word16_output
 
 
@@ -46,11 +46,14 @@ main2d = do
   let scale = read s :: Int
   let zoom_factor = (1, scale, scale)
   let out_file = "output.bmp"
-  arr <- read_word16s in_file
-  let arr' = swap_bytes arr
-  let arrInv   = flip_x $ flip_y arr'
-  let arrSlice = z_slice 50 arrInv
+  arr           <- read_word16s in_file
+  let arrSlice  = R.computeUnboxed $ z_slice 50 $ flip_x $ flip_y $ swap_bytes arr
   let arrSlice' = R.reshape mri_slice3d arrSlice
-  let dbl_data = R.map fromIntegral arrSlice'
-  let output = zoom dbl_data zoom_factor
-  write_values_slice_to_bitmap (z_slice 0 output) out_file
+
+  -- If zoom isn't being inlined we need to extract the slice before hand,
+  -- and convert it to the require formed.
+  let dbl_data  = R.compute $ R.map fromIntegral arrSlice'
+  let output    = zoom dbl_data zoom_factor
+  let arrSlice0 = R.computeUnboxed $ z_slice 0 output
+  
+  write_values_slice_to_bitmap arrSlice0 out_file