From 1bf577b1c5e606ac2c0553857297ce8c0c04ccb7 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Sat, 26 Oct 2019 15:01:39 +0200 Subject: Support passing additional string arguments to the generator --- boltzgen.py | 3 ++- boltzgen/kernel/generator.py | 6 +++--- boltzgen/kernel/template/basic.cpp.mako | 36 ++++++++++++++------------------- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/boltzgen.py b/boltzgen.py index 17509e7..2b32661 100755 --- a/boltzgen.py +++ b/boltzgen.py @@ -15,6 +15,7 @@ argparser.add_argument('--geometry', required = True, help = 'Size of the block argparser.add_argument('--tau', required = True, help = 'BGK relaxation time') argparser.add_argument('--disable-cse', action = 'store_const', const = True, help = 'Disable common subexpression elimination') +argparser.add_argument('--extra', action = 'append', nargs = '+', default = [], help = 'Additional generator parameters') args = argparser.parse_args() @@ -28,5 +29,5 @@ generator = Generator( geometry = Geometry.parse(args.geometry) -src = generator.kernel(args.language, args.precision, args.layout, geometry) +src = generator.kernel(args.language, args.precision, args.layout, geometry, sum(args.extra, [])) print(src) diff --git a/boltzgen/kernel/generator.py b/boltzgen/kernel/generator.py index 434d163..8d0de37 100644 --- a/boltzgen/kernel/generator.py +++ b/boltzgen/kernel/generator.py @@ -13,7 +13,7 @@ class Generator: self.collision = collision self.boundary = boundary - def kernel(self, target, precision, layout, geometry): + def kernel(self, target, precision, layout, geometry, extras = []): template_path = Path(__file__).parent/('template/basic.' + target + '.mako') if not template_path.exists(): raise Exception("Target '%s' not supported" % target) @@ -34,9 +34,9 @@ class Generator: moments_subexpr = self.moments[0], moments_assignment = self.moments[1], - collision_subexpr = self.collision[0], collision_assignment = self.collision[1], + ccode = sympy.ccode, float_type = { 'single': 'float', @@ -49,5 +49,5 @@ class Generator: float_type = precision ), - ccode = sympy.ccode + extras = extras ) diff --git a/boltzgen/kernel/template/basic.cpp.mako b/boltzgen/kernel/template/basic.cpp.mako index bee25a7..3e16d2e 100644 --- a/boltzgen/kernel/template/basic.cpp.mako +++ b/boltzgen/kernel/template/basic.cpp.mako @@ -67,49 +67,40 @@ void collect_moments(const ${float_type}* f, % endfor } +% if 'test_example' in extras: void test(std::size_t nStep) { auto f_a = std::make_unique<${float_type}[]>(${geometry.volume*descriptor.q + 2*layout.padding()}); auto f_b = std::make_unique<${float_type}[]>(${geometry.volume*descriptor.q + 2*layout.padding()}); - auto material = std::make_unique(${geometry.volume}); // buffers are padded by maximum neighbor overreach to prevent invalid memory access ${float_type}* f_prev = f_a.get() + ${layout.padding()}; ${float_type}* f_next = f_b.get() + ${layout.padding()}; + std::vector bulk; + std::vector bc; + for (int iX = 0; iX < ${geometry.size_x}; ++iX) { for (int iY = 0; iY < ${geometry.size_y}; ++iY) { % if descriptor.d == 2: if (iX == 0 || iY == 0 || iX == ${geometry.size_x-1} || iY == ${geometry.size_y-1}) { - material[iX*${geometry.size_y} + iY] = 0; + bc.emplace_back(iX*${geometry.size_y} + iY); } else { - material[iX*${geometry.size_y} + iY] = 1; + bulk.emplace_back(iX*${geometry.size_y} + iY); } % elif descriptor.d == 3: for (int iZ = 0; iZ < ${geometry.size_z}; ++iZ) { if (iX == 0 || iY == 0 || iZ == 0 || iX == ${geometry.size_x-1} || iY == ${geometry.size_y-1} || iZ == ${geometry.size_z-1}) { - material[iX*${geometry.size_y*geometry.size_z} + iY*${geometry.size_z} + iZ] = 0; + bc.emplace_back(iX*${geometry.size_y*geometry.size_z} + iY*${geometry.size_z} + iZ); } else { - material[iX*${geometry.size_y*geometry.size_z} + iY*${geometry.size_z} + iZ] = 1; + bulk.emplace_back(iX*${geometry.size_y*geometry.size_z} + iY*${geometry.size_z} + iZ); } } % endif } } - std::vector bulk; - std::vector bc; - - for (std::size_t iCell = 0; iCell < ${geometry.volume}; ++iCell) { - if (material[iCell] == 0) { - bc.emplace_back(iCell); - } - if (material[iCell] == 1) { - bulk.emplace_back(iCell); - } - } - for (std::size_t iCell = 0; iCell < ${geometry.volume}; ++iCell) { equilibrilize(f_prev, f_next, iCell); } @@ -136,14 +127,17 @@ void test(std::size_t nStep) auto duration = std::chrono::duration_cast>( std::chrono::high_resolution_clock::now() - start); - std::cout << "MLUPS: " << nStep*${geometry.volume}/(1e6*duration.count()) << std::endl; - // calculate average rho as a basic quality check ${float_type} rho_sum = 0.0; - for (std::size_t i = 0; i < ${geometry.volume*descriptor.q}; ++i) { rho_sum += f_next[i]; } - std::cout << "avg rho: " << rho_sum/${geometry.volume} << std::endl; + std::cout << "#bulk : " << bulk.size() << std::endl; + std::cout << "#bc : " << bc.size() << std::endl; + std::cout << "#steps : " << nStep << std::endl; + std::cout << std::endl; + std::cout << "MLUPS : " << nStep*${geometry.volume}/(1e6*duration.count()) << std::endl; + std::cout << "avg rho : " << rho_sum/${geometry.volume} << std::endl; } +% endif -- cgit v1.2.3