aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Hinder <ian.hinder@aei.mpg.de>2012-04-11 17:49:43 +0200
committerIan Hinder <ian.hinder@aei.mpg.de>2012-04-11 17:49:43 +0200
commitcfd1c99bc3ac84e52e980c0af91b9d9248143a9a (patch)
tree11ccd2362d955f42e34633a0e113cbed8700e7d8
parent413a73837ec035b69904e5a4b78a35c9f5a0b2d8 (diff)
Switch to new dynamically compiled CaKernel template
-rw-r--r--Tools/CodeGen/CaKernel.m2
-rw-r--r--Tools/CodeGen/KrancThorn.m3
2 files changed, 4 insertions, 1 deletions
diff --git a/Tools/CodeGen/CaKernel.m b/Tools/CodeGen/CaKernel.m
index 08494e8..f611273 100644
--- a/Tools/CodeGen/CaKernel.m
+++ b/Tools/CodeGen/CaKernel.m
@@ -70,7 +70,7 @@ DefFn[
int, attrs},
int = !bnd;
- attrs = {"TYPE" -> If[int, "gpu_cuda/3dblock", "gpu_cuda/boundary_s"],
+ attrs = {"TYPE" -> If[int, "gpu_cuda_dc/3dblock2", "gpu_cuda_dc/boundary_s"],
"TILE" -> Quote[StringJoin[Riffle[ToString/@tileSize,","]]],
"SHARECODE" -> "yes"};
diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m
index c45a0f0..0fa9d0f 100644
--- a/Tools/CodeGen/KrancThorn.m
+++ b/Tools/CodeGen/KrancThorn.m
@@ -151,6 +151,9 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[
groups = DeleteDuplicates[Join[groups, Flatten[Map[lookup[#,LocalGroups,{}] &, calcs],1]]];
includeFiles = Join[includeFiles, {"GenericFD.h", "Symmetry.h", "sbp_calc_coeffs.h"}];
+ If[OptionValue[UseCaKernel],
+ includeFiles = Append[includeFiles, "CaCUDALib_driver_support.h"]];
+
inheritedImplementations = Join[inheritedImplementations, {"Grid",
"GenericFD"}, CactusBoundary`GetInheritedImplementations[]];