From 3f28bfd1ad013ce861574a632c2b529f76392206 Mon Sep 17 00:00:00 2001 From: Massimiliano Meneghin Date: Sun, 10 Sep 2023 19:38:57 +0200 Subject: [PATCH] Updating script. --- benchmarks/lbm/src/RunCavityTwoPop.cu | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/benchmarks/lbm/src/RunCavityTwoPop.cu b/benchmarks/lbm/src/RunCavityTwoPop.cu index b3014461..3503e8ef 100644 --- a/benchmarks/lbm/src/RunCavityTwoPop.cu +++ b/benchmarks/lbm/src/RunCavityTwoPop.cu @@ -37,7 +37,7 @@ auto run(Config& config, for (auto const& id : config.devices) { code << id; } - code << "_SS" << config.stencilSemanticCli.getStringOption()<< "_"; + code << "_SS" << config.stencilSemanticCli.getStringOption() << "_"; code << "_SF" << config.spaceCurveCli.getStringOption() << "_"; code << "_TM" << config.transferModeCli.getStringOption() << "_"; code << "__"; @@ -156,11 +156,11 @@ auto runFilterLattice(Config& config, using Lattice = D3Q19; return runFilterCollision(config, report, testCode); } -// if (config.lattice == "d3q27" || config.lattice == "D3Q27") { -// testCode << "_D3Q27"; -// using Lattice = D3Q27; -// return runFilterCollision(config, report, testCode); -// } + // if (config.lattice == "d3q27" || config.lattice == "D3Q27") { + // testCode << "_D3Q27"; + // using Lattice = D3Q27; + // return runFilterCollision(config, report, testCode); + // } NEON_DEV_UNDER_CONSTRUCTION("Lattice type not supported. Available options: D3Q19 and D3Q27"); } @@ -175,7 +175,8 @@ auto runFilterComputeType(Config& config, return runFilterLattice(config, report, testCode); } if (config.computeTypeStr == "float") { - return run(config, report); + testCode << "_SF"; + return runFilterLattice(config, report, testCode); } NEON_DEV_UNDER_CONSTRUCTION(""); } @@ -190,10 +191,10 @@ auto runFilterStoreType(Config& config, testCode << "_CD"; return runFilterComputeType(config, report, testCode); } - // if (config.storeTypeStr == "float") { - // testCode << "_CS_"; - // return runFilterComputeType(config, report,testCode); - // } + if (config.storeTypeStr == "float") { + testCode << "_CF"; + return runFilterComputeType(config, report, testCode); + } NEON_DEV_UNDER_CONSTRUCTION(""); } } // namespace details