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

instability debuggin in progress

Browse Source
This commit is contained in:
Paul Leroy
2024-02-13 16:44:10 +01:00
parent a01d4a81fd
commit c3e1baf6fc
5 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ContextBasedFeature.cpp
+1 -1
View File
@@ -260,7 +260,7 @@ bool ContextBasedFeature::prepare( const CorePoints& corePoints,
if (cancelled)
{
//process cancelled by the user
errorMessage = "Process cancelled";
errorMessage = "[ContextBasedFeature] Process cancelled";
}
}
}
PointFeature.cpp
+2 -2
View File
@@ -425,7 +425,7 @@ static bool ComputeMathOpWithNearestNeighbor( const CorePoints& corePoints,
#ifndef _DEBUG
#if defined(_OPENMP)
bool cancelled = false;
#pragma omp parallel for num_threads(omp_get_max_threads())
#pragma omp parallel for
#endif
#endif
for (int i = 0; i < static_cast<int>(pointCount); ++i)
@@ -479,7 +479,7 @@ static bool ComputeMathOpWithNearestNeighbor( const CorePoints& corePoints,
if (cancelled)
{
//process cancelled by the user
error = "Process cancelled";
error = "[Point feature] Process cancelled";
}
}
}
q3DMASC.cpp
+2 -2
View File
@@ -618,11 +618,11 @@ void q3DMASCPlugin::doTrainAction()
//prepare the features and the test cloud
if (!toPrepareTest.empty())
{
progressDlg.show();
QString error;
masc::CorePoints corePointsTest;
corePointsTest.cloud = corePointsTest.origin = testCloud;
corePointsTest.role = mainCloudLabel;
progressDlg.show();
QString error;
if (!masc::Tools::PrepareFeatures(corePointsTest, toPrepareTest, error, &progressDlg, &generatedScalarFieldsTest))
{
m_app->dispToConsole(error, ccMainAppInterface::ERR_CONSOLE_MESSAGE);
q3DMASCClassifier.cpp
+1 -1
View File
@@ -210,7 +210,7 @@ bool Classifier::classify( const Feature::Source::Set& featureSources,
#ifndef _DEBUG
#if defined(_OPENMP)
bool cancelled = false;
#pragma omp parallel for num_threads(omp_get_max_threads())
#pragma omp parallel for
#endif
#endif
for (int i = 0; i < static_cast<int>(cloud->size()); ++i)
q3DMASCTools.cpp
+20 -10
View File
@@ -1236,16 +1236,16 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
#ifndef _DEBUG
#if defined(_OPENMP)
int num_threads = omp_get_max_threads();
ccLog::Print("Using OpenMP with " + QString::number(num_threads) + " threads ");
bool cancelled = false;
#pragma omp parallel for num_threads(num_threads)
#pragma omp parallel for
#endif
#endif
for (int i = 0; i < static_cast<int>(pointCount); ++i)
{
if (!cancelled)
{
QString localErrorStr;
//spherical neighborhood extraction structure
CCCoreLib::DgmOctree::NearestNeighboursSearchStruct nNSS;
{
@@ -1329,7 +1329,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
if (!feature->computeValue(nNSS.pointsInNeighbourhood, nNSS.queryPoint, outputValue))
{
//an error occurred
errorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud1->getName();
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud1->getName();
success = false;
break;
}
@@ -1345,7 +1345,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
if (!feature->computeValue(nNSS.pointsInNeighbourhood, nNSS.queryPoint, outputValue))
{
//an error occurred
errorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud2->getName();
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud2->getName();
success = false;
break;
}
@@ -1364,7 +1364,7 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
if (!feature->computeValue(nNSS.pointsInNeighbourhood, nNSS.queryPoint, outputValue))
{
//an error occurred
errorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud1->getName();
localErrorStr = "An error occurred during the computation of feature " + feature->toString() + "on cloud " + feature->cloud1->getName();
success = false;
break;
}
@@ -1375,24 +1375,34 @@ bool Tools::PrepareFeatures(const CorePoints& corePoints, Feature::Set& features
if (!success)
{
break;
ccLog::Warning(localErrorStr);
ccLog::Warning("(!success) with currentScale " + QString::number(currentScale) + " point " + QString::number(i));
}
} //for each scale
}
if (!success)
{
mutex.lock();
cancelled = true;
errorStr = "Process cancelled (features computation not successful), point " + QString::number(i) + " (using OpenMP with " + QString::number(omp_get_num_threads()) + " threads)";
ccLog::Warning(errorStr);
mutex.unlock();
}
if (progressCb)
{
mutex.lock();
cancelled = !nProgress.oneStep();
mutex.unlock();
if (cancelled)
{
//process cancelled by the user
ccLog::Warning("Process cancelled");
errorStr = "Process cancelled, iteration " + QString::number(i);
errorStr = "Process cancelled, point " + QString::number(i) + " (using OpenMP with " + QString::number(omp_get_num_threads()) + " threads)";
ccLog::Warning(errorStr);
success = false;
}
mutex.unlock();
}
}
} //for each point