refactor rocm files

This commit is contained in:
Razvan Nane 2024-06-04 06:19:28 +02:00
parent 59aee6c56c
commit 02b76b5309
9 changed files with 12 additions and 12 deletions

View File

@ -261,11 +261,11 @@ if(USE_BDA_BRIDGE)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclWellContributions.cpp) list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclWellContributions.cpp)
endif() endif()
if(ROCALUTION_FOUND) if(ROCALUTION_FOUND)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocalutionSolverBackend.cpp) list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.cpp)
endif() endif()
if(rocsparse_FOUND AND rocblas_FOUND) if(rocsparse_FOUND AND rocblas_FOUND)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocsparseSolverBackend.cpp) list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp)
list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocsparseWellContributions.cpp) list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparseWellContributions.cpp)
endif() endif()
if(CUDA_FOUND) 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/cusparseSolverBackend.cu)
@ -666,9 +666,9 @@ if (USE_BDA_BRIDGE)
opm/simulators/linalg/bda/opencl/openclWellContributions.hpp opm/simulators/linalg/bda/opencl/openclWellContributions.hpp
opm/simulators/linalg/bda/Matrix.hpp opm/simulators/linalg/bda/Matrix.hpp
opm/simulators/linalg/bda/MultisegmentWellContribution.hpp opm/simulators/linalg/bda/MultisegmentWellContribution.hpp
opm/simulators/linalg/bda/rocalutionSolverBackend.hpp opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.hpp
opm/simulators/linalg/bda/rocsparseSolverBackend.hpp opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp
opm/simulators/linalg/bda/rocsparseWellContributions.hpp opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp
opm/simulators/linalg/bda/WellContributions.hpp opm/simulators/linalg/bda/WellContributions.hpp
opm/simulators/linalg/ISTLSolverBda.hpp opm/simulators/linalg/ISTLSolverBda.hpp
) )

View File

@ -47,7 +47,7 @@
#endif #endif
#if HAVE_ROCSPARSE #if HAVE_ROCSPARSE
#include <opm/simulators/linalg/bda/rocsparseSolverBackend.hpp> #include <opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp>
#endif #endif
typedef Dune::InverseOperatorResult InverseOperatorResult; typedef Dune::InverseOperatorResult InverseOperatorResult;

View File

@ -34,7 +34,7 @@
#endif #endif
#ifdef HAVE_ROCSPARSE #ifdef HAVE_ROCSPARSE
#include <opm/simulators/linalg/bda/rocsparseWellContributions.hpp> #include <opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp>
#endif #endif
namespace Opm { namespace Opm {

View File

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

View File

@ -36,8 +36,8 @@
#undef HAVE_CUDA #undef HAVE_CUDA
#include <opm/simulators/linalg/bda/rocsparseSolverBackend.hpp> #include <opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp>
#include <opm/simulators/linalg/bda/rocsparseWellContributions.hpp> #include <opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp>
#include <opm/simulators/linalg/bda/BdaResult.hpp> #include <opm/simulators/linalg/bda/BdaResult.hpp>

View File

@ -29,7 +29,7 @@
#undef HAVE_CUDA #undef HAVE_CUDA
#include <opm/simulators/linalg/bda/rocsparseWellContributions.hpp> #include <opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp>
#ifdef HIP_HAVE_CUDA_DEFINED #ifdef HIP_HAVE_CUDA_DEFINED
#define HAVE_CUDA HIP_HAVE_CUDA_DEFINED #define HAVE_CUDA HIP_HAVE_CUDA_DEFINED