aboutsummaryrefslogtreecommitdiff
path: root/aberth
diff options
context:
space:
mode:
authortomsmeding <tom.smeding@gmail.com>2019-04-20 10:34:37 +0200
committertomsmeding <tom.smeding@gmail.com>2019-04-20 10:34:37 +0200
commitde5ddea92334ed0d5ff4a70bd6393d7fea7bbd07 (patch)
tree220fc9aa848ce0992e3a9c544f79af08446925b2 /aberth
parentd705388634c4df25f800e7cf05e88609bfbc2068 (diff)
Now it actually works on iris!
Diffstat (limited to 'aberth')
-rw-r--r--aberth/Makefile2
-rw-r--r--aberth/aberth.cpp2
-rw-r--r--aberth/aberth_kernel.fut2
3 files changed, 3 insertions, 3 deletions
diff --git a/aberth/Makefile b/aberth/Makefile
index f610c01..10f36b8 100644
--- a/aberth/Makefile
+++ b/aberth/Makefile
@@ -22,7 +22,7 @@ aberth: $(OBJECTS) aberth_kernel.o ../lodepng.o
$(CXX) -o $@ $^ $(LDFLAGS)
aberth_kernel.h: aberth_kernel.fut
- futhark c --library $^
+ futhark opencl --library $^
aberth_kernel.o: aberth_kernel.h
gcc -c $(OPTFLAGS) -o $@ aberth_kernel.c
diff --git a/aberth/aberth.cpp b/aberth/aberth.cpp
index 550760d..8f65ef1 100644
--- a/aberth/aberth.cpp
+++ b/aberth/aberth.cpp
@@ -347,7 +347,7 @@ static vector<int32_t> invoke_kernel(
futhark_context_config *config = futhark_context_config_new();
// futhark_context_config_select_device_interactively(config);
- futhark_context_config_set_debugging(config, 1);
+ // futhark_context_config_set_debugging(config, 1);
futhark_context *ctx = futhark_context_new(config);
diff --git a/aberth/aberth_kernel.fut b/aberth/aberth_kernel.fut
index f09db56..be1fed0 100644
--- a/aberth/aberth_kernel.fut
+++ b/aberth/aberth_kernel.fut
@@ -82,7 +82,7 @@ module aberth = {
quos sums
let approx = map2 (cplx.-) approx offsets
let svals = map (eval_d ctx.bound <-< cplx.mag) approx
- let conditions = map2 (\p s -> cplx.mag p <= 1e-9 * s) pvals svals
+ let conditions = map2 (\p s -> cplx.mag p <= 1e-5 * s) pvals svals
let all_converged = all id conditions
in (all_converged, approx)