[systemds] branch main updated: [MINOR] Correct allocation (previous commit)

[baunsgaard]

This is an automated email from the ASF dual-hosted git repository.

baunsgaard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/main by this push:
     new 74be3fcdba [MINOR] Correct allocation (previous commit)
74be3fcdba is described below

commit 74be3fcdba8ec1015b860ce4f5a9a6758c306ac9
Author: Sebastian Baunsgaard <baunsga...@apache.org>
AuthorDate: Thu Sep 7 18:56:50 2023 +0200

    [MINOR] Correct allocation (previous commit)
    
    Correct the fix in the previous commit: 
3b0d7e6e455654c75e20b892ffcf2599bf0b214a
    Unfortunately Java generics are playing a bit around making the solution
    i made before not work.
---
 .../runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java      | 4 ++--
 .../instructions/cp/MultiReturnParameterizedBuiltinCPInstruction.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
index 0e3a0faf56..0d28a62f4b 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnBuiltinCPInstruction.java
@@ -129,12 +129,12 @@ public class MultiReturnBuiltinCPInstruction extends 
ComputationCPInstruction {
                return false;
        }
        
-       private abstract class PP extends Pair<String,LineageItem>{};
 
        @Override
+       @SuppressWarnings("unchecked")
        public Pair<String, LineageItem>[] getLineageItems(ExecutionContext ec) 
{
                LineageItem[] inputLineage = LineageItemUtils.getLineage(ec, 
input1, input2, input3);
-               final Pair<String,LineageItem>[] ret = new PP[_outputs.size()];
+               final Pair<String,LineageItem>[] ret = new 
Pair[_outputs.size()];
                for(int i = 0; i < _outputs.size(); i++){
                        CPOperand out = _outputs.get(i);
                        ret[i] = Pair.of(out.getName(), new 
LineageItem(getOpcode(), inputLineage));
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnParameterizedBuiltinCPInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnParameterizedBuiltinCPInstruction.java
index 8b52ef5687..1c50eeb6c7 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnParameterizedBuiltinCPInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/cp/MultiReturnParameterizedBuiltinCPInstruction.java
@@ -103,12 +103,12 @@ public class MultiReturnParameterizedBuiltinCPInstruction 
extends ComputationCPI
                return false;
        }
 
-       private abstract class PP extends Pair<String,LineageItem>{};
 
        @Override
+       @SuppressWarnings("unchecked")
        public Pair<String, LineageItem>[] getLineageItems(ExecutionContext ec) 
{
                LineageItem[] inputLineage = LineageItemUtils.getLineage(ec, 
input1, input2, input3);
-               final Pair<String,LineageItem>[] ret = new PP[_outputs.size()];
+               final Pair<String, LineageItem>[] ret = new 
Pair[_outputs.size()];
                for(int i = 0; i < _outputs.size(); i++){
                        CPOperand out = _outputs.get(i);
                        ret[i] = Pair.of(out.getName(), new 
LineageItem(getOpcode(), inputLineage));