From 35671680e303c54ac1d045e4f1554c69d7bec5dc Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Thu, 12 Sep 2013 12:32:15 +0200 Subject: KrancThorn.m: Accumulate calculation sources in sources variable --- Tools/CodeGen/KrancThorn.m | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m index 1188c3f..cdb2cf3 100644 --- a/Tools/CodeGen/KrancThorn.m +++ b/Tools/CodeGen/KrancThorn.m @@ -362,13 +362,16 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ InfoMessage[Terse, "Creating calculation source files"]; hostCalcs = Select[calcs, !CalculationOnDevice[#] &]; - deviceCalcs = Select[calcs, CalculationOnDevice]; - - calcSources = Join[Map[CreateSetterSource[{#}, False, {}, opts] &, hostCalcs], - Map[CaKernelCode[#,opts] &, deviceCalcs]]; + hostSources = Map[{Filename -> lookup[#, Name] <> ext, + Contents -> CreateSetterSource[{#}, False, {}, opts]} &, + hostCalcs]; + sources = Join[sources, hostSources]; - calcFilenames = Join[Map[lookup[#, Name] <> ext &, hostCalcs], - Map["CaKernel__"<>lookup[#, Name] <> ".code" &, deviceCalcs]]; + deviceCalcs = Select[calcs, CalculationOnDevice]; + deviceSources = Map[{Filename -> "CaKernel__"<>lookup[#, Name] <> ".code", + Contents -> CaKernelCode[#,opts]} &, + deviceCalcs]; + sources = Join[sources, deviceSources]; incFilenames = Map[lookup[#, Name] <> ext &, hostCalcs]; @@ -396,8 +399,6 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ CaKernel -> cakernel, Makefile -> make, Sources -> Join[sources, - MapThread[{Filename -> #1, Contents -> #2} &, - {calcFilenames, calcSources}], If[Length[OptionValue[ParameterConditions]] > 0, {{Filename -> "ParamCheck.cc", Contents -> ParameterCheckSource[thornName, OptionValue[ParameterConditions]]}}, -- cgit v1.2.3