Two minor fixes 1. In cuda_sparse_matrix.cc fix the order of fields in the initializer list. 2. Move a line of code to the ifdef branch which will use it. Change-Id: If32ea14a287f845c1740e6f726c1007e86a4eeca
diff --git a/internal/ceres/block_sparse_matrix.cc b/internal/ceres/block_sparse_matrix.cc index f86666c..2e67593 100644 --- a/internal/ceres/block_sparse_matrix.cc +++ b/internal/ceres/block_sparse_matrix.cc
@@ -833,12 +833,11 @@ #ifndef CERES_NO_CUDA CHECK_EQ(cudaSuccess, cudaFreeHost(values)); + values = nullptr; #else LOG(FATAL) << "Page locked memory requested when CUDA is not available. " << "This is a Ceres bug; please contact the developers!"; #endif - - values = nullptr; }; } // namespace ceres::internal
diff --git a/internal/ceres/cuda_sparse_matrix.cc b/internal/ceres/cuda_sparse_matrix.cc index e9ca9cc..905b4ab 100644 --- a/internal/ceres/cuda_sparse_matrix.cc +++ b/internal/ceres/cuda_sparse_matrix.cc
@@ -63,14 +63,14 @@ int num_cols, int num_nonzeros, ContextImpl* context) - : context_(context), + : num_rows_(num_rows), + num_cols_(num_cols), + num_nonzeros_(num_nonzeros), + context_(context), rows_(context, num_rows + 1), cols_(context, num_nonzeros), values_(context, num_nonzeros), - spmv_buffer_(context), - num_rows_(num_rows), - num_cols_(num_cols), - num_nonzeros_(num_nonzeros) { + spmv_buffer_(context) { cusparseCreateCsr(&descr_, num_rows_, num_cols_,