Skip to content

Commit 5a5a6fb

Browse files
committed
Auxiliary tasks should not be foreground tasks
1 parent d4e9de3 commit 5a5a6fb

2 files changed

Lines changed: 17 additions & 5 deletions

File tree

src/Common/TsneAnalysis.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -656,10 +656,10 @@ void TsneAnalysis::startComputation()
656656

657657
TsneWorkerTasks::TsneWorkerTasks(QObject* parent, mv::Task* parentTask) :
658658
QObject(parent),
659-
_initializeOffScreenBufferTask(this, "Initialize off-screen GPGPU buffer", Task::GuiScopes{ Task::GuiScope::DataHierarchy, Task::GuiScope::Foreground }, Task::Status::Idle),
660-
_computingSimilaritiesTask(this, "Compute similarities", Task::GuiScopes{ Task::GuiScope::DataHierarchy, Task::GuiScope::Foreground }, Task::Status::Idle),
661-
_initializeTsneTask(this, "Initialize TSNE", Task::GuiScopes{ Task::GuiScope::DataHierarchy, Task::GuiScope::Foreground }, Task::Status::Idle),
662-
_computeGradientDescentTask(this, "Compute gradient descent", Task::GuiScopes{ Task::GuiScope::DataHierarchy, Task::GuiScope::Foreground }, Task::Status::Idle)
659+
_initializeOffScreenBufferTask(this, "Initialize off-screen GPGPU buffer", Task::GuiScopes{ Task::GuiScope::DataHierarchy }, Task::Status::Idle),
660+
_computingSimilaritiesTask(this, "Compute similarities", Task::GuiScopes{ Task::GuiScope::DataHierarchy }, Task::Status::Idle),
661+
_initializeTsneTask(this, "Initialize TSNE", Task::GuiScopes{ Task::GuiScope::DataHierarchy }, Task::Status::Idle),
662+
_computeGradientDescentTask(this, "Compute gradient descent", Task::GuiScopes{ Task::GuiScope::DataHierarchy }, Task::Status::Idle)
663663
{
664664
_initializeOffScreenBufferTask.setParentTask(parentTask);
665665
_computingSimilaritiesTask.setParentTask(parentTask);

src/DualAnalysisPlugin.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,10 @@ DualAnalysisPlugin::~DualAnalysisPlugin()
9494
void DualAnalysisPlugin::init()
9595
{
9696
_datasetB = getInputDataset<Points>();// assume the input dataset is a cell by gene matrix
97-
97+
qDebug() << "input dataset B: " << _datasetB->getGuiName();
9898
if (!outputDataInit())
9999
{
100+
qDebug() << "output data initialization failed";
100101
transposeData();
101102

102103
initializeEmbeddingA();
@@ -112,13 +113,16 @@ void DualAnalysisPlugin::init()
112113
void DualAnalysisPlugin::transposeData()
113114
{
114115
const auto inputPoints = getInputDataset<Points>();
116+
qDebug() << "input dataset: " << inputPoints->getGuiName();
115117

116118
// Retrieve the number of points and dimensions
117119
const auto numPoints = inputPoints->getNumPoints();
118120
const auto numDimensions = inputPoints->getNumDimensions();
121+
qDebug() << "numPoints: " << numPoints << " numDimensions: " << numDimensions;
119122

120123
// Create a vector to store the transposed data
121124
QVector<float> transposedData(numPoints * numDimensions);
125+
qDebug() << "transposedData vector initialized";
122126

123127
// Transposing the data
124128
#pragma omp parallel for
@@ -129,7 +133,15 @@ void DualAnalysisPlugin::transposeData()
129133
// Correct indexing for the transposed data
130134
transposedData[j * numPoints + i] = inputPoints->getValueAt(i * numDimensions + j);
131135
}
136+
137+
// Progress reporting
138+
if (i % 100 == 0)
139+
{
140+
qDebug() << "Transposing data: " << i << " / " << numPoints;
141+
}
142+
132143
}
144+
qDebug() << "transposed vector generated";
133145

134146
_datasetA = mv::data().createDataset<Points>("Points", "Transposed Data");
135147

0 commit comments

Comments
 (0)