Merge pull request #34 from alicevision/dev_pinErrorMsg

fabiencastan · web-flow · commit 8992a05407c7 · 2018-02-13T15:16:54.000+01:00
More detailed error message on memory allocation failure
diff --git a/src/popsift/features.cu b/src/popsift/features.cu
@@ -103,12 +103,16 @@ void FeaturesHost::pin( )
     if( err != cudaSuccess ) {
         cerr << __FILE__ << ":" << __LINE__ << " Runtime warning:" << endl
              << "    Failed to register feature memory in CUDA." << endl
+             << "    Features count: " << getFeatureCount() << endl
+             << "    Memory size requested: " << getFeatureCount() * sizeof(Feature) << endl
              << "    " << cudaGetErrorString(err) << endl;
     }
     err = cudaHostRegister( _ori, getDescriptorCount() * sizeof(Descriptor), 0 );
     if( err != cudaSuccess ) {
         cerr << __FILE__ << ":" << __LINE__ << " Runtime warning:" << endl
              << "    Failed to register descriptor memory in CUDA." << endl
+             << "    Descriptors count: " << getDescriptorCount() << endl
+             << "    Memory size requested: " << getDescriptorCount() * sizeof(Descriptor) << endl
              << "    " << cudaGetErrorString(err) << endl;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -103,12 +103,16 @@ void FeaturesHost::pin( )`
`103`	`103`	`if( err != cudaSuccess ) {`
`104`	`104`	`cerr << __FILE__ << ":" << __LINE__ << " Runtime warning:" << endl`
`105`	`105`	`<< " Failed to register feature memory in CUDA." << endl`
	`106`	`+ << " Features count: " << getFeatureCount() << endl`
	`107`	`+ << " Memory size requested: " << getFeatureCount() * sizeof(Feature) << endl`
`106`	`108`	`<< " " << cudaGetErrorString(err) << endl;`
`107`	`109`	`}`
`108`	`110`	`err = cudaHostRegister( _ori, getDescriptorCount() * sizeof(Descriptor), 0 );`
`109`	`111`	`if( err != cudaSuccess ) {`
`110`	`112`	`cerr << __FILE__ << ":" << __LINE__ << " Runtime warning:" << endl`
`111`	`113`	`<< " Failed to register descriptor memory in CUDA." << endl`
	`114`	`+ << " Descriptors count: " << getDescriptorCount() << endl`
	`115`	`+ << " Memory size requested: " << getDescriptorCount() * sizeof(Descriptor) << endl`
`112`	`116`	`<< " " << cudaGetErrorString(err) << endl;`
`113`	`117`	`}`
`114`	`118`	`}`