refactor cuistl folder names

CMakeLists_files.cmake

@@ -28,15 +28,15 @@
 # hipification, we a dependency that will trigger when the cuda source code is
 # changed.
 macro (ADD_CUDA_OR_HIP_FILE LIST DIR FILE)
-  set (cuda_file_path "${PROJECT_SOURCE_DIR}/${DIR}/cuistl/${FILE}")
+  set (cuda_file_path "${PROJECT_SOURCE_DIR}/${DIR}/gpuistl/${FILE}")
 
   if(CUDA_FOUND AND NOT CONVERT_CUDA_TO_HIP)
-    list (APPEND ${LIST} "${DIR}/cuistl/${FILE}")
+    list (APPEND ${LIST} "${DIR}/gpuistl/${FILE}")
   else()
     # we must hipify the code
     # and include the correct path which is in the build/binary dir
     string(REPLACE ".cu" ".hip" HIP_SOURCE_FILE ${FILE})
-    set (hip_file_path "${PROJECT_BINARY_DIR}/${DIR}/hipistl/${HIP_SOURCE_FILE}")
+    set (hip_file_path "${PROJECT_BINARY_DIR}/${DIR}/gpuistl_hip/${HIP_SOURCE_FILE}")
     file(RELATIVE_PATH relpath ${PROJECT_SOURCE_DIR} ${hip_file_path})
 
     # add a custom command that will hipify

bin/hipify_file.sh

@@ -15,6 +15,6 @@ hipify-perl $input_file > $output_file
 sed -i 's/^#include <hipblas\.h>/#include <hipblas\/hipblas.h>/g' $output_file
 sed -i 's/^#include <hipsparse\.h>/#include <hipsparse\/hipsparse.h>/g' $output_file
 # make sure includes refer to hipistl/ files (the ones that are also hipified)
-sed -i 's/cuistl\//hipistl\//g' $output_file
+sed -i 's/gpuistl\//gpuistl_hip\//g' $output_file
 
 echo "$output_file hipified"

opm/simulators/flow/Main.cpp

@@ -36,7 +36,7 @@
 #endif
 
 #if HAVE_CUDA
