Skip to content

Please consider the following formatting changes to #14801 #46

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

Closed
alibuild wants to merge 2 commits into from
Closed

Please consider the following formatting changes to #14801 #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9924114
Fix compatibility with CUDA13
mpuccio Nov 7, 2025
fe98015
Please consider the following formatting changes
alibuild Nov 7, 2025
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
13 changes: 8 additions & 5 deletions GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ int32_t GPUReconstructionCUDA::InitDevice_Runtime()

if (mMaster == nullptr) {
cudaDeviceProp deviceProp;
int deviceMemoryClockRate{0}, deviceClockRate{0};
int32_t count, bestDevice = -1;
double bestDeviceSpeed = -1, deviceSpeed;
if (GPUChkErrI(cudaGetDeviceCount(&count))) {
Expand Down Expand Up @@ -153,7 +154,9 @@ int32_t GPUReconstructionCUDA::InitDevice_Runtime()
if (GetProcessingSettings().debugLevel >= 4) {
GPUInfo("Obtained current memory usage for device %d", i);
}
if (GPUChkErrI(cudaGetDeviceProperties(&deviceProp, i))) {
if (GPUChkErrI(cudaGetDeviceProperties(&deviceProp, i)) ||
GPUChkErrI(cudaDeviceGetAttribute(&deviceMemoryClockRate, cudaDevAttrMemoryClockRate, i)) ||
GPUChkErrI(cudaDeviceGetAttribute(&deviceClockRate, cudaDevAttrClockRate, i))) {
continue;
}
if (GetProcessingSettings().debugLevel >= 4) {
Expand All @@ -172,7 +175,7 @@ int32_t GPUReconstructionCUDA::InitDevice_Runtime()
deviceFailure = "Insufficient GPU memory";
}

deviceSpeed = (double)deviceProp.multiProcessorCount * (double)deviceProp.clockRate * (double)deviceProp.warpSize * (double)free * (double)deviceProp.major * (double)deviceProp.major;
deviceSpeed = (double)deviceProp.multiProcessorCount * (double)deviceClockRate * (double)deviceProp.warpSize * (double)free * (double)deviceProp.major * (double)deviceProp.major;
if (GetProcessingSettings().debugLevel >= 2) {
GPUImportant("Device %s%2d: %s (Rev: %d.%d - Mem Avail %lu / %lu)%s %s", deviceOK ? " " : "[", i, deviceProp.name, deviceProp.major, deviceProp.minor, free, (size_t)deviceProp.totalGlobalMem, deviceOK ? " " : " ]", deviceOK ? "" : deviceFailure);
}
Expand Down Expand Up @@ -239,8 +242,8 @@ int32_t GPUReconstructionCUDA::InitDevice_Runtime()
GPUInfo("\ttotalConstMem = %ld", (uint64_t)deviceProp.totalConstMem);
GPUInfo("\tmajor = %d", deviceProp.major);
GPUInfo("\tminor = %d", deviceProp.minor);
GPUInfo("\tclockRate = %d", deviceProp.clockRate);
GPUInfo("\tmemoryClockRate = %d", deviceProp.memoryClockRate);
GPUInfo("\tclockRate = %d", deviceClockRate);
GPUInfo("\tdeviceMemoryClockRateRate = %d", deviceMemoryClockRate);
GPUInfo("\tmultiProcessorCount = %d", deviceProp.multiProcessorCount);
GPUInfo("\ttextureAlignment = %ld", (uint64_t)deviceProp.textureAlignment);
GPUInfo(" ");
Expand Down Expand Up @@ -371,7 +374,7 @@ int32_t GPUReconstructionCUDA::InitDevice_Runtime()
#endif
mDeviceConstantMem = (GPUConstantMem*)devPtrConstantMem;

GPUInfo("CUDA Initialisation successfull (Device %d: %s (Frequency %d, Cores %d), %ld / %ld bytes host / global memory, Stack frame %d, Constant memory %ld)", mDeviceId, deviceProp.name, deviceProp.clockRate, deviceProp.multiProcessorCount, (int64_t)mHostMemorySize, (int64_t)mDeviceMemorySize, (int32_t)GPUCA_GPU_STACK_SIZE, (int64_t)gGPUConstantMemBufferSize);
GPUInfo("CUDA Initialisation successfull (Device %d: %s (Frequency %d, Cores %d), %ld / %ld bytes host / global memory, Stack frame %d, Constant memory %ld)", mDeviceId, deviceProp.name, deviceClockRate, deviceProp.multiProcessorCount, (int64_t)mHostMemorySize, (int64_t)mDeviceMemorySize, (int32_t)GPUCA_GPU_STACK_SIZE, (int64_t)gGPUConstantMemBufferSize);
} else {
GPUReconstructionCUDA* master = dynamic_cast<GPUReconstructionCUDA*>(mMaster);
mDeviceId = master->mDeviceId;
Expand Down
Loading