Skip to content
Snippets Groups Projects
Commit e003152e authored by TESLA03\Master's avatar TESLA03\Master
Browse files

remove kernel mapper from app gridGeneratorTest

parent cf4f3dc0
No related branches found
No related tags found
1 merge request!104Add Communication Hiding to GPU version
PROJECT(GridGeneratorTest) PROJECT(GridGeneratorTest LANGUAGES CUDA CXX)
vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator FILES gridGenerator.cpp) vf_add_library(BUILDTYPE binary PRIVATE_LINK basics VirtualFluids_GPU GridGenerator MPI::MPI_CXX FILES gridGenerator.cpp)
set_source_files_properties(gridGenerator.cpp PROPERTIES LANGUAGE CUDA) set_source_files_properties(DrivenCavity.cpp PROPERTIES LANGUAGE CUDA)
linkCUDA()
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.h" #include "VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.h"
#include "VirtualFluids_GPU/GPU/CudaMemoryManager.h" #include "VirtualFluids_GPU/GPU/CudaMemoryManager.h"
#include "VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h"
#include "global.h" #include "global.h"
...@@ -79,11 +78,9 @@ void multipleLevel(const std::string& configPath) ...@@ -79,11 +78,9 @@ void multipleLevel(const std::string& configPath)
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory); auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
Communicator* comm = Communicator::getInstanz(); vf::gpu::Communicator *comm = vf::gpu::Communicator::getInstanz();
SPtr<ConfigFileReader> configReader = ConfigFileReader::getNewInstance(); SPtr<ConfigFileReader> configReader = ConfigFileReader::getNewInstance();
SPtr<ConfigData> configData = configReader->readConfigFile(configPath); SPtr<ConfigData> configData = configReader->readConfigFile(configPath.c_str());
std::shared_ptr<KernelMapper> kernelMapper = KernelMapper::getInstance();
SPtr<Parameter> para = Parameter::make(configData, comm); SPtr<Parameter> para = Parameter::make(configData, comm);
...@@ -208,7 +205,7 @@ void multipleLevel(const std::string& configPath) ...@@ -208,7 +205,7 @@ void multipleLevel(const std::string& configPath)
para->setUseWale(false); para->setUseWale(false);
para->setMainKernel(kernelMapper->getEnum("CumulantK15Comp")); para->setMainKernel("CumulantK15Comp");
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
...@@ -291,7 +288,7 @@ void multipleLevel(const std::string& configPath) ...@@ -291,7 +288,7 @@ void multipleLevel(const std::string& configPath)
para->setUseWale(false); para->setUseWale(false);
para->setMainKernel(kernelMapper->getEnum("CumulantK20Comp")); para->setMainKernel("CumulantK20Comp");
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...@@ -392,7 +389,7 @@ void multipleLevel(const std::string& configPath) ...@@ -392,7 +389,7 @@ void multipleLevel(const std::string& configPath)
para->setUseWale(false); para->setUseWale(false);
para->setMainKernel(kernelMapper->getEnum("CumulantAA2016CompSP27")); para->setMainKernel("CumulantAA2016CompSP27");
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...@@ -468,7 +465,7 @@ void multipleLevel(const std::string& configPath) ...@@ -468,7 +465,7 @@ void multipleLevel(const std::string& configPath)
para->setUseWale(false); para->setUseWale(false);
para->setMainKernel(kernelMapper->getEnum("CumulantAA2016CompSP27")); para->setMainKernel("CumulantAA2016CompSP27");
//para->setMainKernel(kernelMapper->getEnum("CumulantOneCompSP27")); //para->setMainKernel(kernelMapper->getEnum("CumulantOneCompSP27"));
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...@@ -659,13 +656,13 @@ void multipleLevel(const std::string& configPath) ...@@ -659,13 +656,13 @@ void multipleLevel(const std::string& configPath)
para->setUseWale(false); para->setUseWale(false);
para->setMainKernel(kernelMapper->getEnum("CumulantK15Comp")); para->setMainKernel("CumulantK15Comp");
para->setDevices( { 0, 1 } ); para->setDevices( { 0, 1 } );
para->setMaxDev(2); para->setMaxDev(2);
//const uint generatePart = 1; //const uint generatePart = 1;
const uint generatePart = Communicator::getInstanz()->getPID(); const uint generatePart = vf::gpu::Communicator::getInstanz()->getPID();
std::ofstream logFile2; std::ofstream logFile2;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment