saberbud/ceres-solver
1
0
Fork 0
mirror of https://github.com/ceres-solver/ceres-solver.git synced 2026-08-29 08:34:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix checks for CUDA memory pools support

Browse Source 
Change-Id: Icc07625fc0e586e8798da48fa5edfde59487d702
This commit is contained in:
Dmitriy Korchemkin
2023-10-04 13:36:13 +00:00
parent 94335e3b9e
commit 8d875a312c
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ceres/context_impl.cc
+11 -1
View File
@@ -102,7 +102,9 @@ std::string ContextImpl::CudaConfigAsString() const {
gpu_device_properties_.maxGridSize[1],
gpu_device_properties_.maxGridSize[2],
gpu_device_properties_.multiProcessorCount,
gpu_device_properties_.memoryPoolsSupported ? "Yes" : "No");
// In CUDA 12.0.0+ cudaDeviceProp has field memoryPoolsSupported, but it
// is not available in older versions
is_cuda_memory_pools_supported_ ? "Yes" : "No");
}
size_t ContextImpl::GpuMemoryAvailable() const {
@@ -123,6 +125,14 @@ bool ContextImpl::InitCuda(std::string* message) {
CHECK_EQ(
cudaGetDeviceProperties(&gpu_device_properties_, gpu_device_id_in_use_),
cudaSuccess);
#if CUDART_VERSION >= 11020
int is_cuda_memory_pools_supported;
CHECK_EQ(cudaDeviceGetAttribute(&is_cuda_memory_pools_supported,
cudaDevAttrMemoryPoolsSupported,
gpu_device_id_in_use_),
cudaSuccess);
is_cuda_memory_pools_supported_ = is_cuda_memory_pools_supported == 1;
#endif
VLOG(3) << "\n" << CudaConfigAsString();
EventLogger event_logger("InitCuda");
if (cublasCreate(&cublas_handle_) != CUBLAS_STATUS_SUCCESS) {
internal/ceres/context_impl.h
+1
View File
@@ -134,6 +134,7 @@ class CERES_NO_EXPORT ContextImpl final : public Context {
bool is_cuda_initialized_ = false;
int gpu_device_id_in_use_ = -1;
cudaDeviceProp gpu_device_properties_;
bool is_cuda_memory_pools_supported_ = false;
int cuda_version_major_ = 0;
int cuda_version_minor_ = 0;
#endif // CERES_NO_CUDA
internal/ceres/cuda_block_sparse_crs_view.cc
+1 -1
View File
@@ -52,7 +52,7 @@ CudaBlockSparseCRSView::CudaBlockSparseCRSView(const BlockSparseMatrix& bsm,
rows.data(),
cols.data(),
context->DefaultStream(),
context);
context->is_cuda_memory_pools_supported_);
is_crs_compatible_ = block_structure_->IsCrsCompatible();
// if matrix is crs-compatible - we can drop block-structure and don't need
// streamed_buffer_
internal/ceres/cuda_kernels_bsm_to_crs.cu.cc
+6 -6
View File
@@ -55,11 +55,11 @@ void* CudaMalloc(size_t size,
cudaStream_t stream,
bool memory_pools_supported) {
void* data = nullptr;
// Stream-ordered alloaction API is available since CUDA 11.4, but might be
// Stream-ordered alloaction API is available since CUDA 11.2, but might be
// not implemented by particular device
#if CUDART_VERSION < 11040
#if CUDART_VERSION < 11020
#warning \
"Stream-ordered allocations are unavailable, consider updating CUDA toolkit to version 11.4+"
"Stream-ordered allocations are unavailable, consider updating CUDA toolkit to version 11.2+"
cudaMalloc(&data, size);
#else
if (memory_pools_supported) {
@@ -72,11 +72,11 @@ void* CudaMalloc(size_t size,
}
void CudaFree(void* data, cudaStream_t stream, bool memory_pools_supported) {
// Stream-ordered alloaction API is available since CUDA 11.4, but might be
// Stream-ordered alloaction API is available since CUDA 11.2, but might be
// not implemented by particular device
#if CUDART_VERSION < 11040
#if CUDART_VERSION < 11020
#warning \
"Stream-ordered allocations are unavailable, consider updating CUDA toolkit to version 11.4+"
"Stream-ordered allocations are unavailable, consider updating CUDA toolkit to version 11.2+"
cudaSuccess, cudaFree(data);
#else
if (memory_pools_supported) {
internal/ceres/cuda_partitioned_block_sparse_crs_view.cc
+1 -1
View File
@@ -80,7 +80,7 @@ CudaPartitionedBlockSparseCRSView::CudaPartitionedBlockSparseCRSView(
rows_f.data(),
cols_f.data(),
context->DefaultStream(),
context);
context->is_cuda_memory_pools_supported_);
f_is_crs_compatible_ = block_structure_->IsCrsCompatible();
if (f_is_crs_compatible_) {
block_structure_ = nullptr;