OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

rename bda folder&files

Browse Source
This commit is contained in:
Razvan Nane 2024-11-04 10:47:34 +01:00
parent fadc96da44
commit 7c4bafe936
90 changed files with 233 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -32,7 +32,7 @@ option(USE_CHOW_PATEL_ILU_GPU "Run iterative ILU decomposition on GPU? Requires
option(USE_CHOW_PATEL_ILU_GPU_PARALLEL "Try to use more parallelism on the GPU during the iterative ILU decomposition? Requires USE_CHOW_PATEL_ILU_GPU" OFF)
option(BUILD_FLOW_ALU_GRID "Build flow blackoil with alu grid" OFF)
option(USE_DAMARIS_LIB "Use the Damaris library for asynchronous I/O?" OFF)
option(USE_BDA_BRIDGE "Enable the BDA bridge (GPU/AMGCL solvers)" ON)
option(USE_GPU_BRIDGE "Enable the GPU bridge (GPU/AMGCL solvers)" ON)
option(USE_TRACY_PROFILER "Enable tracy profiling" OFF)
option(CONVERT_CUDA_TO_HIP "Convert CUDA code to HIP (to run on AMD cards)" OFF)
set(OPM_COMPILE_COMPONENTS "2;3;4;5;6;7" CACHE STRING "The components to compile support for")
@ -141,8 +141,8 @@ if(USE_MPI)
set(HDF5_PREFER_PARALLEL TRUE)
endif()
if(USE_BDA_BRIDGE)
set(COMPILE_BDA_BRIDGE 1)
if(USE_GPU_BRIDGE)
set(COMPILE_GPU_BRIDGE 1)
endif()
# not the same location as most of the other projects? this hook overrides
@ -381,7 +381,7 @@ macro (files_hook)
set(HDF5_FOUND OFF)
unset(HAVE_HDF5)
endif()
if(HAVE_ROCSPARSE AND HAVE_CUDA AND USE_BDA_BRIDGE) # unsure if this is the correct way to change this
if(HAVE_ROCSPARSE AND HAVE_CUDA AND USE_GPU_BRIDGE) # unsure if this is the correct way to change this
message(WARNING "WARNING! Using CUDA and ROCm at the same time is not allowed. Please choose only one of them by setting CMAKE_DISABLE_FIND_PACKAGE_<rocsparse|CUDA>=<ON|OFF>. Disabling CUDA...\n")
set(CUDA_FOUND OFF)
unset(HAVE_CUDA)
@ -654,7 +654,7 @@ if(CUDA_FOUND)
target_link_libraries(${tgt} CUDA::cudart)
endforeach()
endif()
if(USE_BDA_BRIDGE)
if(USE_GPU_BRIDGE)
set_tests_properties(cusparseSolver PROPERTIES LABELS gpu_cuda)
endif()
@ -685,7 +685,7 @@ if(CUDA_FOUND)
PROPERTIES LABELS ${gpu_label})
endif()
if(USE_BDA_BRIDGE)
if(USE_GPU_BRIDGE)
if(OpenCL_FOUND)
target_link_libraries( opmsimulators PUBLIC ${OpenCL_LIBRARIES} )
set_tests_properties(openclSolver solvetransposed3x3 csrToCscOffsetMap

134
CMakeLists_files.cmake
View File

@ -306,47 +306,47 @@ if (HAVE_CUDA)
ADD_CUDA_OR_HIP_FILE(PUBLIC_HEADER_FILES opm/simulators/linalg set_device.hpp)
endif()
if(USE_BDA_BRIDGE)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/BdaBridge.cpp
opm/simulators/linalg/bda/CprCreation.cpp
opm/simulators/linalg/bda/Misc.cpp
opm/simulators/linalg/bda/WellContributions.cpp
opm/simulators/linalg/bda/MultisegmentWellContribution.cpp
opm/simulators/linalg/ISTLSolverBda.cpp)
if(USE_GPU_BRIDGE)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/GpuBridge.cpp
opm/simulators/linalg/gpubridge/CprCreation.cpp
opm/simulators/linalg/gpubridge/Misc.cpp
opm/simulators/linalg/gpubridge/WellContributions.cpp
opm/simulators/linalg/gpubridge/MultisegmentWellContribution.cpp
opm/simulators/linalg/ISTLSolverGpu.cpp)
if(OPENCL_FOUND)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/BlockedMatrix.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclBILU0.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/Reorder.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/ChowPatelIlu.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclBISAI.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclCPR.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/opencl.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclKernels.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/OpenclMatrix.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclPreconditioner.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclSolverBackend.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclWellContributions.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/BlockedMatrix.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/openclBILU0.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/Reorder.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/ChowPatelIlu.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/openclBISAI.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/openclCPR.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/opencl.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/openclKernels.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/OpenclMatrix.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/openclPreconditioner.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/openclSolverBackend.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/opencl/openclWellContributions.cpp)
endif()
if(ROCALUTION_FOUND)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/rocm/rocalutionSolverBackend.cpp)
endif()
if(rocsparse_FOUND AND rocblas_FOUND)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparseCPR.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparseBILU0.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparseWellContributions.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/hipKernels.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparseMatrix.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/rocm/rocsparseCPR.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/rocm/rocsparseBILU0.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/rocm/rocsparsePreconditioner.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/rocm/rocsparseSolverBackend.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/rocm/rocsparseWellContributions.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/rocm/hipKernels.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/rocm/rocsparseMatrix.cpp)
endif()
if(CUDA_FOUND)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/cuda/cusparseSolverBackend.cu)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/cuda/cuWellContributions.cu)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/cuda/cusparseSolverBackend.cu)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/cuda/cuWellContributions.cu)
endif()
if(amgcl_FOUND)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/amgclSolverBackend.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/amgclSolverBackend.cpp)
if(CUDA_FOUND)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/cuda/amgclSolverBackend.cu)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/gpubridge/cuda/amgclSolverBackend.cu)
endif()
endif()
endif()
@ -430,7 +430,7 @@ if(MPI_FOUND)
endif()
if(CUDA_FOUND)
if(USE_BDA_BRIDGE)
if(USE_GPU_BRIDGE)
list(APPEND TEST_SOURCE_FILES tests/test_cusparseSolver.cpp)
endif()
endif()
@ -471,7 +471,7 @@ if (HAVE_CUDA)
endif()
endif()
if(USE_BDA_BRIDGE)
if(USE_GPU_BRIDGE)
if(OPENCL_FOUND)
list(APPEND TEST_SOURCE_FILES tests/test_openclSolver.cpp)
list(APPEND TEST_SOURCE_FILES tests/test_solvetransposed3x3.cpp)
@ -1019,41 +1019,41 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/wells/WellTest.hpp
opm/simulators/wells/WGState.hpp
)
if (USE_BDA_BRIDGE)
if (USE_GPU_BRIDGE)
list (APPEND PUBLIC_HEADER_FILES
opm/simulators/linalg/bda/amgclSolverBackend.hpp
opm/simulators/linalg/bda/BdaBridge.hpp
opm/simulators/linalg/bda/BdaResult.hpp
opm/simulators/linalg/bda/BdaSolver.hpp
opm/simulators/linalg/bda/CprCreation.hpp
opm/simulators/linalg/bda/Preconditioner.hpp
opm/simulators/linalg/bda/Misc.hpp
opm/simulators/linalg/bda/opencl/openclBILU0.hpp
opm/simulators/linalg/bda/BlockedMatrix.hpp
opm/simulators/linalg/bda/opencl/openclCPR.hpp
opm/simulators/linalg/bda/cuda/cuda_header.hpp
opm/simulators/linalg/bda/cuda/cusparseSolverBackend.hpp
opm/simulators/linalg/bda/opencl/ChowPatelIlu.hpp
opm/simulators/linalg/bda/opencl/openclBISAI.hpp
opm/simulators/linalg/bda/Reorder.hpp
opm/simulators/linalg/bda/opencl/opencl.hpp
opm/simulators/linalg/bda/opencl/openclKernels.hpp
opm/simulators/linalg/bda/opencl/OpenclMatrix.hpp
opm/simulators/linalg/bda/opencl/openclPreconditioner.hpp
opm/simulators/linalg/bda/opencl/openclSolverBackend.hpp
opm/simulators/linalg/bda/opencl/openclWellContributions.hpp
opm/simulators/linalg/bda/Matrix.hpp
opm/simulators/linalg/bda/MultisegmentWellContribution.hpp
opm/simulators/linalg/bda/rocm/hipKernels.hpp
opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.hpp
opm/simulators/linalg/bda/rocm/rocsparseBILU0.hpp
opm/simulators/linalg/bda/rocm/rocsparseCPR.hpp
opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.hpp
opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp
opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp
opm/simulators/linalg/bda/rocm/rocsparseMatrix.hpp
opm/simulators/linalg/bda/WellContributions.hpp
opm/simulators/linalg/ISTLSolverBda.hpp
opm/simulators/linalg/gpubridge/amgclSolverBackend.hpp
opm/simulators/linalg/gpubridge/GpuBridge.hpp
opm/simulators/linalg/gpubridge/GpuResult.hpp
opm/simulators/linalg/gpubridge/GpuSolver.hpp
opm/simulators/linalg/gpubridge/CprCreation.hpp
opm/simulators/linalg/gpubridge/Preconditioner.hpp
opm/simulators/linalg/gpubridge/Misc.hpp
opm/simulators/linalg/gpubridge/opencl/openclBILU0.hpp
opm/simulators/linalg/gpubridge/BlockedMatrix.hpp
opm/simulators/linalg/gpubridge/opencl/openclCPR.hpp
opm/simulators/linalg/gpubridge/cuda/cuda_header.hpp
opm/simulators/linalg/gpubridge/cuda/cusparseSolverBackend.hpp
opm/simulators/linalg/gpubridge/opencl/ChowPatelIlu.hpp
opm/simulators/linalg/gpubridge/opencl/openclBISAI.hpp
opm/simulators/linalg/gpubridge/Reorder.hpp
opm/simulators/linalg/gpubridge/opencl/opencl.hpp
opm/simulators/linalg/gpubridge/opencl/openclKernels.hpp
opm/simulators/linalg/gpubridge/opencl/OpenclMatrix.hpp
opm/simulators/linalg/gpubridge/opencl/openclPreconditioner.hpp
opm/simulators/linalg/gpubridge/opencl/openclSolverBackend.hpp
opm/simulators/linalg/gpubridge/opencl/openclWellContributions.hpp
opm/simulators/linalg/gpubridge/Matrix.hpp
opm/simulators/linalg/gpubridge/MultisegmentWellContribution.hpp
opm/simulators/linalg/gpubridge/rocm/hipKernels.hpp
opm/simulators/linalg/gpubridge/rocm/rocalutionSolverBackend.hpp
opm/simulators/linalg/gpubridge/rocm/rocsparseBILU0.hpp
opm/simulators/linalg/gpubridge/rocm/rocsparseCPR.hpp
opm/simulators/linalg/gpubridge/rocm/rocsparsePreconditioner.hpp
opm/simulators/linalg/gpubridge/rocm/rocsparseSolverBackend.hpp
opm/simulators/linalg/gpubridge/rocm/rocsparseWellContributions.hpp
opm/simulators/linalg/gpubridge/rocm/rocsparseMatrix.hpp
opm/simulators/linalg/gpubridge/WellContributions.hpp
opm/simulators/linalg/ISTLSolverGpu.hpp
)
endif()

