diff --git a/resolve/LinSolverIterativeRandFGMRES.cpp b/resolve/LinSolverIterativeRandFGMRES.cpp index d7d21cc82..d547f34e4 100644 --- a/resolve/LinSolverIterativeRandFGMRES.cpp +++ b/resolve/LinSolverIterativeRandFGMRES.cpp @@ -497,7 +497,7 @@ namespace ReSolve if (is_flexible) { vec_Z_ = new vector_type(n_, restart_ + 1); } else { - // otherwise Z is just a one vector, not multivector and we dont keep it + // otherwise Z is just one vector, not a multivector and we don't keep it vec_Z_ = new vector_type(n_); } vec_Z_->allocate(memspace_); diff --git a/resolve/cpu/CpuMemory.hpp b/resolve/cpu/CpuMemory.hpp index e481be973..c9f01c1d0 100644 --- a/resolve/cpu/CpuMemory.hpp +++ b/resolve/cpu/CpuMemory.hpp @@ -1,7 +1,8 @@ #pragma once - +#include #include + namespace ReSolve { namespace memory @@ -43,6 +44,7 @@ namespace ReSolve static int deleteOnDevice(void* /* v */) { ReSolve::io::Logger::error() << "Trying to delete on a GPU device, but GPU support not available.\n"; + assert(false && "Trying to delete on a GPU device, but GPU support not available."); return -1; } diff --git a/resolve/vector/Vector.cpp b/resolve/vector/Vector.cpp index 368bbe131..374a22e1c 100644 --- a/resolve/vector/Vector.cpp +++ b/resolve/vector/Vector.cpp @@ -495,8 +495,8 @@ namespace ReSolve { namespace vector { */ int Vector::resize(index_type new_n_size) { - assert(owns_cpu_data_ && owns_gpu_data_ - && "Cannot resize if vector is not owning the data."); + assert(owns_cpu_data_ || owns_gpu_data_ + && "Cannot resize if vector does not own data."); if (new_n_size > n_capacity_) { out::error() << "Trying to resize vector to " << new_n_size diff --git a/resolve/vector/Vector.hpp b/resolve/vector/Vector.hpp index 9a17f2bc4..8da10c655 100644 --- a/resolve/vector/Vector.hpp +++ b/resolve/vector/Vector.hpp @@ -61,7 +61,7 @@ namespace ReSolve { namespace vector { bool gpu_updated_{false}; ///< DEVICE data flag (updated or not) bool cpu_updated_{false}; ///< HOST data flag (updated or not) - bool owns_gpu_data_{true}; ///< data owneship flag for DEVICE data + bool owns_gpu_data_{false}; ///< data owneship flag for DEVICE data bool owns_cpu_data_{true}; ///< data ownership flag for HOST data MemoryHandler mem_; ///< Device memory manager object diff --git a/tests/functionality/testRandGmres.cpp b/tests/functionality/testRandGmres.cpp index 631e8a512..7b047868b 100644 --- a/tests/functionality/testRandGmres.cpp +++ b/tests/functionality/testRandGmres.cpp @@ -107,7 +107,6 @@ int runTest(int argc, char *argv[]) vector_type* vec_rhs = generateRhs(n, memspace); vector_type vec_x(A->getNumRows()); - vec_x.allocate(memory::HOST); vec_x.allocate(memspace); vec_x.setToZero(memspace);