Skip to content

Fix memory access errors in CPU build. #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shakedregev merged 1 commit into from
May 30, 2025
Merged

Fix memory access errors in CPU build. #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resolve/vector/Vector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ namespace ReSolve { namespace vector {
*/
Vector::~Vector()
{
if (owns_cpu_data_) delete [] h_data_;
if (owns_gpu_data_) mem_.deleteOnDevice(d_data_);
if (owns_cpu_data_ && h_data_) delete [] h_data_;
if (owns_gpu_data_ && d_data_) mem_.deleteOnDevice(d_data_);
}


Expand Down
4 changes: 2 additions & 2 deletions tests/functionality/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ add_test(NAME rand_gmres_test COMMAND $<TARGET_FILE:rand_gmres_test.exe>)

if(RESOLVE_USE_KLU)
# Using KLU as refactorization solver
add_test(NAME klu_klu_test COMMAND $<TARGET_FILE:klu_klu_test.exe> "${test_data_dir}" "-d" "${test_data_dir}")
add_test(NAME klu_klu_ir_test COMMAND $<TARGET_FILE:klu_klu_test.exe> "${test_data_dir}" "-d" "${test_data_dir}" "-i")
add_test(NAME klu_klu_test COMMAND $<TARGET_FILE:klu_klu_test.exe> "-d" "${test_data_dir}")
add_test(NAME klu_klu_ir_test COMMAND $<TARGET_FILE:klu_klu_test.exe> "-d" "${test_data_dir}" "-i")

# CUDA-SDK specific tests
if(RESOLVE_USE_CUDA)
Expand Down
5 changes: 1 addition & 4 deletions tests/functionality/testKlu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ int runTest(int argc, char *argv[], std::string& solver_name)
return -1;
}
ReSolve::matrix::Csr* A = ReSolve::io::createCsrFromFile(mat1);
A->syncData(ReSolve::memory::DEVICE);
mat1.close();

// Read first rhs vector
Expand All @@ -108,7 +107,6 @@ int runTest(int argc, char *argv[], std::string& solver_name)
real_type* rhs = ReSolve::io::createArrayFromFile(rhs1_file);
vector_type vec_rhs(A->getNumRows());
vec_rhs.copyDataFrom(rhs, ReSolve::memory::HOST, ReSolve::memory::HOST);
vec_rhs.syncData(ReSolve::memory::DEVICE);
rhs1_file.close();

// Allocate the solution vector
Expand Down Expand Up @@ -162,7 +160,6 @@ int runTest(int argc, char *argv[], std::string& solver_name)
return -1;
}
ReSolve::io::updateMatrixFromFile(mat2, A);
A->syncData(ReSolve::memory::DEVICE);
mat2.close();

// Load the second rhs vector
Expand All @@ -174,7 +171,7 @@ int runTest(int argc, char *argv[], std::string& solver_name)
}
ReSolve::io::updateArrayFromFile(rhs2_file, &rhs);
rhs2_file.close();
vec_rhs.copyDataFrom(rhs, ReSolve::memory::HOST, ReSolve::memory::DEVICE);
vec_rhs.copyDataFrom(rhs, ReSolve::memory::HOST, ReSolve::memory::HOST);

status = KLU.refactorize();
error_sum += status;
Expand Down