Combine multiple defines into one

CMakeLists.txt

@@ -162,6 +162,7 @@ endif()
 
 if(CUDA_FOUND)
   set(HAVE_CUDA 1)
+  set(COMPILE_BDA_BRIDGE 1)
   include_directories(${CUDA_INCLUDE_DIRS})
 endif()
 
@@ -173,6 +174,7 @@ if(OpenCL_FOUND)
   find_file(CL2_HPP CL/cl2.hpp HINTS ${OpenCL_INCLUDE_DIRS})
   if(CL2_HPP)
     set(HAVE_OPENCL 1)
+    set(COMPILE_BDA_BRIDGE 1)
     include_directories(${OpenCL_INCLUDE_DIRS})
     find_file(OPENCL_HPP CL/opencl.hpp HINTS ${OpenCL_INCLUDE_DIRS})
     if(OPENCL_HPP)
@@ -206,6 +208,7 @@ endif()
 find_package(amgcl)
 if(amgcl_FOUND)
   set(HAVE_AMGCL 1)
+  set(COMPILE_BDA_BRIDGE 1)
   # Linking to target angcl::amgcl drags in OpenMP and -fopenmp as a compile
   # flag. With that nvcc fails as it does not that flag.
   # Hence we set AMGCL_INCLUDE_DIRS.
@@ -217,6 +220,7 @@ if(OpenCL_FOUND)
   find_package(VexCL)
   if(VexCL_FOUND)
     set(HAVE_VEXCL 1)
+    set(COMPILE_BDA_BRIDGE 1)
     # generator expressions in vexcl do not seem to work and therefore
     # we cannot use the imported target. Hence we exract the needed info
     # from the targets
@@ -235,6 +239,7 @@ endif()
 find_package(rocalution)
 if(ROCALUTION_FOUND)
   set(HAVE_ROCALUTION 1)
+  set(COMPILE_BDA_BRIDGE 1)
 endif()
 
 

CMakeLists_files.cmake

@@ -145,7 +145,7 @@ endif()
 if(ROCALUTION_FOUND)
   list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocalutionSolverBackend.cpp)
 endif()
-if(CUDA_FOUND OR OPENCL_FOUND OR HAVE_FPGA OR amgcl_FOUND OR ROCALUTION_FOUND)
+if(COMPILE_BDA_BRIDGE)
   list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/BdaBridge.cpp)
 endif()
 if(amgcl_FOUND)

opm-simulators-prereqs.cmake

@@ -5,6 +5,7 @@ set (opm-simulators_CONFIG_VAR
   HAVE_EWOMS
   HAVE_MPI
   HAVE_PETSC
+  COMPILE_BDA_BRIDGE
   HAVE_CUDA
   HAVE_OPENCL
   HAVE_OPENCL_HPP

opm/simulators/linalg/ISTLSolverEbos.cpp

@@ -31,7 +31,7 @@
 #include <opm/simulators/linalg/ParallelIstlInformation.hpp>
 #include <opm/simulators/utils/ParallelCommunication.hpp>
 
-#if HAVE_CUDA || HAVE_OPENCL || HAVE_AMGCL || HAVE_ROCALUTION
+#if COMPILE_BDA_BRIDGE
 #include <opm/simulators/linalg/bda/BdaBridge.hpp>
 #include <opm/simulators/linalg/bda/WellContributions.hpp>
 #endif
@@ -149,7 +149,7 @@ void FlexibleSolverInfo<Matrix,Vector,Comm>::create(const Matrix& matrix,
             this->op_ = std::move(pop);
             this->solver_ = std::move(sol);
         }
-    #endif
+#endif
     } else {
         if (!wellOperator_) {
             using SeqOperatorType = Dune::MatrixAdapter<Matrix, Vector, Vector>;
@@ -175,7 +175,7 @@ void FlexibleSolverInfo<Matrix,Vector,Comm>::create(const Matrix& matrix,
     }
 }
 
-#if HAVE_CUDA || HAVE_OPENCL || HAVE_AMGCL || HAVE_ROCALUTION
+#if COMPILE_BDA_BRIDGE
 template<class Matrix, class Vector>
 BdaSolverInfo<Matrix,Vector>::
 BdaSolverInfo(const std::string& accelerator_mode,
@@ -329,7 +329,7 @@ copyMatToBlockJac(const Matrix& mat, Matrix& blockJac)
         }
     }
 }