6
opencl-source-provider.cmake
View File

@ -1,5 +1,5 @@
set(BDA_DIR opm/simulators/linalg/bda)
set(KERNELS_DIR ${BDA_DIR}/opencl/kernels)
set(GPUBRIDGE_DIR opm/simulators/linalg/gpubridge)
set(KERNELS_DIR ${GPUBRIDGE_DIR}/opencl/kernels)
option(DEBUG_OPENCL_KERNELS_INTEL "Run ocloc to check kernel (works only on Intel)" OFF)
if(DEBUG_OPENCL_KERNELS_INTEL)
@ -14,7 +14,7 @@ endif()
set(CL_SRC_FILE ${PROJECT_BINARY_DIR}/clSources.cpp)
file(WRITE ${CL_SRC_FILE} "// This file is auto-generated. Do not edit!\n\n")
file(APPEND ${CL_SRC_FILE} "#include <config.h>\n\n")
file(APPEND ${CL_SRC_FILE} "#include <${BDA_DIR}/opencl/openclKernels.hpp>\n\n")
file(APPEND ${CL_SRC_FILE} "#include <${GPUBRIDGE_DIR}/opencl/openclKernels.hpp>\n\n")
file(APPEND ${CL_SRC_FILE} "namespace Opm\{\n\n")
file(APPEND ${CL_SRC_FILE} "namespace Accelerator\{\n\n")

