From a2d0cc73b03af904ec37faab5a309892d1792a39 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Fri, 3 Sep 2021 12:28:41 +0200
Subject: [PATCH] Rename new kernel to CumulantK17CompChimStream
---
apps/gpu/LBM/MusselOyster/MusselOyster.cpp | 2 +-
.../CumulantK17CompChimStream.cu} | 18 +++++++++---------
.../CumulantK17CompChimStream.h} | 8 ++++----
.../CumulantK17CompChimStreamDevice.cu} | 2 +-
.../CumulantK17CompChimStream_Device.cuh} | 2 +-
.../KernelFactory/KernelFactoryImp.cpp | 6 +++---
6 files changed, 19 insertions(+), 19 deletions(-)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17chimSparse/CumulantK17CompChimSparse.cu => CumulantK17chimStream/CumulantK17CompChimStream.cu} (75%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17chimSparse/CumulantK17CompChimSparse.h => CumulantK17chimStream/CumulantK17CompChimStream.h} (61%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17chimSparse/CumulantK17CompChimSparse_Device.cu => CumulantK17chimStream/CumulantK17CompChimStreamDevice.cu} (99%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17chimSparse/CumulantK17CompChimSparse_Device.cuh => CumulantK17chimStream/CumulantK17CompChimStream_Device.cuh} (85%)
diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
index 038aa5925..bd5b7fce8 100644
--- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
+++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
@@ -148,7 +148,7 @@ void multipleLevel(const std::string& configPath)
//para->setMainKernel("CumulantK17CompChim");
if (useStreams)
para->setUseStreams();
- para->setMainKernel("CumulantK17CompChimSparse");
+ para->setMainKernel("CumulantK17CompChimStream");
*logging::out << logging::Logger::INFO_HIGH << "Kernel: " << para->getMainKernel() << "\n";
if (useMultiGPU) {
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.cu
similarity index 75%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse.cu
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.cu
index 76345fcd8..1f8538d5c 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.cu
@@ -1,24 +1,24 @@
-#include "CumulantK17CompChimSparse.h"
+#include "CumulantK17CompChimStream.h"
#include "Parameter/Parameter.h"
#include "Parameter/CudaStreamManager.h"
-#include "CumulantK17CompChimSparse_Device.cuh"
+#include "CumulantK17CompChimStream_Device.cuh"
#include <cuda.h>
-std::shared_ptr<CumulantK17CompChimSparse> CumulantK17CompChimSparse::getNewInstance(std::shared_ptr<Parameter> para,
+std::shared_ptr<CumulantK17CompChimStream> CumulantK17CompChimStream::getNewInstance(std::shared_ptr<Parameter> para,
int level)
{
- return std::shared_ptr<CumulantK17CompChimSparse>(new CumulantK17CompChimSparse(para, level));
+ return std::shared_ptr<CumulantK17CompChimStream>(new CumulantK17CompChimStream(para, level));
}
-void CumulantK17CompChimSparse::run()
+void CumulantK17CompChimStream::run()
{
dim3 grid, threads;
std::tie(grid, threads) =
*calcGridDimensions(para->getParD(level)->numberOfFluidNodes, para->getParD(level)->numberofthreads);
- LB_Kernel_CumulantK17CompChimSparse <<< grid, threads >>>(
+ LB_Kernel_CumulantK17CompChimStream <<< grid, threads >>>(
para->getParD(level)->omega,
para->getParD(level)->neighborX_SP,
para->getParD(level)->neighborY_SP,
@@ -34,7 +34,7 @@ void CumulantK17CompChimSparse::run()
getLastCudaError("LB_Kernel_CumulantK17CompChim execution failed");
}
-void CumulantK17CompChimSparse::runOnIndices(const unsigned int *indices, unsigned int size_indices, int streamIndex)
+void CumulantK17CompChimStream::runOnIndices(const unsigned int *indices, unsigned int size_indices, int streamIndex)
{
dim3 grid, threads;
std::tie(grid, threads) =
@@ -42,7 +42,7 @@ void CumulantK17CompChimSparse::runOnIndices(const unsigned int *indices, unsign
cudaStream_t stream = (streamIndex == -1) ? CU_STREAM_LEGACY : para->getStreamManager()->getStream(streamIndex);
- LB_Kernel_CumulantK17CompChimSparse<<<grid, threads, 0, stream>>>(
+ LB_Kernel_CumulantK17CompChimStream<<<grid, threads, 0, stream>>>(
para->getParD(level)->omega,
para->getParD(level)->neighborX_SP,
para->getParD(level)->neighborY_SP,
@@ -59,7 +59,7 @@ void CumulantK17CompChimSparse::runOnIndices(const unsigned int *indices, unsign
}
-CumulantK17CompChimSparse::CumulantK17CompChimSparse(std::shared_ptr<Parameter> para, int level)
+CumulantK17CompChimStream::CumulantK17CompChimStream(std::shared_ptr<Parameter> para, int level)
{
this->para = para;
this->level = level;
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse.h b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.h
similarity index 61%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse.h
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.h
index 8233e9b9b..325826e04 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse.h
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.h
@@ -3,16 +3,16 @@
#include "Kernel/KernelImp.h"
-class CumulantK17CompChimSparse : public KernelImp
+class CumulantK17CompChimStream : public KernelImp
{
public:
- static std::shared_ptr<CumulantK17CompChimSparse> getNewInstance(std::shared_ptr<Parameter> para, int level);
+ static std::shared_ptr<CumulantK17CompChimStream> getNewInstance(std::shared_ptr<Parameter> para, int level);
void run() override;
void runOnIndices(const unsigned int *indices, unsigned int size_indices, int stream = -1) override;
private:
- CumulantK17CompChimSparse();
- CumulantK17CompChimSparse(std::shared_ptr<Parameter> para, int level);
+ CumulantK17CompChimStream();
+ CumulantK17CompChimStream(std::shared_ptr<Parameter> para, int level);
};
#endif
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStreamDevice.cu
similarity index 99%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse_Device.cu
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStreamDevice.cu
index 684a89a16..6378b691d 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse_Device.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStreamDevice.cu
@@ -39,7 +39,7 @@ using namespace vf::lbm::constant;
#include "Kernel/ChimeraTransformation.h"
////////////////////////////////////////////////////////////////////////////////
-extern "C" __global__ void LB_Kernel_CumulantK17CompChimSparse(
+extern "C" __global__ void LB_Kernel_CumulantK17CompChimStream(
real omega,
uint* neighborX,
uint* neighborY,
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse_Device.cuh b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream_Device.cuh
similarity index 85%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse_Device.cuh
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream_Device.cuh
index 9ed1fa52b..2ac08edd2 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse_Device.cuh
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream_Device.cuh
@@ -4,7 +4,7 @@
#include <DataTypes.h>
#include <curand.h>
-extern "C" __global__ void LB_Kernel_CumulantK17CompChimSparse(
+extern "C" __global__ void LB_Kernel_CumulantK17CompChimStream(
real omega,
uint* neighborX,
uint* neighborY,
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
index b0eeebf73..a293e24f7 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
@@ -11,7 +11,7 @@
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/CumulantK17Comp.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/CumulantK17Unified.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/CumulantK17CompChim.h"
-#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimSparse/CumulantK17CompChimSparse.h"
+#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chimStream/CumulantK17CompChimStream.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/CumulantK17BulkComp.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantAll4/CumulantAll4CompSP27.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK18/CumulantK18Comp.h"
@@ -137,8 +137,8 @@ std::shared_ptr<Kernel> KernelFactoryImp::makeKernel(std::shared_ptr<Parameter>
} else if (kernel == "CumulantK17CompChim") {
newKernel = CumulantK17CompChim::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
- } else if (kernel == "CumulantK17CompChimSparse") {
- newKernel = CumulantK17CompChimSparse::getNewInstance(para, level);
+ } else if (kernel == "CumulantK17CompChimStream") {
+ newKernel = CumulantK17CompChimStream::getNewInstance(para, level);
checkStrategy = FluidFlowCompStrategy::getInstance();
} else if (kernel == "CumulantAll4CompSP27") {
newKernel = CumulantAll4CompSP27::getNewInstance(para, level);
--
GitLab