From f993fe936138c58f73853a81e50e79c682334f7e Mon Sep 17 00:00:00 2001 From: Tobias Meyer Andersen Date: Tue, 4 Feb 2025 16:03:05 +0100 Subject: [PATCH] fix include error, rename test_smart_pointers.cu This pr fixes an include error caused by a bad rebase. I also change the name of the test for gpu smart pointers to start with "gpu" to make it easier to run all gpu tests at once --- CMakeLists.txt | 2 +- CMakeLists_files.cmake | 6 +++++- .../{test_smart_pointers.cu => test_gpu_smart_pointers.cu} | 0 3 files changed, 6 insertions(+), 2 deletions(-) rename tests/gpuistl/{test_smart_pointers.cu => test_gpu_smart_pointers.cu} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 074a062e3..2d0ffa034 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -729,7 +729,7 @@ if(CUDA_FOUND) gpu_linear_two_phase_material gpuPvt gpu_resources - smart_pointers + gpu_smart_pointers PROPERTIES LABELS ${gpu_label}) endif() diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index e24bf8f8e..7a88f26cf 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -313,6 +313,8 @@ if (HAVE_CUDA) ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg GpuBlockPreconditioner.hpp) ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg PreconditionerHolder.hpp) ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg set_device.hpp) + ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg gpu_smart_pointer.hpp) + ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg gpu_resources.hpp) endif() if(USE_GPU_BRIDGE) @@ -468,7 +470,7 @@ if (HAVE_CUDA) ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_gpu_ad.cu) ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_gpu_linear_two_phase_material.cu) ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_gpuPvt.cu) - ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_smart_pointers.cu) + ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_gpu_smart_pointers.cu) ADD_CUDA_OR_HIP_FILE(TEST_SOURCE_FILES tests test_gpu_resources.cu) # for loop providing the flag --expt-relaxed-constexpr to fix some cuda issues with constexpr @@ -987,6 +989,8 @@ list (APPEND PUBLIC_HEADER_FILES opm/simulators/wells/BlackoilWellModelGasLift_impl.hpp opm/simulators/wells/BlackoilWellModelGeneric.hpp opm/simulators/wells/BlackoilWellModelGuideRates.hpp + opm/simulators/wells/BlackoilWellModelNldd.hpp + opm/simulators/wells/BlackoilWellModelNldd_impl.hpp opm/simulators/wells/BlackoilWellModelRestart.hpp opm/simulators/wells/BlackoilWellModelWBP.hpp opm/simulators/wells/ConnectionIndexMap.hpp diff --git a/tests/gpuistl/test_smart_pointers.cu b/tests/gpuistl/test_gpu_smart_pointers.cu similarity index 100% rename from tests/gpuistl/test_smart_pointers.cu rename to tests/gpuistl/test_gpu_smart_pointers.cu