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

Restore old HAVE_CUDA value

Browse Source
This commit is contained in:
Tong Dong Qiu 2023-04-06 10:11:00 +02:00
parent a4cf50c1fc
commit 270dcd53fc
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/simulators/linalg/bda/rocalutionSolverBackend.cpp
View File

@ -30,6 +30,11 @@
// MultisegmentWellContribution includes the cuda runtime if found by CMake // MultisegmentWellContribution includes the cuda runtime if found by CMake
// this leads to inclusion of both amd_hip_vector_types.h and vector_types.h // this leads to inclusion of both amd_hip_vector_types.h and vector_types.h
// which both define vector types like uchar2, short3 and double4. // which both define vector types like uchar2, short3 and double4.
// Restore the value (if defined) afterwards.
#ifdef HAVE_CUDA
#define HIP_HAVE_CUDA_DEFINED HAVE_CUDA
#endif
#undef HAVE_CUDA #undef HAVE_CUDA
#include <opm/simulators/linalg/bda/rocalutionSolverBackend.hpp> #include <opm/simulators/linalg/bda/rocalutionSolverBackend.hpp>
@ -37,6 +42,11 @@
#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
#ifdef HIP_HAVE_CUDA_DEFINED
#define HAVE_CUDA HIP_HAVE_CUDA_DEFINED
#undef HIP_HAVE_CUDA_DEFINED
#endif
namespace Opm namespace Opm
{ {
namespace Accelerator namespace Accelerator

10
opm/simulators/linalg/bda/rocsparseSolverBackend.cpp
View File

@ -29,6 +29,11 @@
// MultisegmentWellContribution includes the cuda runtime if found by CMake // MultisegmentWellContribution includes the cuda runtime if found by CMake
// this leads to inclusion of both amd_hip_vector_types.h and vector_types.h // this leads to inclusion of both amd_hip_vector_types.h and vector_types.h
// which both define vector types like uchar2, short3 and double4. // which both define vector types like uchar2, short3 and double4.
// Restore the value (if defined) afterwards.
#ifdef HAVE_CUDA
#define HIP_HAVE_CUDA_DEFINED HAVE_CUDA
#endif
#undef HAVE_CUDA #undef HAVE_CUDA
#include <opm/simulators/linalg/bda/rocsparseSolverBackend.hpp> #include <opm/simulators/linalg/bda/rocsparseSolverBackend.hpp>
@ -38,6 +43,11 @@
#include <hip/hip_runtime_api.h> #include <hip/hip_runtime_api.h>
#include <hip/hip_version.h> #include <hip/hip_version.h>
#ifdef HIP_HAVE_CUDA_DEFINED
#define HAVE_CUDA HIP_HAVE_CUDA_DEFINED
#undef HIP_HAVE_CUDA_DEFINED
#endif
#define HIP_CHECK(stat) \ #define HIP_CHECK(stat) \
{ \ { \
if(stat != hipSuccess) \ if(stat != hipSuccess) \