-#endif
+#endif // COMPILE_BDA_BRIDGE
 
 template<int Dim>
 using BM = Dune::BCRSMatrix<MatrixBlock<double,Dim,Dim>>;
@@ -346,7 +346,7 @@ using CommunicationType = Dune::CollectiveCommunication<int>;
     template void makeOverlapRowsInvalid<BM<Dim>>(BM<Dim>&, const std::vector<int>&); \
     template struct FlexibleSolverInfo<BM<Dim>,BV<Dim>,CommunicationType>;
 
-#if HAVE_CUDA || HAVE_OPENCL || HAVE_AMGCL || HAVE_ROCALUTION
+#if COMPILE_BDA_BRIDGE
 
 #define INSTANCE_GRID(Dim, Grid) \
     template void BdaSolverInfo<BM<Dim>,BV<Dim>>:: \
@@ -376,7 +376,7 @@ using CommunicationType = Dune::CollectiveCommunication<int>;
 #else
 #define INSTANCE(Dim) \
     INSTANCE_FLEX(Dim)
-#endif
+#endif // COMPILE_BDA_BRIDGE
 
 INSTANCE(1)
 INSTANCE(2)

opm/simulators/linalg/ISTLSolverEbos.hpp

@@ -84,7 +84,7 @@ public:
 namespace Opm
 {
 
-#if HAVE_CUDA || HAVE_OPENCL || HAVE_AMGCL || HAVE_ROCALUTION
+#if COMPILE_BDA_BRIDGE
 template<class Matrix, class Vector, int block_size> class BdaBridge;
 class WellContributions;
 #endif
@@ -113,7 +113,7 @@ struct FlexibleSolverInfo
     size_t interiorCellNum_ = 0;
 };
 
-#if HAVE_CUDA || HAVE_OPENCL || HAVE_AMGCL || HAVE_ROCALUTION
+#if COMPILE_BDA_BRIDGE
 template<class Matrix, class Vector>
 struct BdaSolverInfo
 {
@@ -245,7 +245,7 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
                                      EWOMS_PARAM_IS_SET(TypeTag, int, LinearSolverMaxIter),
                                      EWOMS_PARAM_IS_SET(TypeTag, int, CprMaxEllIter));
 
-#if HAVE_CUDA || HAVE_OPENCL || HAVE_AMGCL || HAVE_ROCALUTION
+#if COMPILE_BDA_BRIDGE
             {
                 std::string accelerator_mode = EWOMS_GET_PARAM(TypeTag, std::string, AcceleratorMode);
                 if ((simulator_.vanguard().grid().comm().size() > 1) && (accelerator_mode != "none")) {
@@ -383,7 +383,7 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
             // Solve system.
             Dune::InverseOperatorResult result;
 
-#if HAVE_CUDA || HAVE_OPENCL || HAVE_AMGCL || HAVE_ROCALUTION
+#if COMPILE_BDA_BRIDGE
             std::function<void(WellContributions&)> getContribs =
                 [this](WellContributions& w)
                 {
@@ -555,7 +555,7 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
         Matrix* matrix_;
         Vector *rhs_;
 
-#if HAVE_CUDA || HAVE_OPENCL || HAVE_AMGCL || HAVE_ROCALUTION
+#if COMPILE_BDA_BRIDGE
         std::unique_ptr<detail::BdaSolverInfo<Matrix, Vector>> bdaBridge;
 #endif