-#include <opm/simulators/linalg/cuistl/set_device.hpp>
+#include <opm/simulators/linalg/gpuistl/set_device.hpp>
 #endif
 
 namespace Opm {

opm/simulators/linalg/FlexibleSolver_impl.hpp

@@ -39,9 +39,9 @@
 
 #if HAVE_CUDA
 #if USE_HIP
-#include <opm/simulators/linalg/hipistl/SolverAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl_hip/SolverAdapter.hpp>
 #else
-#include <opm/simulators/linalg/cuistl/SolverAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/SolverAdapter.hpp>
 #endif
 #endif
 

opm/simulators/linalg/PreconditionerFactoryGPUIncludeWrapper.hpp

@@ -22,22 +22,22 @@
 // both with the normal cuistl path, and the hipistl path
 #if HAVE_CUDA
 #if USE_HIP
-#include <opm/simulators/linalg/hipistl/GpuBlockPreconditioner.hpp>
-#include <opm/simulators/linalg/hipistl/GpuDILU.hpp>
-#include <opm/simulators/linalg/hipistl/OpmCuILU0.hpp>
-#include <opm/simulators/linalg/hipistl/GpuJac.hpp>
-#include <opm/simulators/linalg/hipistl/GpuSeqILU0.hpp>
-#include <opm/simulators/linalg/hipistl/PreconditionerAdapter.hpp>
-#include <opm/simulators/linalg/hipistl/PreconditionerConvertFieldTypeAdapter.hpp>
-#include <opm/simulators/linalg/hipistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl_hip/GpuBlockPreconditioner.hpp>
+#include <opm/simulators/linalg/gpuistl_hip/GpuDILU.hpp>
+#include <opm/simulators/linalg/gpuistl_hip/OpmCuILU0.hpp>
+#include <opm/simulators/linalg/gpuistl_hip/GpuJac.hpp>
+#include <opm/simulators/linalg/gpuistl_hip/GpuSeqILU0.hpp>
+#include <opm/simulators/linalg/gpuistl_hip/PreconditionerAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl_hip/PreconditionerConvertFieldTypeAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl_hip/detail/cuda_safe_call.hpp>
 #else
-#include <opm/simulators/linalg/cuistl/GpuBlockPreconditioner.hpp>
-#include <opm/simulators/linalg/cuistl/GpuDILU.hpp>
-#include <opm/simulators/linalg/cuistl/OpmCuILU0.hpp>
-#include <opm/simulators/linalg/cuistl/GpuJac.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSeqILU0.hpp>
-#include <opm/simulators/linalg/cuistl/PreconditionerAdapter.hpp>
-#include <opm/simulators/linalg/cuistl/PreconditionerConvertFieldTypeAdapter.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuBlockPreconditioner.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuDILU.hpp>
+#include <opm/simulators/linalg/gpuistl/OpmCuILU0.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuJac.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSeqILU0.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerConvertFieldTypeAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 #endif
 #endif

opm/simulators/linalg/gpuistl/GpuBlockPreconditioner.hpp

@@ -22,8 +22,8 @@
 #include <dune/common/shared_ptr.hh>
 #include <memory>
 #include <opm/simulators/linalg/PreconditionerWithUpdate.hpp>
-#include <opm/simulators/linalg/cuistl/PreconditionerHolder.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditioner_should_call_post_pre.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerHolder.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditioner_should_call_post_pre.hpp>
 
 namespace Opm::gpuistl
 {

opm/simulators/linalg/gpuistl/GpuBuffer.cpp

@@ -20,9 +20,9 @@
 #include <cuda_runtime.h>
 #include <algorithm>
 #include <fmt/core.h>
-#include <opm/simulators/linalg/cuistl/GpuBuffer.hpp>
-#include <opm/simulators/linalg/cuistl/GpuView.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuBuffer.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuView.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 
 namespace Opm::gpuistl
 {

opm/simulators/linalg/gpuistl/GpuBuffer.hpp

@@ -23,8 +23,8 @@
 #include <exception>
 #include <fmt/core.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/detail/safe_conversion.hpp>
-#include <opm/simulators/linalg/cuistl/GpuView.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/safe_conversion.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuView.hpp>
 #include <vector>
 #include <string>
 
@@ -39,7 +39,7 @@ namespace Opm::gpuistl
  * Example usage:
  *
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/GpuBuffer.hpp>
+ * #include <opm/simulators/linalg/gpuistl/GpuBuffer.hpp>
  *
  * void someFunction() {
  *     auto someDataOnCPU = std::vector<double>({1.0, 2.0, 42.0, 59.9451743, 10.7132692});

opm/simulators/linalg/gpuistl/GpuDILU.cpp

@@ -25,13 +25,13 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/TimingMacros.hpp>
 #include <opm/simulators/linalg/GraphColoring.hpp>
-#include <opm/simulators/linalg/cuistl/detail/autotuner.hpp>
-#include <opm/simulators/linalg/cuistl/GpuDILU.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/detail/coloringAndReorderingUtils.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_matrix_operations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditionerKernels/DILUKernels.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/autotuner.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuDILU.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/coloringAndReorderingUtils.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_matrix_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditionerKernels/DILUKernels.hpp>
 #include <opm/simulators/linalg/matrixblock.hh>
 #include <tuple>
 #include <functional>

opm/simulators/linalg/gpuistl/GpuDILU.hpp

@@ -22,7 +22,7 @@
 #include <memory>
 #include <opm/grid/utility/SparseTable.hpp>
 #include <opm/simulators/linalg/PreconditionerWithUpdate.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
 #include <vector>
 
 

opm/simulators/linalg/gpuistl/GpuJac.cpp

@@ -20,10 +20,10 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <fmt/core.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/GpuJac.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditionerKernels/JacKernels.hpp>
-#include <opm/simulators/linalg/cuistl/detail/vector_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuJac.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditionerKernels/JacKernels.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/vector_operations.hpp>
 #include <opm/simulators/linalg/matrixblock.hh>
 
 namespace Opm::gpuistl

opm/simulators/linalg/gpuistl/GpuJac.hpp

@@ -21,10 +21,10 @@
 
 #include <dune/istl/preconditioner.hh>
 #include <opm/simulators/linalg/PreconditionerWithUpdate.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuMatrixDescription.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuSparseHandle.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuSparseResource.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuMatrixDescription.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseHandle.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseResource.hpp>
 
 
 

opm/simulators/linalg/gpuistl/GpuOwnerOverlapCopy.hpp

@@ -21,7 +21,7 @@
 #include <dune/istl/owneroverlapcopy.hh>
 #include <memory>
 #include <mutex>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
 #include <vector>
 
 namespace Opm::gpuistl

opm/simulators/linalg/gpuistl/GpuSeqILU0.cpp

@@ -25,12 +25,12 @@
 #include <dune/istl/bvector.hh>
 #include <fmt/core.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSeqILU0.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_constants.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_wrapper.hpp>
-#include <opm/simulators/linalg/cuistl/detail/fix_zero_diagonal.hpp>
-#include <opm/simulators/linalg/cuistl/detail/safe_conversion.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSeqILU0.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_constants.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_wrapper.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/fix_zero_diagonal.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/safe_conversion.hpp>
 #include <opm/simulators/linalg/matrixblock.hh>
 
 // This file is based on the guide at https://docs.nvidia.com/cuda/cusparse/index.html#csrilu02_solve ,

opm/simulators/linalg/gpuistl/GpuSeqILU0.hpp

@@ -21,10 +21,10 @@
 
 #include <dune/istl/preconditioner.hh>
 #include <opm/simulators/linalg/PreconditionerWithUpdate.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuMatrixDescription.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuSparseHandle.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuSparseResource.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuMatrixDescription.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseHandle.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseResource.hpp>
 
 
 

opm/simulators/linalg/gpuistl/GpuSparseMatrix.cpp

@@ -22,10 +22,10 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/bvector.hh>
 #include <fmt/core.h>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_constants.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_wrapper.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_constants.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_wrapper.hpp>
 #include <opm/simulators/linalg/matrixblock.hh>
 #include <type_traits>
 

opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp

@@ -22,10 +22,10 @@
 #include <iostream>
 #include <memory>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuMatrixDescription.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuSparseHandle.hpp>
-#include <opm/simulators/linalg/cuistl/detail/safe_conversion.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuMatrixDescription.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseHandle.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/safe_conversion.hpp>
 #include <vector>
 
 namespace Opm::gpuistl

opm/simulators/linalg/gpuistl/GpuVector.cpp

@@ -20,11 +20,11 @@
 #include <cuda.h>
 #include <cuda_runtime.h>
 #include <fmt/core.h>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cublas_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cublas_wrapper.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/detail/vector_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cublas_wrapper.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/vector_operations.hpp>
 
 namespace Opm::gpuistl
 {

opm/simulators/linalg/gpuistl/GpuVector.hpp

@@ -23,8 +23,8 @@
 #include <exception>
 #include <fmt/core.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuBlasHandle.hpp>
-#include <opm/simulators/linalg/cuistl/detail/safe_conversion.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuBlasHandle.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/safe_conversion.hpp>
 #include <vector>
 #include <string>
 
@@ -45,7 +45,7 @@ namespace Opm::gpuistl
  * Example usage:
  *
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/GpuVector.hpp>
+ * #include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
  *
  * void someFunction() {
  *     auto someDataOnCPU = std::vector<double>({1.0, 2.0, 42.0, 59.9451743, 10.7132692});

opm/simulators/linalg/gpuistl/GpuView.cpp

@@ -20,8 +20,8 @@
 #include <cuda_runtime.h>
 #include <algorithm>
 #include <fmt/core.h>
-#include <opm/simulators/linalg/cuistl/GpuView.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuView.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 
 namespace Opm::gpuistl
 {

opm/simulators/linalg/gpuistl/GpuView.hpp

@@ -23,7 +23,7 @@
 
 #include <opm/common/ErrorMacros.hpp>
 
-#include <opm/simulators/linalg/cuistl/detail/safe_conversion.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/safe_conversion.hpp>
 
 #include <stdexcept>
 #include <vector>

opm/simulators/linalg/gpuistl/OpmCuILU0.cpp

@@ -26,13 +26,13 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/TimingMacros.hpp>
 #include <opm/simulators/linalg/GraphColoring.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/OpmCuILU0.hpp>
-#include <opm/simulators/linalg/cuistl/detail/autotuner.hpp>
-#include <opm/simulators/linalg/cuistl/detail/coloringAndReorderingUtils.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_matrix_operations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditionerKernels/ILU0Kernels.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/OpmCuILU0.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/autotuner.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/coloringAndReorderingUtils.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_matrix_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditionerKernels/ILU0Kernels.hpp>
 #include <opm/simulators/linalg/matrixblock.hh>
 #include <string>
 #include <tuple>

opm/simulators/linalg/gpuistl/OpmCuILU0.hpp

@@ -22,8 +22,8 @@
 #include <memory>
 #include <opm/grid/utility/SparseTable.hpp>
 #include <opm/simulators/linalg/PreconditionerWithUpdate.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
 #include <optional>
 #include <type_traits>
 #include <vector>

opm/simulators/linalg/gpuistl/PreconditionerAdapter.hpp

@@ -21,9 +21,9 @@
 #include <cusparse.h>
 #include <dune/istl/preconditioner.hh>
 #include <opm/simulators/linalg/PreconditionerWithUpdate.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/PreconditionerHolder.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditioner_should_call_post_pre.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerHolder.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditioner_should_call_post_pre.hpp>
 
 
 namespace Opm::gpuistl

opm/simulators/linalg/gpuistl/PreconditionerConvertFieldTypeAdapter.hpp

@@ -22,13 +22,13 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/preconditioner.hh>
 #include <opm/simulators/linalg/PreconditionerWithUpdate.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuMatrixDescription.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuSparseHandle.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuSparseResource.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_constants.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditioner_should_call_post_pre.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuMatrixDescription.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseHandle.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseResource.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_constants.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditioner_should_call_post_pre.hpp>
 
 
 namespace Opm::gpuistl
@@ -50,7 +50,7 @@ namespace Opm::gpuistl
 //!
 //! To use this, use something like the following code:
 //! \code{.cpp}
-//! #include <opm/simulators/linalg/cuistl/PreconditionerConvertFieldTypeAdapter.hpp>
+//! #include <opm/simulators/linalg/gpuistl/PreconditionerConvertFieldTypeAdapter.hpp>
 //! #include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
 //!
 //! using XDouble = Dune::BlockVector<Dune::FieldVector<double, 2>>;

opm/simulators/linalg/gpuistl/SolverAdapter.hpp

@@ -26,12 +26,12 @@
 #include <dune/istl/schwarz.hh>
 #include <dune/istl/solver.hh>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/GpuBlockPreconditioner.hpp>
-#include <opm/simulators/linalg/cuistl/GpuOwnerOverlapCopy.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/PreconditionerAdapter.hpp>
-#include <opm/simulators/linalg/cuistl/detail/has_function.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuBlockPreconditioner.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuOwnerOverlapCopy.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/has_function.hpp>
 
 #ifdef OPEN_MPI
 #if OPEN_MPI

opm/simulators/linalg/gpuistl/detail/CuBlasHandle.cpp

@@ -17,8 +17,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <cublas_v2.h>
-#include <opm/simulators/linalg/cuistl/detail/CuBlasHandle.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cublas_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuBlasHandle.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp>
 namespace Opm::gpuistl::detail
 {
 

opm/simulators/linalg/gpuistl/detail/CuBlasHandle.hpp

@@ -29,7 +29,7 @@ namespace Opm::gpuistl::detail
  *
  * Example use:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/CuBlasHandle.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/CuBlasHandle.hpp>
  * void someFunction() {
  *     auto& cublasHandle = ::Opm::gpuistl::detail::CuBlasHandle::getInstance();
  *     int cuBlasVersion = -1;

opm/simulators/linalg/gpuistl/detail/CuMatrixDescription.hpp

@@ -18,8 +18,8 @@
 */
 #ifndef CU_MATRIX_DESCRIPTION_HPP
 #define CU_MATRIX_DESCRIPTION_HPP
-#include <opm/simulators/linalg/cuistl/detail/CuSparseResource.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseResource.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
 
 namespace Opm::gpuistl::detail
 {

opm/simulators/linalg/gpuistl/detail/CuSparseHandle.cpp

@@ -16,8 +16,8 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <opm/simulators/linalg/cuistl/detail/CuSparseHandle.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseHandle.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
 namespace Opm::gpuistl::detail
 {
 

opm/simulators/linalg/gpuistl/detail/CuSparseHandle.hpp

@@ -29,7 +29,7 @@ namespace Opm::gpuistl::detail
  *
  * Example use:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/CuSparseHandle.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/CuSparseHandle.hpp>
  * void someFunction() {
  *     auto& cuSparseHandle = ::Opm::gpuistl::detail::CuSparseHandle::getInstance();
  *     int cuSparseVersion = -1;

opm/simulators/linalg/gpuistl/detail/CuSparseResource.hpp

@@ -43,7 +43,7 @@ namespace Opm::gpuistl::detail
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulator/linalg/cuistl/detail/CuSparseResource.hpp>
+ * #include <opm/simulator/linalg/gpuistl/detail/CuSparseResource.hpp>
  *
  * void someFunction() {
  *     auto resource = CuSparseResource<cuSparseMatDescr_t>();
@@ -95,5 +95,5 @@ private:
 };
 
 } // namespace Opm::gpuistl::impl
-#include <opm/simulators/linalg/cuistl/detail/CuSparseResource_impl.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseResource_impl.hpp>
 #endif // CUSPARSERESOURCE_HPP

opm/simulators/linalg/gpuistl/detail/CuSparseResource_impl.hpp

@@ -18,7 +18,7 @@
 */
 #include <exception>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
 
 namespace Opm::gpuistl::detail
 {

opm/simulators/linalg/gpuistl/detail/autotuner.hpp

@@ -21,7 +21,7 @@
 #include <limits>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 #include <string>
 #include <utility>
 

opm/simulators/linalg/gpuistl/detail/coloringAndReorderingUtils.hpp

@@ -23,7 +23,7 @@
 #include <memory>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/grid/utility/SparseTable.hpp>
-#include <opm/simulators/linalg/cuistl/detail/safe_conversion.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/safe_conversion.hpp>
 #include <tuple>
 #include <vector>
 /*

opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp

@@ -108,7 +108,7 @@ getCublasErrorMessage(cublasStatus_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cublas_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp>
  * #include <cublas_v2.h>
  *
  * void some_function() {
@@ -147,7 +147,7 @@ cublasSafeCall(cublasStatus_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cublas_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp>
  * #include <cublas_v2.h>
  *
  * void some_function() {
@@ -183,7 +183,7 @@ cublasWarnIfError(cublasStatus_t error,
  * Example usage:
  * @code{.cpp}
  * #include <cublas_v2.h>
- * #include <opm/simulators/linalg/cuistl/detail/cublas_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp>
  *
  * void some_function() {
  *     cublasHandle_t cublasHandle;
@@ -203,7 +203,7 @@ cublasWarnIfError(cublasStatus_t error,
  * Example usage:
  * @code{.cpp}
  * #include <cublas_v2.h>
- * #include <opm/simulators/linalg/cuistl/detail/cublas_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp>
  *
  * void some_function() {
  *     cublasHandle_t cublasHandle;

opm/simulators/linalg/gpuistl/detail/cuda_check_last_error.hpp

@@ -20,7 +20,7 @@
 #define OPM_CUDA_CHECK_LAST_ERROR_HPP
 #include <cuda_runtime.h>
 #include <fmt/core.h>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 
 /**
  * @brief OPM_CUDA_CHECK_DEVICE_SYNCHRONIZE checks the return type of cudaDeviceSynchronize(),
@@ -28,7 +28,7 @@
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cuda_check_last_error.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cuda_check_last_error.hpp>
  *
  * void some_function() {
  *     OPM_CUDA_CHECK_DEVICE_SYNCHRONIZE;
@@ -50,7 +50,7 @@
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
  *
  * void some_function() {
  *     OPM_CUDA_CHECK_DEVICE_SYNCHRONIZE_IF_DEBUG;
@@ -69,7 +69,7 @@
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cuda_check_last_error.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cuda_check_last_error.hpp>
  *
  * void some_function() {
  *     OPM_CUDA_CHECK_LAST_ERROR;
@@ -90,7 +90,7 @@
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cuda_check_last_error.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cuda_check_last_error.hpp>
  *
  * void some_function() {
  *     OPM_CUDA_CHECK_LAST_ERROR_IF_DEBUG;

opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp

@@ -65,7 +65,7 @@ getCudaErrorMessage(cudaError_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
  * #include <cuda_runtime.h>
  *
  * void some_function() {
@@ -102,7 +102,7 @@ cudaSafeCall(cudaError_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
  * #include <cuda_runtime.h>
  *
  * void some_function() {
@@ -136,7 +136,7 @@ cudaWarnIfError(cudaError_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
  * #include <cuda_runtime.h>
  *
  * void some_function() {
@@ -157,7 +157,7 @@ cudaWarnIfError(cudaError_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
  * #include <cuda_runtime.h>
  *
  * void some_function() {

opm/simulators/linalg/gpuistl/detail/cusparse_matrix_operations.cu

@@ -18,9 +18,9 @@
 */
 #include <config.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_matrix_operations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/deviceBlockOperations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/gpuThreadUtils.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_matrix_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/deviceBlockOperations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/gpuThreadUtils.hpp>
 #include <stdexcept>
 
 namespace Opm::gpuistl::detail

opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp

@@ -93,7 +93,7 @@ getCusparseErrorMessage(cusparseStatus_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
  * #include <cublas_v2.h>
  *
  * void some_function() {
@@ -133,7 +133,7 @@ cusparseSafeCall(cusparseStatus_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
  * #include <cublas_v2.h>
  *
  * void some_function() {
@@ -171,7 +171,7 @@ cusparseWarnIfError(cusparseStatus_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
  * #include <cusparse.h>
  *
  * void some_function() {
@@ -191,7 +191,7 @@ cusparseWarnIfError(cusparseStatus_t error,
  *
  * Example usage:
  * @code{.cpp}
- * #include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
+ * #include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
  * #include <cusparse.h>
  *
  * void some_function() {

opm/simulators/linalg/gpuistl/detail/gpuThreadUtils.hpp

@@ -21,7 +21,7 @@
 #include <cstddef>
 #include <cuda.h>
 #include <cuda_runtime.h>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 
 /*
     This file provides some logic for handling how to choose the correct thread-block size

opm/simulators/linalg/gpuistl/detail/preconditionerKernels/DILUKernels.cu

@@ -18,9 +18,9 @@
 */
 #include <config.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/detail/deviceBlockOperations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/gpuThreadUtils.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditionerKernels/DILUKernels.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/deviceBlockOperations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/gpuThreadUtils.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditionerKernels/DILUKernels.hpp>
 #include <stdexcept>
 
 namespace Opm::gpuistl::detail::DILU

opm/simulators/linalg/gpuistl/detail/preconditionerKernels/ILU0Kernels.cu

@@ -18,9 +18,9 @@
 */
 #include <config.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/detail/deviceBlockOperations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/gpuThreadUtils.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditionerKernels/ILU0Kernels.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/deviceBlockOperations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/gpuThreadUtils.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditionerKernels/ILU0Kernels.hpp>
 #include <stdexcept>
 
 /*

opm/simulators/linalg/gpuistl/detail/preconditionerKernels/JacKernels.cu

@@ -18,9 +18,9 @@
 */
 #include <config.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/detail/deviceBlockOperations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/gpuThreadUtils.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditionerKernels/JacKernels.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/deviceBlockOperations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/gpuThreadUtils.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditionerKernels/JacKernels.hpp>
 #include <stdexcept>
 
 namespace Opm::gpuistl::detail::JAC

opm/simulators/linalg/gpuistl/detail/preconditioner_should_call_post_pre.hpp

@@ -20,7 +20,7 @@
 #ifndef OPM_CUISTL_PRECONDIDTIONER_SHOULD_CALL_POST_PRE_HPP
 #define OPM_CUISTL_PRECONDIDTIONER_SHOULD_CALL_POST_PRE_HPP
 
-#include <opm/simulators/linalg/cuistl/detail/has_function.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/has_function.hpp>
 
 namespace Opm::gpuistl::detail
 {

opm/simulators/linalg/gpuistl/detail/vector_operations.cu

@@ -18,12 +18,12 @@
 */
 #include <config.h>
 #include <opm/common/ErrorMacros.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cublas_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cublas_wrapper.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/detail/gpuThreadUtils.hpp>
-#include <opm/simulators/linalg/cuistl/detail/vector_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cublas_wrapper.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/gpuThreadUtils.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/vector_operations.hpp>
 #include <stdexcept>
 namespace Opm::gpuistl::detail
 {

opm/simulators/linalg/gpuistl/set_device.cpp

@@ -19,8 +19,8 @@
 #include <config.h>
 #include <cuda_runtime.h>
 #include <opm/common/OpmLog/OpmLog.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/set_device.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/set_device.hpp>
 namespace Opm::gpuistl
 {
 void

tests/gpuistl/test_GpuBuffer.cu

@@ -23,9 +23,9 @@
 #include <boost/test/unit_test.hpp>
 #include <cuda_runtime.h>
 
-#include <opm/simulators/linalg/cuistl/GpuBuffer.hpp>
-#include <opm/simulators/linalg/cuistl/GpuView.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuBuffer.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuView.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 
 #include <array>
 #include <algorithm>

tests/gpuistl/test_GpuDILU.cpp

@@ -25,11 +25,11 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <memory>
 #include <opm/simulators/linalg/DILU.hpp>
-#include <opm/simulators/linalg/cuistl/GpuDILU.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_matrix_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuDILU.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_matrix_operations.hpp>
 #include <random>
 #include <vector>
 

tests/gpuistl/test_GpuJac.cpp

@@ -23,13 +23,13 @@
 #include <boost/test/unit_test.hpp>
 #include <cuda_runtime.h>
 #include <dune/istl/bcrsmatrix.hh>
-#include <opm/simulators/linalg/cuistl/GpuJac.hpp>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/PreconditionerAdapter.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_matrix_operations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/fix_zero_diagonal.hpp>
-#include <opm/simulators/linalg/cuistl/detail/vector_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuJac.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_matrix_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/fix_zero_diagonal.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/vector_operations.hpp>
 
 using NumericTypes = boost::mpl::list<double, float>;
 

tests/gpuistl/test_GpuOwnerOverlapCopy.cpp

@@ -26,10 +26,10 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/owneroverlapcopy.hh>
 #include <memory>
-#include <opm/simulators/linalg/cuistl/GpuOwnerOverlapCopy.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
-#include <opm/simulators/linalg/cuistl/set_device.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuOwnerOverlapCopy.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/set_device.hpp>
 #include <random>
 #include <mpi.h>
 

tests/gpuistl/test_GpuSeqILU0.cpp

@@ -27,10 +27,10 @@
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/preconditioners.hh>
-#include <opm/simulators/linalg/cuistl/GpuSeqILU0.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/PreconditionerAdapter.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSeqILU0.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 
 #include <limits>
 #include <memory>

tests/gpuistl/test_GpuSparseMatrix.cpp

@@ -23,9 +23,9 @@
 #include <boost/test/unit_test.hpp>
 #include <dune/istl/bcrsmatrix.hh>
 #include <memory>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 #include <random>
 
 BOOST_AUTO_TEST_CASE(TestConstruction1D)

tests/gpuistl/test_GpuVector.cpp

@@ -24,8 +24,8 @@
 #include <cuda_runtime.h>
 #include <dune/common/fvector.hh>
 #include <dune/istl/bvector.hh>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 #include <random>
 
 BOOST_AUTO_TEST_CASE(TestDocumentedUsage)

tests/gpuistl/test_GpuView.cu

@@ -24,9 +24,9 @@
 #include <cuda_runtime.h>
 #include <dune/common/fvector.hh>
 #include <dune/istl/bvector.hh>
-#include <opm/simulators/linalg/cuistl/GpuView.hpp>
-#include <opm/simulators/linalg/cuistl/GpuBuffer.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuView.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuBuffer.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 #include <random>
 #include <array>
 #include <algorithm>

tests/gpuistl/test_converttofloatadapter.cpp

@@ -29,7 +29,7 @@
 #include <dune/istl/preconditioners.hh>
 #include <limits>
 #include <memory>
-#include <opm/simulators/linalg/cuistl/PreconditionerConvertFieldTypeAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerConvertFieldTypeAdapter.hpp>
 
 
 using XDouble = Dune::BlockVector<Dune::FieldVector<double, 2>>;

tests/gpuistl/test_cuSparse_matrix_operations.cpp

@@ -23,12 +23,12 @@
 #include <boost/test/unit_test.hpp>
 #include <cuda_runtime.h>
 #include <dune/istl/bcrsmatrix.hh>
-#include <opm/simulators/linalg/cuistl/GpuSparseMatrix.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/PreconditionerAdapter.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_matrix_operations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/fix_zero_diagonal.hpp>
-#include <opm/simulators/linalg/cuistl/detail/preconditionerKernels/JacKernels.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuSparseMatrix.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_matrix_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/fix_zero_diagonal.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/preconditionerKernels/JacKernels.hpp>
 
 using NumericTypes = boost::mpl::list<double, float>;
 

tests/gpuistl/test_cuVector_operations.cpp

@@ -23,11 +23,11 @@
 #include <boost/test/unit_test.hpp>
 #include <cuda_runtime.h>
 #include <dune/istl/bcrsmatrix.hh>
-#include <opm/simulators/linalg/cuistl/GpuJac.hpp>
-#include <opm/simulators/linalg/cuistl/GpuVector.hpp>
-#include <opm/simulators/linalg/cuistl/PreconditionerAdapter.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_matrix_operations.hpp>
-#include <opm/simulators/linalg/cuistl/detail/vector_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuJac.hpp>
+#include <opm/simulators/linalg/gpuistl/GpuVector.hpp>
+#include <opm/simulators/linalg/gpuistl/PreconditionerAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_matrix_operations.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/vector_operations.hpp>
 
 using NumericTypes = boost::mpl::list<double, float>;
 

tests/gpuistl/test_cublas_handle.cpp

@@ -16,14 +16,14 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "opm/simulators/linalg/cuistl/detail/cublas_safe_call.hpp"
+#include "opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp"
 #include <config.h>
 
 #define BOOST_TEST_MODULE TestCublasHandle
 
 #include <cuda_runtime.h>
 #include <boost/test/unit_test.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuBlasHandle.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuBlasHandle.hpp>
 
 BOOST_AUTO_TEST_CASE(TestGetCublasVersion)
 {

tests/gpuistl/test_cublas_safe_call.cpp

@@ -22,7 +22,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <cublas_v2.h>
-#include <opm/simulators/linalg/cuistl/detail/cublas_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cublas_safe_call.hpp>
 
 BOOST_AUTO_TEST_CASE(TestCreateHandle)
 {

tests/gpuistl/test_cuda_check_last_error.cpp

@@ -21,7 +21,7 @@
 #define BOOST_TEST_MODULE TestCudaCheckLastError
 
 #include <boost/test/unit_test.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cuda_check_last_error.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_check_last_error.hpp>
 
 
 BOOST_AUTO_TEST_CASE(TestNoThrowLastError)

tests/gpuistl/test_cuda_safe_call.cpp

@@ -21,7 +21,7 @@
 #define BOOST_TEST_MODULE TestCudaSafeCall
 #include <boost/test/unit_test.hpp>
 #include <cuda_runtime.h>
-#include <opm/simulators/linalg/cuistl/detail/cuda_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cuda_safe_call.hpp>
 
 BOOST_AUTO_TEST_CASE(TestCudaMalloc)
 {

tests/gpuistl/test_cusparse_handle.cpp

@@ -21,8 +21,8 @@
 #define BOOST_TEST_MODULE TestSparseHandle
 
 #include <boost/test/unit_test.hpp>
-#include <opm/simulators/linalg/cuistl/detail/CuSparseHandle.hpp>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/CuSparseHandle.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
 
 BOOST_AUTO_TEST_CASE(TestGetSparseVersion)
 {

tests/gpuistl/test_cusparse_safe_call.cpp

@@ -22,7 +22,7 @@
 
 #include <boost/test/unit_test.hpp>
 #include <cusparse.h>
-#include <opm/simulators/linalg/cuistl/detail/cusparse_safe_call.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/cusparse_safe_call.hpp>
 
 BOOST_AUTO_TEST_CASE(TestCreateHandle)
 {

tests/gpuistl/test_safe_conversion.cpp

@@ -21,7 +21,7 @@
 #define BOOST_TEST_MODULE TestSafeConversion
 
 #include <boost/test/unit_test.hpp>
-#include <opm/simulators/linalg/cuistl/detail/safe_conversion.hpp>
+#include <opm/simulators/linalg/gpuistl/detail/safe_conversion.hpp>
 
 BOOST_AUTO_TEST_CASE(TestToIntThrowsOutofRange)
 {

tests/gpuistl/test_solver_adapter.cpp

@@ -24,7 +24,7 @@
 #include <dune/istl/solvers.hh>
 #include <opm/simulators/linalg/PreconditionerFactory.hpp>
 #include <opm/simulators/linalg/PropertyTree.hpp>
-#include <opm/simulators/linalg/cuistl/SolverAdapter.hpp>
+#include <opm/simulators/linalg/gpuistl/SolverAdapter.hpp>
 
 static const constexpr int dim = 3;
 using Matrix = Dune::BCRSMatrix<Dune::FieldMatrix<double, dim, dim>>;