GPU: Memory size of slaves must not be overridden

davidrohr · davidrohr · commit 7d86cc2fcd70 · 2021-03-30T18:37:34.000+02:00
diff --git a/GPU/GPUTracking/Base/GPUReconstructionCPU.cxx b/GPU/GPUTracking/Base/GPUReconstructionCPU.cxx
@@ -156,10 +156,10 @@ int GPUReconstructionCPU::GetThread()
 int GPUReconstructionCPU::InitDevice()
 {
   if (mProcessingSettings.memoryAllocationStrategy == GPUMemoryResource::ALLOCATION_GLOBAL) {
-    if (mDeviceMemorySize > mHostMemorySize) {
-      mHostMemorySize = mDeviceMemorySize;
-    }
     if (mMaster == nullptr) {
+      if (mDeviceMemorySize > mHostMemorySize) {
+        mHostMemorySize = mDeviceMemorySize;
+      }
       mHostMemoryBase = operator new(mHostMemorySize GPUCA_OPERATOR_NEW_ALIGNMENT);
     }
     mHostMemoryPermanent = mHostMemoryBase;

Original file line number	Diff line number	Diff line change
`@@ -156,10 +156,10 @@ int GPUReconstructionCPU::GetThread()`
`156`	`156`	`int GPUReconstructionCPU::InitDevice()`
`157`	`157`	`{`
`158`	`158`	`if (mProcessingSettings.memoryAllocationStrategy == GPUMemoryResource::ALLOCATION_GLOBAL) {`
`159`		`- if (mDeviceMemorySize > mHostMemorySize) {`
`160`		`- mHostMemorySize = mDeviceMemorySize;`
`161`		`- }`
`162`	`159`	`if (mMaster == nullptr) {`
	`160`	`+ if (mDeviceMemorySize > mHostMemorySize) {`
	`161`	`+ mHostMemorySize = mDeviceMemorySize;`
	`162`	`+ }`
`163`	`163`	`mHostMemoryBase = operator new(mHostMemorySize GPUCA_OPERATOR_NEW_ALIGNMENT);`
`164`	`164`	`}`
`165`	`165`	`mHostMemoryPermanent = mHostMemoryBase;`