6
opm/simulators/linalg/ISTLSolverBda.cpp → opm/simulators/linalg/ISTLSolverGpu.cpp
View File

@ -21,7 +21,7 @@
#include <config.h>
#include <opm/common/TimingMacros.hpp>
#include <opm/simulators/linalg/ISTLSolverBda.hpp>
#include <opm/simulators/linalg/ISTLSolverGpu.hpp>
#include <dune/istl/schwarz.hh>
@ -33,8 +33,8 @@
#include <fmt/format.h>
#include <opm/simulators/linalg/bda/BdaBridge.hpp>
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/GpuBridge.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>

0
opm/simulators/linalg/ISTLSolverBda.hpp → opm/simulators/linalg/ISTLSolverGpu.hpp
View File

6
opm/simulators/linalg/bda/BlockedMatrix.cpp → opm/simulators/linalg/gpubridge/BlockedMatrix.cpp
View File

@ -22,9 +22,9 @@
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/bda/Matrix.hpp>
#include <opm/simulators/linalg/bda/Matrix.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/Matrix.hpp>
#include <opm/simulators/linalg/gpubridge/Matrix.hpp>
namespace Opm::Accelerator {

0
opm/simulators/linalg/bda/BlockedMatrix.hpp → opm/simulators/linalg/gpubridge/BlockedMatrix.hpp
View File

8
opm/simulators/linalg/bda/CprCreation.cpp → opm/simulators/linalg/gpubridge/CprCreation.cpp
View File

@ -28,11 +28,11 @@
#include <opm/simulators/linalg/PreconditionerFactory.hpp>
#include <opm/simulators/linalg/PropertyTree.hpp>
#include <opm/simulators/linalg/bda/BdaBridge.hpp>
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/bda/CprCreation.hpp>
#include <opm/simulators/linalg/gpubridge/GpuBridge.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/CprCreation.hpp>
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
namespace Opm::Accelerator {

4
opm/simulators/linalg/bda/CprCreation.hpp → opm/simulators/linalg/gpubridge/CprCreation.hpp
View File

@ -24,8 +24,8 @@
#include <dune/istl/paamg/matrixhierarchy.hh>
#include <dune/istl/umfpack.hh>
#include <opm/simulators/linalg/bda/Matrix.hpp>
#include <opm/simulators/linalg/bda/Preconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/Matrix.hpp>
#include <opm/simulators/linalg/gpubridge/Preconditioner.hpp>
#include <type_traits>

18
opm/simulators/linalg/bda/BdaBridge.cpp → opm/simulators/linalg/gpubridge/GpuBridge.cpp
View File

@ -25,29 +25,29 @@
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/BdaBridge.hpp>
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/GpuBridge.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
#if HAVE_CUDA
#include <opm/simulators/linalg/bda/cuda/cusparseSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/cuda/cusparseSolverBackend.hpp>
#endif
#if HAVE_OPENCL
#include <opm/simulators/linalg/bda/opencl/openclSolverBackend.hpp>
#include <opm/simulators/linalg/bda/opencl/openclWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclWellContributions.hpp>
#endif
#if HAVE_AMGCL
#include <opm/simulators/linalg/bda/amgclSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/amgclSolverBackend.hpp>
#endif
#if HAVE_ROCALUTION
#include <opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocalutionSolverBackend.hpp>
#endif
#if HAVE_ROCSPARSE
#include <opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseSolverBackend.hpp>
#endif
#include <type_traits>

2
opm/simulators/linalg/bda/BdaBridge.hpp → opm/simulators/linalg/gpubridge/GpuBridge.hpp
View File

@ -22,7 +22,7 @@
#include "dune/istl/solver.hh" // for struct InverseOperatorResult
#include <opm/simulators/linalg/bda/BdaSolver.hpp>
#include <opm/simulators/linalg/gpubridge/GpuSolver.hpp>
namespace Opm
{

0
opm/simulators/linalg/bda/BdaResult.hpp → opm/simulators/linalg/gpubridge/GpuResult.hpp
View File

4
opm/simulators/linalg/bda/BdaSolver.hpp → opm/simulators/linalg/gpubridge/GpuSolver.hpp
View File

@ -21,8 +21,8 @@
#define OPM_BDASOLVER_BACKEND_HEADER_INCLUDED
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <memory>

0
opm/simulators/linalg/bda/Matrix.hpp → opm/simulators/linalg/gpubridge/Matrix.hpp
View File

2
opm/simulators/linalg/bda/Misc.cpp → opm/simulators/linalg/gpubridge/Misc.cpp
View File

@ -1,6 +1,6 @@
#include <config.h>
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
#include <cmath>
#include <algorithm>

0
opm/simulators/linalg/bda/Misc.hpp → opm/simulators/linalg/gpubridge/Misc.hpp
View File

2
opm/simulators/linalg/bda/MultisegmentWellContribution.cpp → opm/simulators/linalg/gpubridge/MultisegmentWellContribution.cpp
View File

@ -18,7 +18,7 @@
*/
#include <config.h> // CMake
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#include <opm/simulators/linalg/gpubridge/MultisegmentWellContribution.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/TimingMacros.hpp>

0
opm/simulators/linalg/bda/MultisegmentWellContribution.hpp → opm/simulators/linalg/gpubridge/MultisegmentWellContribution.hpp
View File

2
opm/simulators/linalg/bda/Preconditioner.hpp → opm/simulators/linalg/gpubridge/Preconditioner.hpp
View File

@ -21,7 +21,7 @@
#define OPM_PRECONDITIONER_HEADER_INCLUDED
#if HAVE_OPENCL
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#endif
#include <memory>

2
opm/simulators/linalg/bda/Reorder.cpp → opm/simulators/linalg/gpubridge/Reorder.cpp
View File

@ -21,7 +21,7 @@
#include "config.h"
#endif // HAVE_CONFIG_H
#include <opm/simulators/linalg/bda/Reorder.hpp>
#include <opm/simulators/linalg/gpubridge/Reorder.hpp>
#include <vector>
#include <cassert>

0
opm/simulators/linalg/bda/Reorder.hpp → opm/simulators/linalg/gpubridge/Reorder.hpp
View File

10
opm/simulators/linalg/bda/WellContributions.cpp → opm/simulators/linalg/gpubridge/WellContributions.cpp
View File

@ -18,23 +18,23 @@
*/
#include <config.h> // CMake
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#include <opm/simulators/linalg/gpubridge/MultisegmentWellContribution.hpp>
#ifdef HAVE_OPENCL
#include <opm/simulators/linalg/bda/opencl/openclWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclWellContributions.hpp>
#endif
#ifdef HAVE_CUDA
#include <opm/simulators/linalg/bda/cuda/cuWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/cuda/cuWellContributions.hpp>
#endif
#ifdef HAVE_ROCSPARSE
#include <opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseWellContributions.hpp>
#endif
namespace Opm {

0
opm/simulators/linalg/bda/WellContributions.hpp → opm/simulators/linalg/gpubridge/WellContributions.hpp
View File

4
opm/simulators/linalg/bda/amgclSolverBackend.cpp → opm/simulators/linalg/gpubridge/amgclSolverBackend.cpp
View File

@ -19,9 +19,9 @@
#include <config.h>
#include <opm/simulators/linalg/bda/amgclSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/amgclSolverBackend.hpp>
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp>

6
opm/simulators/linalg/bda/amgclSolverBackend.hpp → opm/simulators/linalg/gpubridge/amgclSolverBackend.hpp
View File

@ -20,9 +20,9 @@
#ifndef OPM_AMGCLSOLVER_BACKEND_HEADER_INCLUDED
#define OPM_AMGCLSOLVER_BACKEND_HEADER_INCLUDED
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/bda/BdaSolver.hpp>
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/simulators/linalg/gpubridge/GpuSolver.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
#include <boost/property_tree/ptree.hpp>

2
opm/simulators/linalg/bda/cuda/amgclSolverBackend.cu → opm/simulators/linalg/gpubridge/cuda/amgclSolverBackend.cu
View File

@ -24,7 +24,7 @@
#include <amgcl/backend/cuda.hpp>
#include <amgcl/relaxation/cusparse_ilu0.hpp>
#include <opm/simulators/linalg/bda/amgclSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/amgclSolverBackend.hpp>
/// This file is only compiled when both amgcl and CUDA are found by CMake

6
opm/simulators/linalg/bda/cuda/cuWellContributions.cu → opm/simulators/linalg/gpubridge/cuda/cuWellContributions.cu
View File

@ -19,13 +19,13 @@
#include <config.h> // CMake
#include <opm/simulators/linalg/bda/cuda/cuWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/cuda/cuWellContributions.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#include <opm/simulators/linalg/bda/cuda/cuda_header.hpp>
#include <opm/simulators/linalg/gpubridge/MultisegmentWellContribution.hpp>
#include <opm/simulators/linalg/gpubridge/cuda/cuda_header.hpp>
#include <cuda_runtime.h>

2
opm/simulators/linalg/bda/cuda/cuWellContributions.hpp → opm/simulators/linalg/gpubridge/cuda/cuWellContributions.hpp
View File

@ -20,7 +20,7 @@
#ifndef WELLCONTRIBUTIONS_CUDA_HEADER_INCLUDED
#define WELLCONTRIBUTIONS_CUDA_HEADER_INCLUDED
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
#include <cuda_runtime.h>

0
opm/simulators/linalg/bda/cuda/cuda_header.hpp → opm/simulators/linalg/gpubridge/cuda/cuda_header.hpp
View File

8
opm/simulators/linalg/bda/cuda/cusparseSolverBackend.cu → opm/simulators/linalg/gpubridge/cuda/cusparseSolverBackend.cu
View File

@ -25,10 +25,10 @@
#include <opm/common/OpmLog/OpmLog.hpp>
#include <dune/common/timer.hh>
#include <opm/simulators/linalg/bda/cuda/cusparseSolverBackend.hpp>
#include <opm/simulators/linalg/bda/cuda/cuWellContributions.hpp>
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/bda/cuda/cuda_header.hpp>
#include <opm/simulators/linalg/gpubridge/cuda/cusparseSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/cuda/cuWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/simulators/linalg/gpubridge/cuda/cuda_header.hpp>
#include "cublas_v2.h"
#include "cusparse_v2.h"

6
opm/simulators/linalg/bda/cuda/cusparseSolverBackend.hpp → opm/simulators/linalg/gpubridge/cuda/cusparseSolverBackend.hpp
View File

@ -24,9 +24,9 @@
#include "cublas_v2.h"
#include "cusparse_v2.h"
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/bda/BdaSolver.hpp>
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/simulators/linalg/gpubridge/GpuSolver.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
namespace Opm::Accelerator {

4
opm/simulators/linalg/bda/opencl/ChowPatelIlu.cpp → opm/simulators/linalg/gpubridge/opencl/ChowPatelIlu.cpp
View File

@ -23,8 +23,8 @@
#include <opm/common/ErrorMacros.hpp>
#include <dune/common/timer.hh>
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/bda/opencl/ChowPatelIlu.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/ChowPatelIlu.hpp>
#if CHOW_PATEL

2
opm/simulators/linalg/bda/opencl/ChowPatelIlu.hpp → opm/simulators/linalg/gpubridge/opencl/ChowPatelIlu.hpp
View File

@ -23,7 +23,7 @@
#include <mutex>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
// Variables CHOW_PATEL, CHOW_PATEL_GPU and CHOW_PATEL_GPU_PARALLEL are set by CMake
// Pass -DUSE_CHOW_PATEL_ILU=1 to cmake to define CHOW_PATEL and use the iterative ILU decomposition

6
opm/simulators/linalg/bda/opencl/OpenclMatrix.cpp → opm/simulators/linalg/gpubridge/opencl/OpenclMatrix.cpp
View File

@ -22,9 +22,9 @@
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/opencl/OpenclMatrix.hpp>
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/bda/Matrix.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/OpenclMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/Matrix.hpp>
namespace Opm
{

2
opm/simulators/linalg/bda/opencl/OpenclMatrix.hpp → opm/simulators/linalg/gpubridge/opencl/OpenclMatrix.hpp
View File

@ -22,7 +22,7 @@
#include <vector>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
namespace Opm
{

0
opm/simulators/linalg/bda/opencl/kernels/ILU_apply1.cl → opm/simulators/linalg/gpubridge/opencl/kernels/ILU_apply1.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/ILU_apply1_fm.cl → opm/simulators/linalg/gpubridge/opencl/kernels/ILU_apply1_fm.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/ILU_apply2.cl → opm/simulators/linalg/gpubridge/opencl/kernels/ILU_apply2.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/ILU_apply2_fm.cl → opm/simulators/linalg/gpubridge/opencl/kernels/ILU_apply2_fm.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/ILU_decomp.cl → opm/simulators/linalg/gpubridge/opencl/kernels/ILU_decomp.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/add_coarse_pressure_correction.cl → opm/simulators/linalg/gpubridge/opencl/kernels/add_coarse_pressure_correction.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/axpy.cl → opm/simulators/linalg/gpubridge/opencl/kernels/axpy.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/custom.cl → opm/simulators/linalg/gpubridge/opencl/kernels/custom.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/dot_1.cl → opm/simulators/linalg/gpubridge/opencl/kernels/dot_1.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/full_to_pressure_restriction.cl → opm/simulators/linalg/gpubridge/opencl/kernels/full_to_pressure_restriction.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/isaiL.cl → opm/simulators/linalg/gpubridge/opencl/kernels/isaiL.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/isaiU.cl → opm/simulators/linalg/gpubridge/opencl/kernels/isaiU.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/norm.cl → opm/simulators/linalg/gpubridge/opencl/kernels/norm.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/prolongate_vector.cl → opm/simulators/linalg/gpubridge/opencl/kernels/prolongate_vector.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/residual.cl → opm/simulators/linalg/gpubridge/opencl/kernels/residual.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/residual_blocked.cl → opm/simulators/linalg/gpubridge/opencl/kernels/residual_blocked.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/scale.cl → opm/simulators/linalg/gpubridge/opencl/kernels/scale.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/spmv.cl → opm/simulators/linalg/gpubridge/opencl/kernels/spmv.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/spmv_blocked.cl → opm/simulators/linalg/gpubridge/opencl/kernels/spmv_blocked.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/spmv_blocked_add.cl → opm/simulators/linalg/gpubridge/opencl/kernels/spmv_blocked_add.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/spmv_noreset.cl → opm/simulators/linalg/gpubridge/opencl/kernels/spmv_noreset.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/stdwell_apply.cl → opm/simulators/linalg/gpubridge/opencl/kernels/stdwell_apply.cl
View File

0
opm/simulators/linalg/bda/opencl/kernels/vmul.cl → opm/simulators/linalg/gpubridge/opencl/kernels/vmul.cl
View File

2
opm/simulators/linalg/bda/opencl/opencl.cpp → opm/simulators/linalg/gpubridge/opencl/opencl.cpp
View File

@ -18,7 +18,7 @@
*/
#include <config.h>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#include <string>
namespace Opm

0
opm/simulators/linalg/bda/opencl/opencl.hpp → opm/simulators/linalg/gpubridge/opencl/opencl.hpp
View File

8
opm/simulators/linalg/bda/opencl/openclBILU0.cpp → opm/simulators/linalg/gpubridge/opencl/openclBILU0.cpp
View File

@ -24,10 +24,10 @@
#include <opm/common/ErrorMacros.hpp>
#include <dune/common/timer.hh>
#include <opm/simulators/linalg/bda/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/bda/opencl/ChowPatelIlu.hpp>
#include <opm/simulators/linalg/bda/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/bda/Reorder.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/ChowPatelIlu.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/gpubridge/Reorder.hpp>
#include <sstream>

8
opm/simulators/linalg/bda/opencl/openclBILU0.hpp → opm/simulators/linalg/gpubridge/opencl/openclBILU0.hpp
View File

@ -20,11 +20,11 @@
#ifndef OPM_OPENCLBILU0_HPP
#define OPM_OPENCLBILU0_HPP
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/bda/opencl/openclPreconditioner.hpp>
#include <opm/simulators/linalg/bda/opencl/ChowPatelIlu.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclPreconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/ChowPatelIlu.hpp>
#include <memory>
#include <mutex>

14
opm/simulators/linalg/bda/opencl/openclBISAI.cpp → opm/simulators/linalg/gpubridge/opencl/openclBISAI.cpp
View File

@ -24,13 +24,13 @@
#include <opm/common/ErrorMacros.hpp>
#include <dune/common/timer.hh>
#include <opm/simulators/linalg/bda/BdaSolver.hpp>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/bda/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/bda/opencl/openclBISAI.hpp>
#include <opm/simulators/linalg/bda/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/bda/Reorder.hpp>
#include <opm/simulators/linalg/bda/opencl/ChowPatelIlu.hpp> // disable BISAI if ChowPatel is selected
#include <opm/simulators/linalg/gpubridge/GpuSolver.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclBISAI.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/gpubridge/Reorder.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/ChowPatelIlu.hpp> // disable BISAI if ChowPatel is selected
#include <sstream>

6
opm/simulators/linalg/bda/opencl/openclBISAI.hpp → opm/simulators/linalg/gpubridge/opencl/openclBISAI.hpp
View File

@ -22,9 +22,9 @@
#include <mutex>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/bda/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/bda/opencl/openclPreconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclPreconditioner.hpp>
namespace Opm::Accelerator {

12
opm/simulators/linalg/bda/opencl/openclCPR.cpp → opm/simulators/linalg/gpubridge/opencl/openclCPR.cpp
View File

@ -28,13 +28,13 @@
#include <opm/simulators/linalg/PreconditionerFactory.hpp>
#include <opm/simulators/linalg/PropertyTree.hpp>
#include <opm/simulators/linalg/bda/BdaBridge.hpp>
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/bda/opencl/openclCPR.hpp>
#include <opm/simulators/linalg/bda/opencl/OpenclMatrix.hpp>
#include <opm/simulators/linalg/bda/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/gpubridge/GpuBridge.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclCPR.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/OpenclMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
#include <type_traits>

14
opm/simulators/linalg/bda/opencl/openclCPR.hpp → opm/simulators/linalg/gpubridge/opencl/openclCPR.hpp
View File

@ -23,14 +23,14 @@
#include <dune/istl/paamg/matrixhierarchy.hh>
#include <dune/istl/umfpack.hh>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/bda/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/bda/Matrix.hpp>
#include <opm/simulators/linalg/bda/CprCreation.hpp>
#include <opm/simulators/linalg/bda/opencl/OpenclMatrix.hpp>
#include <opm/simulators/linalg/bda/opencl/openclPreconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/gpubridge/Matrix.hpp>
#include <opm/simulators/linalg/gpubridge/CprCreation.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/OpenclMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclPreconditioner.hpp>
#include <opm/simulators/linalg/bda/opencl/openclSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclSolverBackend.hpp>
#include <type_traits>

6
opm/simulators/linalg/bda/opencl/openclKernels.cpp → opm/simulators/linalg/gpubridge/opencl/openclKernels.cpp
View File

@ -18,15 +18,15 @@
*/
#include <config.h>
#include <opm/simulators/linalg/bda/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclKernels.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <dune/common/timer.hh>
#include <opm/simulators/linalg/bda/opencl/ChowPatelIlu.hpp> // defines CHOW_PATEL
#include <opm/simulators/linalg/gpubridge/opencl/ChowPatelIlu.hpp> // defines CHOW_PATEL
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
#include <cmath>
#include <sstream>

2
opm/simulators/linalg/bda/opencl/openclKernels.hpp → opm/simulators/linalg/gpubridge/opencl/openclKernels.hpp
View File

@ -24,7 +24,7 @@
#include <memory>
#include <cstddef>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
namespace Opm::Accelerator {

8
opm/simulators/linalg/bda/opencl/openclPreconditioner.cpp → opm/simulators/linalg/gpubridge/opencl/openclPreconditioner.cpp
View File

@ -22,10 +22,10 @@
#include <opm/common/TimingMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/bda/opencl/openclBISAI.hpp>
#include <opm/simulators/linalg/bda/opencl/openclCPR.hpp>
#include <opm/simulators/linalg/bda/opencl/openclPreconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclBILU0.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclBISAI.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclCPR.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclPreconditioner.hpp>
#include <memory>
#include <string>

4
opm/simulators/linalg/bda/opencl/openclPreconditioner.hpp → opm/simulators/linalg/gpubridge/opencl/openclPreconditioner.hpp
View File

@ -20,8 +20,8 @@
#ifndef OPM_OPENCLPRECONDITIONER_HEADER_INCLUDED
#define OPM_OPENCLPRECONDITIONER_HEADER_INCLUDED
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/bda/Preconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/Preconditioner.hpp>
namespace Opm::Accelerator {

10
opm/simulators/linalg/bda/opencl/openclSolverBackend.cpp → opm/simulators/linalg/gpubridge/opencl/openclSolverBackend.cpp
View File

@ -25,12 +25,12 @@
#include <opm/common/ErrorMacros.hpp>
#include <dune/common/timer.hh>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/bda/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/bda/opencl/openclSolverBackend.hpp>
#include <opm/simulators/linalg/bda/opencl/openclWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclWellContributions.hpp>
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
// iff true, the nonzeroes of the matrix are copied row-by-row into a contiguous, pinned memory array, then a single GPU memcpy is done

10
opm/simulators/linalg/bda/opencl/openclSolverBackend.hpp → opm/simulators/linalg/gpubridge/opencl/openclSolverBackend.hpp
View File

@ -20,12 +20,12 @@
#ifndef OPM_OPENCLSOLVER_BACKEND_HEADER_INCLUDED
#define OPM_OPENCLSOLVER_BACKEND_HEADER_INCLUDED
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/bda/BdaSolver.hpp>
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/simulators/linalg/gpubridge/GpuSolver.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
#include <opm/simulators/linalg/bda/opencl/openclPreconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclPreconditioner.hpp>
namespace Opm::Accelerator {

4
opm/simulators/linalg/bda/opencl/openclWellContributions.cpp → opm/simulators/linalg/gpubridge/opencl/openclWellContributions.cpp
View File

@ -18,12 +18,12 @@
*/
#include <config.h> // CMake
#include <opm/simulators/linalg/bda/opencl/openclWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclWellContributions.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#include <opm/simulators/linalg/gpubridge/MultisegmentWellContribution.hpp>
namespace Opm {

6
opm/simulators/linalg/bda/opencl/openclWellContributions.hpp → opm/simulators/linalg/gpubridge/opencl/openclWellContributions.hpp
View File

@ -20,10 +20,10 @@
#ifndef WELLCONTRIBUTIONS_OPENCL_HEADER_INCLUDED
#define WELLCONTRIBUTIONS_OPENCL_HEADER_INCLUDED
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
#include <opm/simulators/linalg/bda/opencl/opencl.hpp>
#include <opm/simulators/linalg/bda/opencl/openclKernels.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/opencl.hpp>
#include <opm/simulators/linalg/gpubridge/opencl/openclKernels.hpp>
#include <memory>
#include <vector>

4
opm/simulators/linalg/bda/rocm/hipKernels.cpp → opm/simulators/linalg/gpubridge/rocm/hipKernels.cpp
View File

@ -25,9 +25,9 @@
#include <opm/common/ErrorMacros.hpp>
#include <dune/common/timer.hh>
#include <opm/simulators/linalg/bda/rocm/hipKernels.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/hipKernels.hpp>
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
#include <hip/hip_runtime.h>
namespace Opm {

0
opm/simulators/linalg/bda/rocm/hipKernels.hpp → opm/simulators/linalg/gpubridge/rocm/hipKernels.hpp
View File

2
opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.cpp → opm/simulators/linalg/gpubridge/rocm/rocalutionSolverBackend.cpp
View File

@ -37,7 +37,7 @@
#undef HAVE_CUDA
#include <opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocalutionSolverBackend.hpp>
#include <rocalution.hpp>
#include <base/matrix_formats_ind.hpp> // check if blocks are interpreted as row-major or column-major

6
opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.hpp → opm/simulators/linalg/gpubridge/rocm/rocalutionSolverBackend.hpp
View File

@ -20,9 +20,9 @@
#ifndef OPM_ROCALUTIONSOLVER_BACKEND_HEADER_INCLUDED
#define OPM_ROCALUTIONSOLVER_BACKEND_HEADER_INCLUDED
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/bda/BdaSolver.hpp>
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/simulators/linalg/gpubridge/GpuSolver.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
namespace rocalution {
template<class Matrix, class Vector, class Scalar> class BiCGStab;

6
opm/simulators/linalg/bda/rocm/rocsparseBILU0.cpp → opm/simulators/linalg/gpubridge/rocm/rocsparseBILU0.cpp
View File

@ -24,9 +24,9 @@
#include <opm/common/ErrorMacros.hpp>
#include <dune/common/timer.hh>
#include <opm/simulators/linalg/bda/rocm/rocsparseBILU0.hpp>
#include <opm/simulators/linalg/bda/Reorder.hpp>
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseBILU0.hpp>
#include <opm/simulators/linalg/gpubridge/Reorder.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
#include <sstream>
#include <thread>

4
opm/simulators/linalg/bda/rocm/rocsparseBILU0.hpp → opm/simulators/linalg/gpubridge/rocm/rocsparseBILU0.hpp
View File

@ -20,9 +20,9 @@
#ifndef OPM_ROCSPARSEBILU0_HPP
#define OPM_ROCSPARSEBILU0_HPP
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparsePreconditioner.hpp>
#include <rocblas/rocblas.h>
#include <rocsparse/rocsparse.h>

10
opm/simulators/linalg/bda/rocm/rocsparseCPR.cpp → opm/simulators/linalg/gpubridge/rocm/rocsparseCPR.cpp
View File

@ -28,12 +28,12 @@
#include <opm/simulators/linalg/PreconditionerFactory.hpp>
#include <opm/simulators/linalg/PropertyTree.hpp>
#include <opm/simulators/linalg/bda/BdaBridge.hpp>
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparseCPR.hpp>
#include <opm/simulators/linalg/bda/rocm/hipKernels.hpp>
#include <opm/simulators/linalg/gpubridge/GpuBridge.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseCPR.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/hipKernels.hpp>
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
#include <type_traits>

12
opm/simulators/linalg/bda/rocm/rocsparseCPR.hpp → opm/simulators/linalg/gpubridge/rocm/rocsparseCPR.hpp
View File

@ -22,13 +22,13 @@
#include <mutex>
#include <opm/simulators/linalg/bda/rocm/rocsparseBILU0.hpp>
#include <opm/simulators/linalg/bda/Matrix.hpp>
#include <opm/simulators/linalg/bda/CprCreation.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparseMatrix.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseBILU0.hpp>
#include <opm/simulators/linalg/gpubridge/Matrix.hpp>
#include <opm/simulators/linalg/gpubridge/CprCreation.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparsePreconditioner.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseSolverBackend.hpp>
namespace Opm::Accelerator {

8
opm/simulators/linalg/bda/rocm/rocsparseMatrix.cpp → opm/simulators/linalg/gpubridge/rocm/rocsparseMatrix.cpp
View File

@ -22,10 +22,10 @@
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparseMatrix.hpp>
#include <opm/simulators/linalg/bda/BlockedMatrix.hpp>
#include <opm/simulators/linalg/bda/Matrix.hpp>
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/BlockedMatrix.hpp>
#include <opm/simulators/linalg/gpubridge/Matrix.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
#include <sstream>
#include <iostream>

0
opm/simulators/linalg/bda/rocm/rocsparseMatrix.hpp → opm/simulators/linalg/gpubridge/rocm/rocsparseMatrix.hpp
View File

6
opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.cpp → opm/simulators/linalg/gpubridge/rocm/rocsparsePreconditioner.cpp
View File

@ -22,9 +22,9 @@
#include <opm/common/TimingMacros.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparseBILU0.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparseCPR.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseBILU0.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseCPR.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparsePreconditioner.hpp>
namespace Opm::Accelerator {

2
opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.hpp → opm/simulators/linalg/gpubridge/rocm/rocsparsePreconditioner.hpp
View File

@ -20,7 +20,7 @@
#ifndef OPM_ROCSPARSEPRECONDITIONER_HEADER_INCLUDED
#define OPM_ROCSPARSEPRECONDITIONER_HEADER_INCLUDED
#include <opm/simulators/linalg/bda/Preconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/Preconditioner.hpp>
#include <rocsparse/rocsparse.h>

10
opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp → opm/simulators/linalg/gpubridge/rocm/rocsparseSolverBackend.cpp
View File

@ -36,14 +36,14 @@
#undef HAVE_CUDA
#include <opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseSolverBackend.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseWellContributions.hpp>
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/simulators/linalg/bda/Preconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/Preconditioner.hpp>
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
#ifdef HIP_HAVE_CUDA_DEFINED
#define HAVE_CUDA HIP_HAVE_CUDA_DEFINED

8
opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp → opm/simulators/linalg/gpubridge/rocm/rocsparseSolverBackend.hpp
View File

@ -22,11 +22,11 @@
#include <memory>
#include <opm/simulators/linalg/bda/BdaResult.hpp>
#include <opm/simulators/linalg/bda/BdaSolver.hpp>
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/GpuResult.hpp>
#include <opm/simulators/linalg/gpubridge/GpuSolver.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
#include <opm/simulators/linalg/bda/rocm/rocsparsePreconditioner.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparsePreconditioner.hpp>
#include <rocblas/rocblas.h>
#include <rocsparse/rocsparse.h>

6
opm/simulators/linalg/bda/rocm/rocsparseWellContributions.cpp → opm/simulators/linalg/gpubridge/rocm/rocsparseWellContributions.cpp
View File

@ -29,7 +29,7 @@
#undef HAVE_CUDA
#include <opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/rocm/rocsparseWellContributions.hpp>
#ifdef HIP_HAVE_CUDA_DEFINED
#define HAVE_CUDA HIP_HAVE_CUDA_DEFINED
@ -39,8 +39,8 @@
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/linalg/bda/MultisegmentWellContribution.hpp>
#include <opm/simulators/linalg/bda/Misc.hpp>
#include <opm/simulators/linalg/gpubridge/MultisegmentWellContribution.hpp>
#include <opm/simulators/linalg/gpubridge/Misc.hpp>
#include <hip/hip_runtime.h>
namespace Opm

2
opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp → opm/simulators/linalg/gpubridge/rocm/rocsparseWellContributions.hpp
View File

@ -20,7 +20,7 @@
#ifndef WELLCONTRIBUTIONS_ROCSPARSE_HEADER_INCLUDED
#define WELLCONTRIBUTIONS_ROCSPARSE_HEADER_INCLUDED
#include <opm/simulators/linalg/bda/WellContributions.hpp>
#include <opm/simulators/linalg/gpubridge/WellContributions.hpp>
#include <hip/hip_runtime_api.h>