From fb3c7dd4f078b2ba7e9fafece50f619ea8de9308 Mon Sep 17 00:00:00 2001 From: Soeren Peters <peters@irmb.tu-bs.de> Date: Thu, 25 Feb 2021 12:40:42 +0100 Subject: [PATCH] Test cuda standard 11. --- CMakeLists.txt | 2 +- .../GridGenerator/grid/kernel/runGridKernelGPU.cu | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9027ff5c0..2ffbb4b4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ if(BUILD_VF_GPU) message(FATAL_ERROR "CUDA Compiler was requested but is not found on the system.") endif() - set(CMAKE_CUDA_STANDARD 14) + set(CMAKE_CUDA_STANDARD 11) set(CMAKE_CUDA_STANDARD_REQUIRED TRUE) set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcudafe --display_error_number") diff --git a/src/gpu/GridGenerator/grid/kernel/runGridKernelGPU.cu b/src/gpu/GridGenerator/grid/kernel/runGridKernelGPU.cu index 7aa6d4ebb..ff137357b 100644 --- a/src/gpu/GridGenerator/grid/kernel/runGridKernelGPU.cu +++ b/src/gpu/GridGenerator/grid/kernel/runGridKernelGPU.cu @@ -24,9 +24,10 @@ float runKernelInitalUniformGrid3d(const LaunchParameter& para, GridImp &grid) GLOBAL void initalField(GridImp grid) { - uint index = LaunchParameter::getGlobalIdx_2D_1D(); - if (index < grid.getSize()) - grid.findInnerNode(index); + //TODO: outcomment because of nvlink warning caused by the new allocation in Cell(). + //uint index = LaunchParameter::getGlobalIdx_2D_1D(); + //if (index < grid.getSize()) + // grid.findInnerNode(index); } ////////////////////////////////////////////////////////////////////////// @@ -38,9 +39,10 @@ float runKernelToMesh(const LaunchParameter& para, GridImp &grid, const Triangul GLOBAL void runMeshing(GridImp grid, const TriangularMesh geom) { - unsigned int i = LaunchParameter::getGlobalIdx_1D_1D(); - if (i < geom.size) - grid.mesh(geom.triangles[i]); + // TODO: outcomment because of nvlink warning caused by the new allocation in Cell(). + //unsigned int i = LaunchParameter::getGlobalIdx_1D_1D(); + //if (i < geom.size) + // grid.mesh(geom.triangles[i]); } ////////////////////////////////////////////////////////////////////////// -- GitLab