Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VirtualFluids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iRMB
VirtualFluids
Commits
e003152e
Commit
e003152e
authored
3 years ago
by
TESLA03\Master
Browse files
Options
Downloads
Patches
Plain Diff
remove kernel mapper from app gridGeneratorTest
parent
cf4f3dc0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!104
Add Communication Hiding to GPU version
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt
+3
-5
3 additions, 5 deletions
apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt
apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
+8
-11
8 additions, 11 deletions
apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
with
11 additions
and
16 deletions
apps/gpu/LBM/gridGeneratorTest/CMakeLists.txt
+
3
−
5
View file @
e003152e
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
)
linkCUDA
()
set_source_files_properties
(
DrivenCavity.cpp PROPERTIES LANGUAGE CUDA
)
This diff is collapsed.
Click to expand it.
apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
+
8
−
11
View file @
e003152e
...
...
@@ -31,7 +31,6 @@
#include
"VirtualFluids_GPU/PreProcessor/PreProcessorFactory/PreProcessorFactoryImp.h"
#include
"VirtualFluids_GPU/GPU/CudaMemoryManager.h"
#include
"VirtualFluids_GPU/Kernel/Utilities/Mapper/KernelMapper/KernelMapper.h"
#include
"global.h"
...
...
@@ -79,11 +78,9 @@ void multipleLevel(const std::string& configPath)
auto
gridBuilder
=
MultipleGridBuilder
::
makeShared
(
gridFactory
);
Communicator
*
comm
=
Communicator
::
getInstanz
();
vf
::
gpu
::
Communicator
*
comm
=
vf
::
gpu
::
Communicator
::
getInstanz
();
SPtr
<
ConfigFileReader
>
configReader
=
ConfigFileReader
::
getNewInstance
();
SPtr
<
ConfigData
>
configData
=
configReader
->
readConfigFile
(
configPath
);
std
::
shared_ptr
<
KernelMapper
>
kernelMapper
=
KernelMapper
::
getInstance
();
SPtr
<
ConfigData
>
configData
=
configReader
->
readConfigFile
(
configPath
.
c_str
());
SPtr
<
Parameter
>
para
=
Parameter
::
make
(
configData
,
comm
);
...
...
@@ -208,7 +205,7 @@ void multipleLevel(const std::string& configPath)
para
->
setUseWale
(
false
);
para
->
setMainKernel
(
kernelMapper
->
getEnum
(
"CumulantK15Comp"
)
)
;
para
->
setMainKernel
(
"CumulantK15Comp"
);
//////////////////////////////////////////////////////////////////////////
...
...
@@ -291,7 +288,7 @@ void multipleLevel(const std::string& configPath)
para
->
setUseWale
(
false
);
para
->
setMainKernel
(
kernelMapper
->
getEnum
(
"CumulantK20Comp"
)
)
;
para
->
setMainKernel
(
"CumulantK20Comp"
);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
@@ -392,7 +389,7 @@ void multipleLevel(const std::string& configPath)
para
->
setUseWale
(
false
);
para
->
setMainKernel
(
kernelMapper
->
getEnum
(
"CumulantAA2016CompSP27"
)
)
;
para
->
setMainKernel
(
"CumulantAA2016CompSP27"
);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
@@ -468,7 +465,7 @@ void multipleLevel(const std::string& configPath)
para
->
setUseWale
(
false
);
para
->
setMainKernel
(
kernelMapper
->
getEnum
(
"CumulantAA2016CompSP27"
)
)
;
para
->
setMainKernel
(
"CumulantAA2016CompSP27"
);
//para->setMainKernel(kernelMapper->getEnum("CumulantOneCompSP27"));
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
@@ -659,13 +656,13 @@ void multipleLevel(const std::string& configPath)
para
->
setUseWale
(
false
);
para
->
setMainKernel
(
kernelMapper
->
getEnum
(
"CumulantK15Comp"
)
)
;
para
->
setMainKernel
(
"CumulantK15Comp"
);
para
->
setDevices
(
{
0
,
1
}
);
para
->
setMaxDev
(
2
);
//const uint generatePart = 1;
const
uint
generatePart
=
Communicator
::
getInstanz
()
->
getPID
();
const
uint
generatePart
=
vf
::
gpu
::
Communicator
::
getInstanz
()
->
getPID
();
std
::
ofstream
logFile2
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment