Merge pull request #5398 from FlorentinD/nr-nc-use-node-graph

Use nodes-only graph for NC/NR

Author: FlorentinD

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/nodePipeline/classification/train/NodeClassificationTrainPipelineExecutor.java

@@ -39,7 +39,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static org.neo4j.gds.ml.pipeline.nodePipeline.classification.train.NodeClassificationTrainPipelineExecutor.NodeClassificationTrainPipelineResult;
 
@@ -121,13 +120,12 @@ protected NodeClassificationTrainPipelineResult execute(Map<DatasetSplits, Graph
         PipelineExecutor.validateTrainingParameterSpace(pipeline);
 
         var nodeLabels = config.nodeLabelIdentifiers(graphStore);
-        var relationshipTypes = config.internalRelationshipTypes(graphStore);
-        var graph = graphStore.getGraph(nodeLabels, relationshipTypes, Optional.empty());
+        var nodesGraph = graphStore.getGraph(nodeLabels);
 
-        this.pipeline.splitConfig().validateMinNumNodesInSplitSets(graph);
+        this.pipeline.splitConfig().validateMinNumNodesInSplitSets(nodesGraph);
 
         var trainResult = NodeClassificationTrain
-            .create(graph, pipeline, config, progressTracker, terminationFlag)
+            .create(nodesGraph, pipeline, config, progressTracker, terminationFlag)
             .compute();
 
         var catalogModel = Model.of(

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/nodePipeline/regression/NodeRegressionTrainPipelineExecutor.java

@@ -35,7 +35,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static org.neo4j.gds.ml.pipeline.nodePipeline.regression.NodeRegressionTrainPipelineExecutor.NodeRegressionTrainPipelineResult;
 
@@ -91,13 +90,12 @@ protected NodeRegressionTrainPipelineResult execute(Map<DatasetSplits, GraphFilt
         PipelineExecutor.validateTrainingParameterSpace(pipeline);
 
         var nodeLabels = config.nodeLabelIdentifiers(graphStore);
-        var relationshipTypes = config.internalRelationshipTypes(graphStore);
-        var graph = graphStore.getGraph(nodeLabels, relationshipTypes, Optional.empty());
+        var nodesGraph = graphStore.getGraph(nodeLabels);
 
-        this.pipeline.splitConfig().validateMinNumNodesInSplitSets(graph);
+        this.pipeline.splitConfig().validateMinNumNodesInSplitSets(nodesGraph);
 
         NodeRegressionTrainResult trainResult = NodeRegressionTrain
-            .create(graph, pipeline, config, progressTracker, terminationFlag)
+            .create(nodesGraph, pipeline, config, progressTracker, terminationFlag)
             .compute();
 
         var catalogModel = Model.of(

proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/classification/predict/NodeClassificationPredictPipelineExecutor.java

@@ -42,7 +42,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
@@ -124,13 +123,8 @@ public Map<DatasetSplits, GraphFilter> splitDataset() {
 
     @Override
     protected NodeClassificationPredict.NodeClassificationResult execute(Map<DatasetSplits, GraphFilter> dataSplits) {
-        var graph = graphStore.getGraph(
-            config.nodeLabelIdentifiers(graphStore),
-            config.internalRelationshipTypes(graphStore),
-            Optional.empty()
-        );
-
-        var features = FeaturesFactory.extractLazyFeatures(graph, pipeline.featureProperties());
+        var nodesGraph = graphStore.getGraph(config.nodeLabelIdentifiers(graphStore));
+        var features = FeaturesFactory.extractLazyFeatures(nodesGraph, pipeline.featureProperties());
 
         if (features.featureDimension() != modelData.featureDimension()) {
             throw new IllegalArgumentException(formatWithLocale(

proc/machine-learning/src/main/java/org/neo4j/gds/ml/pipeline/node/regression/predict/NodeRegressionPredictPipelineExecutor.java

@@ -37,7 +37,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
@@ -87,12 +86,8 @@ public Map<DatasetSplits, GraphFilter> splitDataset() {
 
     @Override
     protected HugeDoubleArray execute(Map<DatasetSplits, GraphFilter> dataSplits) {
-        var graph = graphStore.getGraph(
-            config.nodeLabelIdentifiers(graphStore),
-            config.internalRelationshipTypes(graphStore),
-            Optional.empty()
-        );
-        Features features = FeaturesFactory.extractLazyFeatures(graph, pipeline.featureProperties());
+        var nodesGraph = graphStore.getGraph(config.nodeLabelIdentifiers(graphStore));
+        Features features = FeaturesFactory.extractLazyFeatures(nodesGraph, pipeline.featureProperties());
 
         if (features.featureDimension() != regressor.data().featureDimension()) {
             throw new IllegalArgumentException(formatWithLocale(