Skip to content

Commit becb552

Browse files
breakanalysisadamnsch
authored andcommitted
Make various LP tasks use setSteps
Co-Authored-By: Adam Schill Collberg<adam.schill.collberg@protonmail.com>
1 parent bdaf901 commit becb552

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

ml/ml-algo/src/main/java/org/neo4j/gds/ml/metrics/SignedProbabilities.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public static SignedProbabilities computeFromLabeledData(
119119
TerminationFlag terminationFlag,
120120
ProgressTracker progressTracker
121121
) {
122-
progressTracker.setVolume(features.size());
122+
progressTracker.setSteps(features.size());
123123

124124
var signedProbabilities = SignedProbabilities.create(evaluationQueue.totalSize());
125125

@@ -134,7 +134,7 @@ public static SignedProbabilities computeFromLabeledData(
134134

135135
signedProbabilities.add(probabilityOfPositiveEdge, isEdge);
136136
}
137-
progressTracker.logProgress(batch.size());
137+
progressTracker.logSteps(batch.size());
138138
},
139139
terminationFlag
140140
);

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/linkPipeline/BatchLinkFeatureExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void run() {
6161
}));
6262
});
6363

64-
progressTracker.logProgress(partition.totalDegree());
64+
progressTracker.logSteps(partition.totalDegree());
6565
}
6666
}
6767

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/linkPipeline/train/LinkFeaturesAndLabelsExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static FeaturesAndLabels extractFeaturesAndLabels(
7979
ProgressTracker progressTracker,
8080
TerminationFlag terminationFlag
8181
) {
82-
progressTracker.setVolume(graph.relationshipCount() * 2);
82+
progressTracker.setSteps(graph.relationshipCount() * 2);
8383
var features = LinkFeatureExtractor.extractFeatures(
8484
graph,
8585
featureSteps,
@@ -125,7 +125,7 @@ private static HugeLongArray extractLabels(
125125
}
126126
return true;
127127
}));
128-
progressTracker.logProgress(partition.totalDegree());
128+
progressTracker.logSteps(partition.totalDegree());
129129
}
130130
);
131131
relationshipOffset.add(partition.totalDegree());

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/linkPipeline/train/LinkPredictionTrain.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,10 @@ private void modelSelect(
210210
config.randomSeed()
211211
);
212212

213-
var trainRelationshipCount = trainGraph.relationshipCount();
214213
int trial = 0;
215214
while (hyperParameterOptimizer.hasNext()) {
216215
progressTracker.beginSubTask();
217-
progressTracker.setVolume(pipeline.splitConfig().validationFolds() * trainRelationshipCount);
216+
progressTracker.setSteps(pipeline.splitConfig().validationFolds());
218217
var modelParams = hyperParameterOptimizer.next();
219218
progressTracker.logMessage(formatWithLocale("Method: %s, Parameters: %s", modelParams.method(), modelParams.toMap()));
220219
var trainStatsBuilder = new ModelStatsBuilder(pipeline.splitConfig().validationFolds());
@@ -249,7 +248,7 @@ private void modelSelect(
249248
ProgressTracker.NULL_TRACKER
250249
);
251250

252-
progressTracker.logProgress(trainRelationshipCount);
251+
progressTracker.logSteps(1);
253252
}
254253

255254
// insert the candidates' metrics into trainStats and validationStats

0 commit comments

Comments
 (0)