Merge pull request #8138 from brs96/fix-kge-mutate-conflict

Fix conflicts from KGEMutateProc
neo4j · Sep 13, 2023 · 7844a62 · 7844a62
2 parents 4fade19 + 889bb84
commit 7844a62
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ml/ml-core/src/main/java/org/neo4j/gds/ml/core/tensor/Tensor.java b/ml/ml-core/src/main/java/org/neo4j/gds/ml/core/tensor/Tensor.java
@@ -109,6 +109,16 @@ public int totalSize() {
         return Dimensions.totalSize(dimensions);
     }
 
+    // TODO: figure out how to replace this one
+    public SELF elementwiseProduct(Tensor<?> other) {
+        var result = createWithSameDimensions();
+        for (int i = 0; i < data.length; i++) {
+            result.data[i] = data[i] * other.data[i];
+        }
+        return result;
+    }
+
+
     public Tensor<SELF> elementwiseProductMutate(Tensor<?> other) {
         for (int i = 0; i < data.length; i++) {
             this.data[i] = data[i] * other.data[i];

diff --git a/proc/machine-learning/src/main/java/org/neo4j/gds/ml/kge/KGEMutateResultConsumer.java b/proc/machine-learning/src/main/java/org/neo4j/gds/ml/kge/KGEMutateResultConsumer.java
@@ -24,8 +24,8 @@
 import org.neo4j.gds.RelationshipType;
 import org.neo4j.gds.ResultBuilderFunction;
 import org.neo4j.gds.core.Aggregation;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.concurrency.ParallelUtil;
-import org.neo4j.gds.core.concurrency.Pools;
 import org.neo4j.gds.core.loading.construction.GraphFactory;
 import org.neo4j.gds.core.utils.TerminationFlag;
 import org.neo4j.gds.executor.ComputationResult;
@@ -64,7 +64,7 @@ protected void updateGraphStore(
             .orientation(Orientation.NATURAL)
             .addPropertyConfig(GraphFactory.PropertyConfig.of(KGE_PREDICT_MUTATE_PROPERTY))
             .concurrency(concurrency)
-            .executorService(Pools.DEFAULT)
+            .executorService(DefaultPool.INSTANCE)
             .build();
 
         var similarityResultStream = computationResult.result()