You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@systemds.apache.org by GitBox <gi...@apache.org> on 2021/02/16 21:42:36 UTC
[GitHub] [systemds] OlgaOvcharenko opened a new pull request #1184: [WIP][SYSTEMDS-2863] Federated ctable instruction
OlgaOvcharenko opened a new pull request #1184:
URL: https://github.com/apache/systemds/pull/1184
This PR adds federated ctable instruction. In the general case, the output should be MatrixBlock, but for slicefinder it is federated (one-hot encoded fed input).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [systemds] sebwrede commented on pull request #1184: [SYSTEMDS-2863] Federated ctable instruction
Posted by GitBox <gi...@apache.org>.
sebwrede commented on pull request #1184:
URL: https://github.com/apache/systemds/pull/1184#issuecomment-820616858
I think the test coverage is improving, but there are still some gaps that would be nice to cover. It is not because I believe there is anything wrong with the parts that are not covered, but I think it is important to cover so that we have the tests later on when we make changes to the federated instructions.
For instance, as far as I can see, the `isFedOutput` method is never called. This is a significant part of the code which is never activated.
Besides that, I think this PR looks good. The failing test is caused by a sparkDriver error from the master branch, so this PR seems ready to merge.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [systemds] OlgaOvcharenko commented on pull request #1184: [SYSTEMDS-2863] Federated ctable instruction
Posted by GitBox <gi...@apache.org>.
OlgaOvcharenko commented on pull request #1184:
URL: https://github.com/apache/systemds/pull/1184#issuecomment-816180353
@sebwrede Could you review this PR once you have time? Thanks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [systemds] sebwrede commented on a change in pull request #1184: [SYSTEMDS-2863] Federated ctable instruction
Posted by GitBox <gi...@apache.org>.
sebwrede commented on a change in pull request #1184:
URL: https://github.com/apache/systemds/pull/1184#discussion_r604939033
##########
File path: src/main/java/org/apache/sysds/runtime/instructions/fed/CtableFEDInstruction.java
##########
@@ -0,0 +1,331 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.runtime.instructions.fed;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.Future;
+import java.util.stream.IntStream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.sysds.common.Types.DataType;
+import org.apache.sysds.common.Types.ValueType;
+import org.apache.sysds.lops.Lop;
+import org.apache.sysds.runtime.DMLRuntimeException;
+import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRange;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedResponse;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedUDF;
+import org.apache.sysds.runtime.controlprogram.federated.FederationMap;
+import org.apache.sysds.runtime.controlprogram.federated.FederationUtils;
+import org.apache.sysds.runtime.functionobjects.And;
+import org.apache.sysds.runtime.instructions.Instruction;
+import org.apache.sysds.runtime.instructions.InstructionUtils;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.ScalarObject;
+import org.apache.sysds.runtime.lineage.LineageItem;
+import org.apache.sysds.runtime.matrix.data.MatrixBlock;
+import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
+
+public class CtableFEDInstruction extends ComputationFEDInstruction {
+ private final CPOperand _outDim1;
+ private final CPOperand _outDim2;
+ private final boolean _isExpand;
+ private final boolean _ignoreZeros;
+
+ private CtableFEDInstruction(CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out, String outputDim1, boolean dim1Literal, String outputDim2, boolean dim2Literal, boolean isExpand,
+ boolean ignoreZeros, String opcode, String istr) {
+ super(FEDType.Ctable, null, in1, in2, in3, out, opcode, istr);
+ _outDim1 = new CPOperand(outputDim1, ValueType.FP64, DataType.SCALAR, dim1Literal);
+ _outDim2 = new CPOperand(outputDim2, ValueType.FP64, DataType.SCALAR, dim2Literal);
+ _isExpand = isExpand;
+ _ignoreZeros = ignoreZeros;
+ }
+
+ public static CtableFEDInstruction parseInstruction(String inst) {
+ String[] parts = InstructionUtils.getInstructionPartsWithValueType(inst);
+ InstructionUtils.checkNumFields(parts, 7);
+
+ String opcode = parts[0];
+
+ //handle opcode
+ if(!(opcode.equalsIgnoreCase("ctable"))) {
+ throw new DMLRuntimeException("Unexpected opcode in CtableFEDInstruction: " + inst);
+ }
+
+ //handle operands
+ CPOperand in1 = new CPOperand(parts[1]);
+ CPOperand in2 = new CPOperand(parts[2]);
+ CPOperand in3 = new CPOperand(parts[3]);
+
+ //handle known dimension information
+ String[] dim1Fields = parts[4].split(Instruction.LITERAL_PREFIX);
+ String[] dim2Fields = parts[5].split(Instruction.LITERAL_PREFIX);
+
+ CPOperand out = new CPOperand(parts[6]);
+ boolean ignoreZeros = Boolean.parseBoolean(parts[7]);
+
+ // ctable does not require any operator, so we simply pass-in a dummy operator with null functionobject
+ return new CtableFEDInstruction(in1,
+ in2, in3, out, dim1Fields[0], Boolean.parseBoolean(dim1Fields[1]),
+ dim2Fields[0], Boolean.parseBoolean(dim2Fields[1]), false, ignoreZeros, opcode, inst);
+ }
+
+ @Override
+ public void processInstruction(ExecutionContext ec) {
+ MatrixObject mo1 = ec.getMatrixObject(input1);
+ MatrixObject mo2 = ec.getMatrixObject(input2);
+
+ boolean reversed = false;
+ if(!mo1.isFederated() && mo2.isFederated()) {
+ mo1 = ec.getMatrixObject(input2);
+ mo2 = ec.getMatrixObject(input1);
+ reversed = true;
+ }
+
+ if(mo2.getNumColumns() != 1 && mo1.getNumColumns() != 1)
+ throw new DMLRuntimeException("Federated ctable: Input vectors should be nx1.");
+
+ // get new output dims
+ Long[] dims1 = getOutputDimension(ec, input1, _outDim1, mo1.getFedMapping().getFederatedRanges());
+ Long[] dims2 = getOutputDimension(ec, input2, _outDim2, mo1.getFedMapping().getFederatedRanges());
+
+ MatrixObject mo3 = input3 != null && input3.isMatrix() ? ec.getMatrixObject(input3) : null;
+
+ boolean reversedWeights = mo3 != null && mo3.isFederated() && !(mo1.isFederated() || mo2.isFederated());
+ if(reversedWeights) {
+ mo3 = mo1;
+ mo1 = ec.getMatrixObject(input3);
+ }
+
+ long dim1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ boolean fedOutput = dim1 % mo1.getFedMapping().getSize() == 0 && dims1.length == Arrays.stream(dims1).distinct().count();
+
+ processRequest(ec, mo1, mo2, mo3, reversed, reversedWeights, fedOutput, dims1, dims2);
+ }
+
+ private Future<FederatedResponse>[] processRequest(ExecutionContext ec, MatrixObject mo1, MatrixObject mo2, MatrixObject mo3,
+ boolean reversed, boolean reversedWeights, boolean fedOutput, Long[] dims1, Long[] dims2) {
+ Future<FederatedResponse>[] ffr;
+
+ FederatedRequest[] fr1 = mo1.getFedMapping().broadcastSliced(mo2, false);
+ FederatedRequest fr2, fr3;
+ if(mo3 == null) {
+ if(!reversed)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr4 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4);
+
+ } else {
+ FederatedRequest[] fr4 = mo1.getFedMapping().broadcastSliced(mo3, false);
+ if(!reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID(), fr4[0].getID()});
+ else if(reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID(), fr4[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), fr4[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr5 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID(), fr4[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4[0], fr5);
+ }
+
+ long fedSize = Collections.max(Arrays.asList(dims1), Long::compare) / ffr.length;
+
+ if(fedOutput && isFedOutput(ffr, fedSize)) {
+ // modify instruction string to remove first empty rows
+ MatrixObject out = ec.getMatrixObject(output);
+ setFedOutput(fr2, mo1, out, dims1, dims2, fedSize);
+ } else {
+ ec.setMatrixOutput(output.getName(), aggResult(ffr));
+ }
+ return ffr;
+ }
+
+ boolean isFedOutput(Future<FederatedResponse>[] ffr, long fedSize) {
+ boolean fedOutput = true;
+
+ try {
+ MatrixBlock curr;
+ MatrixBlock prev =(MatrixBlock) ffr[0].get().getData()[0];
+ for(int i = 1; i < ffr.length && fedOutput; i++) {
+ curr = (MatrixBlock) ffr[i].get().getData()[0];
+ MatrixBlock sliced = curr.slice((int) (curr.getNumRows() - fedSize), curr.getNumRows() - 1);
+
+ // no intersection
+ if(curr.getNumRows() == (i+1) * prev.getNumRows() && curr.getNonZeros() <= prev.getLength()
+ && (curr.getNumRows() - sliced.getNumRows()) == i * prev.getNumRows()
+ && curr.getNonZeros() - sliced.getNonZeros() == 0)
+ continue;
+
+ // check intersect with AND and compare number of nnz
+ MatrixBlock prevExtend = new MatrixBlock(curr.getNumRows(), curr.getNumColumns(), 0.0);
+ prevExtend.copy(0, prev.getNumRows()-1, 0, prev.getNumColumns()-1, prev, true);
+
+ MatrixBlock intersect = curr.binaryOperationsInPlace(new BinaryOperator(And.getAndFnObject()), prevExtend);
+ if(intersect.getNonZeros() != 0)
+ fedOutput = false;
+ prev = sliced;
+ }
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ return fedOutput;
+ }
+
+
+ private void setFedOutput(FederatedRequest fr, MatrixObject mo1, MatrixObject out, Long[] dims1, Long[] dims2, long fedSize) {
+ long d1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ long d2 = Collections.max(Arrays.asList(dims1), Long::compare);
+
+ FederationMap fedMap = mo1.getFedMapping();
+ // modify fed ranges
+ for(int i = 0; i < fedMap.getFederatedRanges().length; i++) {
+ fedMap.getFederatedRanges()[i].setBeginDim(0, i == 0 ? 0 : fedMap.getFederatedRanges()[i-1].getEndDims()[0]);
+ fedMap.getFederatedRanges()[i].setEndDim(0, dims1[i]);
+
+ fedMap.getFederatedRanges()[i].setBeginDim(1, i == 0 ? 0 : fedMap.getFederatedRanges()[i-1].getBeginDims()[1]);
+ fedMap.getFederatedRanges()[i].setEndDim(1, dims2[i]);
+ }
+
+ // set output
+ out.getDataCharacteristics().set(d1, d2, (int) mo1.getBlocksize(), mo1.getNnz());
+ out.setFedMapping(fedMap.copyWithNewID(fr.getID()));
+
+ long varID = FederationUtils.getNextFedDataID();
+ out.getFedMapping().mapParallel(varID, (range, data) -> {
+ try {
+ FederatedResponse response = data.executeFederatedOperation(new FederatedRequest(
+ FederatedRequest.RequestType.EXEC_UDF, -1,
+ new SliceOutput(data.getVarID(), fedSize))).get();
+ if(!response.isSuccessful())
+ response.throwExceptionFromResponse();
+ }
+ catch(Exception e) {
+ throw new DMLRuntimeException(e);
+ }
+ return null;
+ });
+ }
+
+ private MatrixBlock aggResult(Future<FederatedResponse>[] ffr) {
+ MatrixBlock resultBlock = new MatrixBlock(1, 1, 0);
+ int dim1 = 0, dim2 = 0;
+ for(int i = 0; i < ffr.length; i++) {
+ try {
+ MatrixBlock mb = ((MatrixBlock) ffr[i].get().getData()[0]);
+ dim1 = mb.getNumRows() > dim1 ? mb.getNumRows() : dim1;
+ dim2 = mb.getNumColumns() > dim2 ? mb.getNumColumns() : dim2;
+
+ // set next and prev to same output dimensions
+ MatrixBlock prev = new MatrixBlock(dim1, dim2, 0.0);
+ prev.copy(0, resultBlock.getNumRows()-1, 0, resultBlock.getNumColumns()-1, resultBlock, true);
+
+ MatrixBlock next = new MatrixBlock(dim1, dim2, 0.0);
+ next.copy(0, mb.getNumRows()-1, 0, mb.getNumColumns()-1, mb, true);
+
+ // add worker results
+ BinaryOperator plus = InstructionUtils.parseBinaryOperator("+");
+ resultBlock = prev.binaryOperationsInPlace(plus, next);
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return resultBlock;
+ }
+
+ private Long[] getOutputDimension(ExecutionContext ec, CPOperand inOp, CPOperand outOp, FederatedRange[] federatedRanges) {
+ MatrixObject in = ec.getMatrixObject(inOp);
+ Long[] fedDims = new Long[federatedRanges.length];
+
+ if(!in.isFederated()) {
+ //slice
+ MatrixBlock mb = in.acquireReadAndRelease();
+ IntStream.range(0, federatedRanges.length).forEach(i -> {
+ MatrixBlock sliced = mb
+ .slice(federatedRanges[i].getBeginDimsInt()[0], federatedRanges[i].getEndDimsInt()[0] - 1);
+ fedDims[i] = (long) sliced.max();
+ });
+ return fedDims;
+ }
+
+ // construct new instString
+ String maxInstrString = instString.replace("ctable", "uamax");
+ String[] instParts = maxInstrString.split(Lop.OPERAND_DELIMITOR);
+ String[] maxInstParts = new String[] {instParts[0], instParts[1],
+ InstructionUtils.concatOperandParts(inOp.getName(), DataType.MATRIX.name(), (ValueType.FP64).name()),
+ InstructionUtils.concatOperandParts(outOp.getName(), DataType.SCALAR.name(), (ValueType.FP64).name()), "16"};
+ maxInstrString = String.join(Lop.OPERAND_DELIMITOR, maxInstParts);
+
+ // get max per worker
+ FederationMap map = in.getFedMapping();
+ FederatedRequest fr1 = FederationUtils.callInstruction(maxInstrString, outOp,
+ new CPOperand[]{inOp}, new long[]{in.getFedMapping().getID()});
+ FederatedRequest fr2 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr1.getID());
+ FederatedRequest fr3 = map.cleanup(getTID(), fr1.getID());
+ Future<FederatedResponse>[] tmp = map.execute(getTID(), fr1, fr2, fr3);
+
+ // get result
+ for(int i = 0; i < tmp.length; i ++) {
+ try {
+ fedDims[i] = ((ScalarObject) tmp[i].get().getData()[0]).getLongValue();
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
Review comment:
Same as the comment above.
##########
File path: src/main/java/org/apache/sysds/runtime/instructions/fed/CtableFEDInstruction.java
##########
@@ -0,0 +1,331 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.runtime.instructions.fed;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.Future;
+import java.util.stream.IntStream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.sysds.common.Types.DataType;
+import org.apache.sysds.common.Types.ValueType;
+import org.apache.sysds.lops.Lop;
+import org.apache.sysds.runtime.DMLRuntimeException;
+import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRange;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedResponse;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedUDF;
+import org.apache.sysds.runtime.controlprogram.federated.FederationMap;
+import org.apache.sysds.runtime.controlprogram.federated.FederationUtils;
+import org.apache.sysds.runtime.functionobjects.And;
+import org.apache.sysds.runtime.instructions.Instruction;
+import org.apache.sysds.runtime.instructions.InstructionUtils;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.ScalarObject;
+import org.apache.sysds.runtime.lineage.LineageItem;
+import org.apache.sysds.runtime.matrix.data.MatrixBlock;
+import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
+
+public class CtableFEDInstruction extends ComputationFEDInstruction {
+ private final CPOperand _outDim1;
+ private final CPOperand _outDim2;
+ private final boolean _isExpand;
+ private final boolean _ignoreZeros;
+
+ private CtableFEDInstruction(CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out, String outputDim1, boolean dim1Literal, String outputDim2, boolean dim2Literal, boolean isExpand,
+ boolean ignoreZeros, String opcode, String istr) {
+ super(FEDType.Ctable, null, in1, in2, in3, out, opcode, istr);
+ _outDim1 = new CPOperand(outputDim1, ValueType.FP64, DataType.SCALAR, dim1Literal);
+ _outDim2 = new CPOperand(outputDim2, ValueType.FP64, DataType.SCALAR, dim2Literal);
+ _isExpand = isExpand;
+ _ignoreZeros = ignoreZeros;
+ }
+
+ public static CtableFEDInstruction parseInstruction(String inst) {
+ String[] parts = InstructionUtils.getInstructionPartsWithValueType(inst);
+ InstructionUtils.checkNumFields(parts, 7);
+
+ String opcode = parts[0];
+
+ //handle opcode
+ if(!(opcode.equalsIgnoreCase("ctable"))) {
+ throw new DMLRuntimeException("Unexpected opcode in CtableFEDInstruction: " + inst);
+ }
+
+ //handle operands
+ CPOperand in1 = new CPOperand(parts[1]);
+ CPOperand in2 = new CPOperand(parts[2]);
+ CPOperand in3 = new CPOperand(parts[3]);
+
+ //handle known dimension information
+ String[] dim1Fields = parts[4].split(Instruction.LITERAL_PREFIX);
+ String[] dim2Fields = parts[5].split(Instruction.LITERAL_PREFIX);
+
+ CPOperand out = new CPOperand(parts[6]);
+ boolean ignoreZeros = Boolean.parseBoolean(parts[7]);
+
+ // ctable does not require any operator, so we simply pass-in a dummy operator with null functionobject
+ return new CtableFEDInstruction(in1,
+ in2, in3, out, dim1Fields[0], Boolean.parseBoolean(dim1Fields[1]),
+ dim2Fields[0], Boolean.parseBoolean(dim2Fields[1]), false, ignoreZeros, opcode, inst);
+ }
+
+ @Override
+ public void processInstruction(ExecutionContext ec) {
+ MatrixObject mo1 = ec.getMatrixObject(input1);
+ MatrixObject mo2 = ec.getMatrixObject(input2);
+
+ boolean reversed = false;
+ if(!mo1.isFederated() && mo2.isFederated()) {
+ mo1 = ec.getMatrixObject(input2);
+ mo2 = ec.getMatrixObject(input1);
+ reversed = true;
+ }
+
+ if(mo2.getNumColumns() != 1 && mo1.getNumColumns() != 1)
+ throw new DMLRuntimeException("Federated ctable: Input vectors should be nx1.");
+
+ // get new output dims
+ Long[] dims1 = getOutputDimension(ec, input1, _outDim1, mo1.getFedMapping().getFederatedRanges());
+ Long[] dims2 = getOutputDimension(ec, input2, _outDim2, mo1.getFedMapping().getFederatedRanges());
+
+ MatrixObject mo3 = input3 != null && input3.isMatrix() ? ec.getMatrixObject(input3) : null;
+
+ boolean reversedWeights = mo3 != null && mo3.isFederated() && !(mo1.isFederated() || mo2.isFederated());
+ if(reversedWeights) {
+ mo3 = mo1;
+ mo1 = ec.getMatrixObject(input3);
+ }
+
+ long dim1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ boolean fedOutput = dim1 % mo1.getFedMapping().getSize() == 0 && dims1.length == Arrays.stream(dims1).distinct().count();
+
+ processRequest(ec, mo1, mo2, mo3, reversed, reversedWeights, fedOutput, dims1, dims2);
+ }
+
+ private Future<FederatedResponse>[] processRequest(ExecutionContext ec, MatrixObject mo1, MatrixObject mo2, MatrixObject mo3,
+ boolean reversed, boolean reversedWeights, boolean fedOutput, Long[] dims1, Long[] dims2) {
+ Future<FederatedResponse>[] ffr;
+
+ FederatedRequest[] fr1 = mo1.getFedMapping().broadcastSliced(mo2, false);
+ FederatedRequest fr2, fr3;
+ if(mo3 == null) {
+ if(!reversed)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr4 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4);
+
+ } else {
+ FederatedRequest[] fr4 = mo1.getFedMapping().broadcastSliced(mo3, false);
+ if(!reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID(), fr4[0].getID()});
+ else if(reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID(), fr4[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), fr4[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr5 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID(), fr4[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4[0], fr5);
+ }
+
+ long fedSize = Collections.max(Arrays.asList(dims1), Long::compare) / ffr.length;
+
+ if(fedOutput && isFedOutput(ffr, fedSize)) {
Review comment:
Why do you calculate fedOutput before calling this method instead of including it in the "isFedOutput" method?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [systemds] sebwrede commented on pull request #1184: [SYSTEMDS-2863] Federated ctable instruction
Posted by GitBox <gi...@apache.org>.
sebwrede commented on pull request #1184:
URL: https://github.com/apache/systemds/pull/1184#issuecomment-817872073
As I said a couple of weeks ago, this PR looks really good. I think we need to do two things before merging:
1. Add more test cases. I looked through the processInstruction code, but I find it difficult to convince myself that the code works if the test cases do not cover more process cases.
2. Resolve the conflicting files.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [systemds] Baunsgaard closed pull request #1184: [SYSTEMDS-2863] Federated ctable instruction
Posted by GitBox <gi...@apache.org>.
Baunsgaard closed pull request #1184:
URL: https://github.com/apache/systemds/pull/1184
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [systemds] OlgaOvcharenko commented on a change in pull request #1184: [SYSTEMDS-2863] Federated ctable instruction
Posted by GitBox <gi...@apache.org>.
OlgaOvcharenko commented on a change in pull request #1184:
URL: https://github.com/apache/systemds/pull/1184#discussion_r613949103
##########
File path: src/test/scripts/functions/federated/FederatedCtableFedOutput.dml
##########
@@ -0,0 +1,38 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#-------------------------------------------------------------
+
+X = federated(addresses=list($in_X1, $in_X2, $in_X3, $in_X4),
+ ranges=list(list(0, 0), list($rows/4, $cols), list($rows/4, 0), list(2*$rows/4, $cols),
+ list(2*$rows/4, 0), list(3*$rows/4, $cols), list(3*$rows/4, 0), list($rows, $cols)));
+
+m = nrow(X);
+n = ncol(X);
+
+# prepare offset vectors and one-hot encoded X
+fdom = colMaxs(X);
+
+foffb = t(cumsum(t(fdom))) - fdom;
+foffe = t(cumsum(t(fdom)))
Review comment:
Copy paste from slicefinder.dml where this test case appeared, renamed now.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [systemds] sebwrede commented on a change in pull request #1184: [SYSTEMDS-2863] Federated ctable instruction
Posted by GitBox <gi...@apache.org>.
sebwrede commented on a change in pull request #1184:
URL: https://github.com/apache/systemds/pull/1184#discussion_r611678575
##########
File path: src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedCtableTest.java
##########
@@ -0,0 +1,193 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.test.functions.federated.primitives;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.apache.sysds.common.Types;
+import org.apache.sysds.runtime.meta.MatrixCharacteristics;
+import org.apache.sysds.runtime.util.HDFSTool;
+import org.apache.sysds.test.AutomatedTestBase;
+import org.apache.sysds.test.TestConfiguration;
+import org.apache.sysds.test.TestUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(value = Parameterized.class)
+@net.jcip.annotations.NotThreadSafe
+public class FederatedCtableTest extends AutomatedTestBase {
+ private final static String TEST_DIR = "functions/federated/";
+ private final static String TEST_NAME1 = "FederatedCtableTest";
+ private final static String TEST_NAME2 = "FederatedCtableFedOutput";
+ private final static String TEST_CLASS_DIR = TEST_DIR + FederatedCtableTest.class.getSimpleName() + "/";
+
+ private final static int blocksize = 1024;
+ @Parameterized.Parameter()
+ public int rows;
+ @Parameterized.Parameter(1)
+ public int cols;
+ @Parameterized.Parameter(2)
+ public int maxVal1;
+ @Parameterized.Parameter(3)
+ public int maxVal2;
+ @Override
+ public void setUp() {
+ TestUtils.clearAssertionInformation();
+ addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] {"F"}));
+ addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] {"F"}));
+ }
+
+ @Parameterized.Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] {
+ {12, 4, 4, 7},
+// {100, 14, 4, 7}, {1000, 14, 4, 7}
+ });
+ }
+
+ @Test
+ public void federatedCtableSinglenode() {
+ runCtable(Types.ExecMode.SINGLE_NODE, false);
+ }
+
+ @Test
+ public void federatedCtableFedOutputSinglenode() {
+ runCtable(Types.ExecMode.SINGLE_NODE, true);
+ }
Review comment:
I think we could use more test cases.
How about a test case where Y is federated and X is not?
What about a third input? (especially something that triggers the reversedWeights-case in the processInstruction method)
It is also relevant with some invalid input to see if it actually throws an exception or if it computes meaningless output (for instance invalid dimensionality of the input).
I think it is also very relevant to test with different federated range overlaps, since the slicing is an important component of the CTable instruction.
##########
File path: src/main/java/org/apache/sysds/runtime/instructions/fed/CtableFEDInstruction.java
##########
@@ -0,0 +1,338 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.runtime.instructions.fed;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.Future;
+import java.util.stream.IntStream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.sysds.common.Types.DataType;
+import org.apache.sysds.common.Types.ValueType;
+import org.apache.sysds.lops.Lop;
+import org.apache.sysds.runtime.DMLRuntimeException;
+import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRange;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedResponse;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedUDF;
+import org.apache.sysds.runtime.controlprogram.federated.FederationMap;
+import org.apache.sysds.runtime.controlprogram.federated.FederationUtils;
+import org.apache.sysds.runtime.functionobjects.And;
+import org.apache.sysds.runtime.instructions.Instruction;
+import org.apache.sysds.runtime.instructions.InstructionUtils;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.ScalarObject;
+import org.apache.sysds.runtime.lineage.LineageItem;
+import org.apache.sysds.runtime.matrix.data.MatrixBlock;
+import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
+
+public class CtableFEDInstruction extends ComputationFEDInstruction {
+ private final CPOperand _outDim1;
+ private final CPOperand _outDim2;
+ private final boolean _isExpand;
+ private final boolean _ignoreZeros;
+
+ private CtableFEDInstruction(CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out, String outputDim1, boolean dim1Literal, String outputDim2, boolean dim2Literal, boolean isExpand,
+ boolean ignoreZeros, String opcode, String istr) {
+ super(FEDType.Ctable, null, in1, in2, in3, out, opcode, istr);
+ _outDim1 = new CPOperand(outputDim1, ValueType.FP64, DataType.SCALAR, dim1Literal);
+ _outDim2 = new CPOperand(outputDim2, ValueType.FP64, DataType.SCALAR, dim2Literal);
+ _isExpand = isExpand;
+ _ignoreZeros = ignoreZeros;
+ }
+
+ public static CtableFEDInstruction parseInstruction(String inst) {
+ String[] parts = InstructionUtils.getInstructionPartsWithValueType(inst);
+ InstructionUtils.checkNumFields(parts, 7);
+
+ String opcode = parts[0];
+
+ //handle opcode
+ if(!(opcode.equalsIgnoreCase("ctable"))) {
+ throw new DMLRuntimeException("Unexpected opcode in CtableFEDInstruction: " + inst);
+ }
+
+ //handle operands
+ CPOperand in1 = new CPOperand(parts[1]);
+ CPOperand in2 = new CPOperand(parts[2]);
+ CPOperand in3 = new CPOperand(parts[3]);
+
+ //handle known dimension information
+ String[] dim1Fields = parts[4].split(Instruction.LITERAL_PREFIX);
+ String[] dim2Fields = parts[5].split(Instruction.LITERAL_PREFIX);
+
+ CPOperand out = new CPOperand(parts[6]);
+ boolean ignoreZeros = Boolean.parseBoolean(parts[7]);
+
+ // ctable does not require any operator, so we simply pass-in a dummy operator with null functionobject
+ return new CtableFEDInstruction(in1,
+ in2, in3, out, dim1Fields[0], Boolean.parseBoolean(dim1Fields[1]),
+ dim2Fields[0], Boolean.parseBoolean(dim2Fields[1]), false, ignoreZeros, opcode, inst);
+ }
+
+ @Override
+ public void processInstruction(ExecutionContext ec) {
+ MatrixObject mo1 = ec.getMatrixObject(input1);
+ MatrixObject mo2 = ec.getMatrixObject(input2);
+
+ boolean reversed = false;
+ if(!mo1.isFederated() && mo2.isFederated()) {
+ mo1 = ec.getMatrixObject(input2);
+ mo2 = ec.getMatrixObject(input1);
+ reversed = true;
+ }
+
+ if(mo2.getNumColumns() != 1 && mo1.getNumColumns() != 1)
+ throw new DMLRuntimeException("Federated ctable: Input vectors should be nx1.");
+
+ // get new output dims
+ Long[] dims1 = getOutputDimension(mo1, input1, _outDim1, mo1.getFedMapping().getFederatedRanges());
+ Long[] dims2 = getOutputDimension(mo2, input2, _outDim2, mo1.getFedMapping().getFederatedRanges());
+
+ MatrixObject mo3 = input3 != null && input3.isMatrix() ? ec.getMatrixObject(input3) : null;
+
+ boolean reversedWeights = mo3 != null && mo3.isFederated() && !(mo1.isFederated() || mo2.isFederated());
+ if(reversedWeights) {
+ mo3 = mo1;
+ mo1 = ec.getMatrixObject(input3);
+ }
+
+ long dim1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ boolean fedOutput = dim1 % mo1.getFedMapping().getSize() == 0 && dims1.length == Arrays.stream(dims1).distinct().count();
+
+ processRequest(ec, mo1, mo2, mo3, reversed, reversedWeights, fedOutput, dims1, dims2);
+ }
+
+ private void processRequest(ExecutionContext ec, MatrixObject mo1, MatrixObject mo2, MatrixObject mo3,
+ boolean reversed, boolean reversedWeights, boolean fedOutput, Long[] dims1, Long[] dims2) {
+ Future<FederatedResponse>[] ffr;
+
+ FederatedRequest[] fr1 = mo1.getFedMapping().broadcastSliced(mo2, false);
+ FederatedRequest fr2, fr3;
+ if(mo3 == null) {
+ if(!reversed)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr4 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4);
+
+ } else {
+ FederatedRequest[] fr4 = mo1.getFedMapping().broadcastSliced(mo3, false);
+ if(!reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID(), fr4[0].getID()});
+ else if(reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID(), fr4[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), fr4[0].getID(), mo1.getFedMapping().getID()});
Review comment:
Check line lengths.
##########
File path: src/main/java/org/apache/sysds/runtime/instructions/fed/CtableFEDInstruction.java
##########
@@ -0,0 +1,338 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.runtime.instructions.fed;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.Future;
+import java.util.stream.IntStream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.sysds.common.Types.DataType;
+import org.apache.sysds.common.Types.ValueType;
+import org.apache.sysds.lops.Lop;
+import org.apache.sysds.runtime.DMLRuntimeException;
+import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRange;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedResponse;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedUDF;
+import org.apache.sysds.runtime.controlprogram.federated.FederationMap;
+import org.apache.sysds.runtime.controlprogram.federated.FederationUtils;
+import org.apache.sysds.runtime.functionobjects.And;
+import org.apache.sysds.runtime.instructions.Instruction;
+import org.apache.sysds.runtime.instructions.InstructionUtils;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.ScalarObject;
+import org.apache.sysds.runtime.lineage.LineageItem;
+import org.apache.sysds.runtime.matrix.data.MatrixBlock;
+import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
+
+public class CtableFEDInstruction extends ComputationFEDInstruction {
+ private final CPOperand _outDim1;
+ private final CPOperand _outDim2;
+ private final boolean _isExpand;
+ private final boolean _ignoreZeros;
+
+ private CtableFEDInstruction(CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out, String outputDim1, boolean dim1Literal, String outputDim2, boolean dim2Literal, boolean isExpand,
+ boolean ignoreZeros, String opcode, String istr) {
+ super(FEDType.Ctable, null, in1, in2, in3, out, opcode, istr);
+ _outDim1 = new CPOperand(outputDim1, ValueType.FP64, DataType.SCALAR, dim1Literal);
+ _outDim2 = new CPOperand(outputDim2, ValueType.FP64, DataType.SCALAR, dim2Literal);
+ _isExpand = isExpand;
+ _ignoreZeros = ignoreZeros;
+ }
+
+ public static CtableFEDInstruction parseInstruction(String inst) {
+ String[] parts = InstructionUtils.getInstructionPartsWithValueType(inst);
+ InstructionUtils.checkNumFields(parts, 7);
+
+ String opcode = parts[0];
+
+ //handle opcode
+ if(!(opcode.equalsIgnoreCase("ctable"))) {
+ throw new DMLRuntimeException("Unexpected opcode in CtableFEDInstruction: " + inst);
+ }
+
+ //handle operands
+ CPOperand in1 = new CPOperand(parts[1]);
+ CPOperand in2 = new CPOperand(parts[2]);
+ CPOperand in3 = new CPOperand(parts[3]);
+
+ //handle known dimension information
+ String[] dim1Fields = parts[4].split(Instruction.LITERAL_PREFIX);
+ String[] dim2Fields = parts[5].split(Instruction.LITERAL_PREFIX);
+
+ CPOperand out = new CPOperand(parts[6]);
+ boolean ignoreZeros = Boolean.parseBoolean(parts[7]);
+
+ // ctable does not require any operator, so we simply pass-in a dummy operator with null functionobject
+ return new CtableFEDInstruction(in1,
+ in2, in3, out, dim1Fields[0], Boolean.parseBoolean(dim1Fields[1]),
+ dim2Fields[0], Boolean.parseBoolean(dim2Fields[1]), false, ignoreZeros, opcode, inst);
+ }
+
+ @Override
+ public void processInstruction(ExecutionContext ec) {
+ MatrixObject mo1 = ec.getMatrixObject(input1);
+ MatrixObject mo2 = ec.getMatrixObject(input2);
+
+ boolean reversed = false;
+ if(!mo1.isFederated() && mo2.isFederated()) {
+ mo1 = ec.getMatrixObject(input2);
+ mo2 = ec.getMatrixObject(input1);
+ reversed = true;
+ }
+
+ if(mo2.getNumColumns() != 1 && mo1.getNumColumns() != 1)
+ throw new DMLRuntimeException("Federated ctable: Input vectors should be nx1.");
Review comment:
Minor comment: You could print the dimensions in the exception message so that the user immediately sees what the dimensions are. For instance: "Input vectors should be nx1, but are 100x5".
##########
File path: src/test/scripts/functions/federated/FederatedCtableFedOutput.dml
##########
@@ -0,0 +1,38 @@
+#-------------------------------------------------------------
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#-------------------------------------------------------------
+
+X = federated(addresses=list($in_X1, $in_X2, $in_X3, $in_X4),
+ ranges=list(list(0, 0), list($rows/4, $cols), list($rows/4, 0), list(2*$rows/4, $cols),
+ list(2*$rows/4, 0), list(3*$rows/4, $cols), list(3*$rows/4, 0), list($rows, $cols)));
+
+m = nrow(X);
+n = ncol(X);
+
+# prepare offset vectors and one-hot encoded X
+fdom = colMaxs(X);
+
+foffb = t(cumsum(t(fdom))) - fdom;
+foffe = t(cumsum(t(fdom)))
Review comment:
Out of curiosity: what are _fdom_, _foffb_, and _foffe_ abbreviations of?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [systemds] OlgaOvcharenko commented on a change in pull request #1184: [SYSTEMDS-2863] Federated ctable instruction
Posted by GitBox <gi...@apache.org>.
OlgaOvcharenko commented on a change in pull request #1184:
URL: https://github.com/apache/systemds/pull/1184#discussion_r613951254
##########
File path: src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedCtableTest.java
##########
@@ -0,0 +1,193 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.test.functions.federated.primitives;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.apache.sysds.common.Types;
+import org.apache.sysds.runtime.meta.MatrixCharacteristics;
+import org.apache.sysds.runtime.util.HDFSTool;
+import org.apache.sysds.test.AutomatedTestBase;
+import org.apache.sysds.test.TestConfiguration;
+import org.apache.sysds.test.TestUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(value = Parameterized.class)
+@net.jcip.annotations.NotThreadSafe
+public class FederatedCtableTest extends AutomatedTestBase {
+ private final static String TEST_DIR = "functions/federated/";
+ private final static String TEST_NAME1 = "FederatedCtableTest";
+ private final static String TEST_NAME2 = "FederatedCtableFedOutput";
+ private final static String TEST_CLASS_DIR = TEST_DIR + FederatedCtableTest.class.getSimpleName() + "/";
+
+ private final static int blocksize = 1024;
+ @Parameterized.Parameter()
+ public int rows;
+ @Parameterized.Parameter(1)
+ public int cols;
+ @Parameterized.Parameter(2)
+ public int maxVal1;
+ @Parameterized.Parameter(3)
+ public int maxVal2;
+ @Override
+ public void setUp() {
+ TestUtils.clearAssertionInformation();
+ addTestConfiguration(TEST_NAME1, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME1, new String[] {"F"}));
+ addTestConfiguration(TEST_NAME2, new TestConfiguration(TEST_CLASS_DIR, TEST_NAME2, new String[] {"F"}));
+ }
+
+ @Parameterized.Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] {
+ {12, 4, 4, 7},
+// {100, 14, 4, 7}, {1000, 14, 4, 7}
+ });
+ }
+
+ @Test
+ public void federatedCtableSinglenode() {
+ runCtable(Types.ExecMode.SINGLE_NODE, false);
+ }
+
+ @Test
+ public void federatedCtableFedOutputSinglenode() {
+ runCtable(Types.ExecMode.SINGLE_NODE, true);
+ }
Review comment:
I added more tests now and fixed reversed weights.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [systemds] sebwrede commented on a change in pull request #1184: [SYSTEMDS-2863] Federated ctable instruction
Posted by GitBox <gi...@apache.org>.
sebwrede commented on a change in pull request #1184:
URL: https://github.com/apache/systemds/pull/1184#discussion_r604938543
##########
File path: src/main/java/org/apache/sysds/runtime/instructions/fed/CtableFEDInstruction.java
##########
@@ -0,0 +1,331 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.runtime.instructions.fed;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.Future;
+import java.util.stream.IntStream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.sysds.common.Types.DataType;
+import org.apache.sysds.common.Types.ValueType;
+import org.apache.sysds.lops.Lop;
+import org.apache.sysds.runtime.DMLRuntimeException;
+import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRange;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedResponse;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedUDF;
+import org.apache.sysds.runtime.controlprogram.federated.FederationMap;
+import org.apache.sysds.runtime.controlprogram.federated.FederationUtils;
+import org.apache.sysds.runtime.functionobjects.And;
+import org.apache.sysds.runtime.instructions.Instruction;
+import org.apache.sysds.runtime.instructions.InstructionUtils;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.ScalarObject;
+import org.apache.sysds.runtime.lineage.LineageItem;
+import org.apache.sysds.runtime.matrix.data.MatrixBlock;
+import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
+
+public class CtableFEDInstruction extends ComputationFEDInstruction {
+ private final CPOperand _outDim1;
+ private final CPOperand _outDim2;
+ private final boolean _isExpand;
+ private final boolean _ignoreZeros;
+
+ private CtableFEDInstruction(CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out, String outputDim1, boolean dim1Literal, String outputDim2, boolean dim2Literal, boolean isExpand,
+ boolean ignoreZeros, String opcode, String istr) {
+ super(FEDType.Ctable, null, in1, in2, in3, out, opcode, istr);
+ _outDim1 = new CPOperand(outputDim1, ValueType.FP64, DataType.SCALAR, dim1Literal);
+ _outDim2 = new CPOperand(outputDim2, ValueType.FP64, DataType.SCALAR, dim2Literal);
+ _isExpand = isExpand;
+ _ignoreZeros = ignoreZeros;
+ }
+
+ public static CtableFEDInstruction parseInstruction(String inst) {
+ String[] parts = InstructionUtils.getInstructionPartsWithValueType(inst);
+ InstructionUtils.checkNumFields(parts, 7);
+
+ String opcode = parts[0];
+
+ //handle opcode
+ if(!(opcode.equalsIgnoreCase("ctable"))) {
+ throw new DMLRuntimeException("Unexpected opcode in CtableFEDInstruction: " + inst);
+ }
+
+ //handle operands
+ CPOperand in1 = new CPOperand(parts[1]);
+ CPOperand in2 = new CPOperand(parts[2]);
+ CPOperand in3 = new CPOperand(parts[3]);
+
+ //handle known dimension information
+ String[] dim1Fields = parts[4].split(Instruction.LITERAL_PREFIX);
+ String[] dim2Fields = parts[5].split(Instruction.LITERAL_PREFIX);
+
+ CPOperand out = new CPOperand(parts[6]);
+ boolean ignoreZeros = Boolean.parseBoolean(parts[7]);
+
+ // ctable does not require any operator, so we simply pass-in a dummy operator with null functionobject
+ return new CtableFEDInstruction(in1,
+ in2, in3, out, dim1Fields[0], Boolean.parseBoolean(dim1Fields[1]),
+ dim2Fields[0], Boolean.parseBoolean(dim2Fields[1]), false, ignoreZeros, opcode, inst);
+ }
+
+ @Override
+ public void processInstruction(ExecutionContext ec) {
+ MatrixObject mo1 = ec.getMatrixObject(input1);
+ MatrixObject mo2 = ec.getMatrixObject(input2);
+
+ boolean reversed = false;
+ if(!mo1.isFederated() && mo2.isFederated()) {
+ mo1 = ec.getMatrixObject(input2);
+ mo2 = ec.getMatrixObject(input1);
+ reversed = true;
+ }
+
+ if(mo2.getNumColumns() != 1 && mo1.getNumColumns() != 1)
+ throw new DMLRuntimeException("Federated ctable: Input vectors should be nx1.");
+
+ // get new output dims
+ Long[] dims1 = getOutputDimension(ec, input1, _outDim1, mo1.getFedMapping().getFederatedRanges());
+ Long[] dims2 = getOutputDimension(ec, input2, _outDim2, mo1.getFedMapping().getFederatedRanges());
+
+ MatrixObject mo3 = input3 != null && input3.isMatrix() ? ec.getMatrixObject(input3) : null;
+
+ boolean reversedWeights = mo3 != null && mo3.isFederated() && !(mo1.isFederated() || mo2.isFederated());
+ if(reversedWeights) {
+ mo3 = mo1;
+ mo1 = ec.getMatrixObject(input3);
+ }
+
+ long dim1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ boolean fedOutput = dim1 % mo1.getFedMapping().getSize() == 0 && dims1.length == Arrays.stream(dims1).distinct().count();
+
+ processRequest(ec, mo1, mo2, mo3, reversed, reversedWeights, fedOutput, dims1, dims2);
+ }
+
+ private Future<FederatedResponse>[] processRequest(ExecutionContext ec, MatrixObject mo1, MatrixObject mo2, MatrixObject mo3,
+ boolean reversed, boolean reversedWeights, boolean fedOutput, Long[] dims1, Long[] dims2) {
+ Future<FederatedResponse>[] ffr;
+
+ FederatedRequest[] fr1 = mo1.getFedMapping().broadcastSliced(mo2, false);
+ FederatedRequest fr2, fr3;
+ if(mo3 == null) {
+ if(!reversed)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr4 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4);
+
+ } else {
+ FederatedRequest[] fr4 = mo1.getFedMapping().broadcastSliced(mo3, false);
+ if(!reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID(), fr4[0].getID()});
+ else if(reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID(), fr4[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), fr4[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr5 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID(), fr4[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4[0], fr5);
+ }
+
+ long fedSize = Collections.max(Arrays.asList(dims1), Long::compare) / ffr.length;
+
+ if(fedOutput && isFedOutput(ffr, fedSize)) {
+ // modify instruction string to remove first empty rows
+ MatrixObject out = ec.getMatrixObject(output);
+ setFedOutput(fr2, mo1, out, dims1, dims2, fedSize);
+ } else {
+ ec.setMatrixOutput(output.getName(), aggResult(ffr));
+ }
+ return ffr;
+ }
+
+ boolean isFedOutput(Future<FederatedResponse>[] ffr, long fedSize) {
+ boolean fedOutput = true;
+
+ try {
+ MatrixBlock curr;
+ MatrixBlock prev =(MatrixBlock) ffr[0].get().getData()[0];
+ for(int i = 1; i < ffr.length && fedOutput; i++) {
+ curr = (MatrixBlock) ffr[i].get().getData()[0];
+ MatrixBlock sliced = curr.slice((int) (curr.getNumRows() - fedSize), curr.getNumRows() - 1);
+
+ // no intersection
+ if(curr.getNumRows() == (i+1) * prev.getNumRows() && curr.getNonZeros() <= prev.getLength()
+ && (curr.getNumRows() - sliced.getNumRows()) == i * prev.getNumRows()
+ && curr.getNonZeros() - sliced.getNonZeros() == 0)
+ continue;
+
+ // check intersect with AND and compare number of nnz
+ MatrixBlock prevExtend = new MatrixBlock(curr.getNumRows(), curr.getNumColumns(), 0.0);
+ prevExtend.copy(0, prev.getNumRows()-1, 0, prev.getNumColumns()-1, prev, true);
+
+ MatrixBlock intersect = curr.binaryOperationsInPlace(new BinaryOperator(And.getAndFnObject()), prevExtend);
+ if(intersect.getNonZeros() != 0)
+ fedOutput = false;
+ prev = sliced;
+ }
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ return fedOutput;
+ }
+
+
+ private void setFedOutput(FederatedRequest fr, MatrixObject mo1, MatrixObject out, Long[] dims1, Long[] dims2, long fedSize) {
+ long d1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ long d2 = Collections.max(Arrays.asList(dims1), Long::compare);
+
+ FederationMap fedMap = mo1.getFedMapping();
+ // modify fed ranges
+ for(int i = 0; i < fedMap.getFederatedRanges().length; i++) {
+ fedMap.getFederatedRanges()[i].setBeginDim(0, i == 0 ? 0 : fedMap.getFederatedRanges()[i-1].getEndDims()[0]);
+ fedMap.getFederatedRanges()[i].setEndDim(0, dims1[i]);
+
+ fedMap.getFederatedRanges()[i].setBeginDim(1, i == 0 ? 0 : fedMap.getFederatedRanges()[i-1].getBeginDims()[1]);
+ fedMap.getFederatedRanges()[i].setEndDim(1, dims2[i]);
+ }
+
+ // set output
+ out.getDataCharacteristics().set(d1, d2, (int) mo1.getBlocksize(), mo1.getNnz());
+ out.setFedMapping(fedMap.copyWithNewID(fr.getID()));
+
+ long varID = FederationUtils.getNextFedDataID();
+ out.getFedMapping().mapParallel(varID, (range, data) -> {
+ try {
+ FederatedResponse response = data.executeFederatedOperation(new FederatedRequest(
+ FederatedRequest.RequestType.EXEC_UDF, -1,
+ new SliceOutput(data.getVarID(), fedSize))).get();
+ if(!response.isSuccessful())
+ response.throwExceptionFromResponse();
+ }
+ catch(Exception e) {
+ throw new DMLRuntimeException(e);
+ }
+ return null;
+ });
+ }
+
+ private MatrixBlock aggResult(Future<FederatedResponse>[] ffr) {
+ MatrixBlock resultBlock = new MatrixBlock(1, 1, 0);
+ int dim1 = 0, dim2 = 0;
+ for(int i = 0; i < ffr.length; i++) {
+ try {
+ MatrixBlock mb = ((MatrixBlock) ffr[i].get().getData()[0]);
+ dim1 = mb.getNumRows() > dim1 ? mb.getNumRows() : dim1;
+ dim2 = mb.getNumColumns() > dim2 ? mb.getNumColumns() : dim2;
+
+ // set next and prev to same output dimensions
+ MatrixBlock prev = new MatrixBlock(dim1, dim2, 0.0);
+ prev.copy(0, resultBlock.getNumRows()-1, 0, resultBlock.getNumColumns()-1, resultBlock, true);
+
+ MatrixBlock next = new MatrixBlock(dim1, dim2, 0.0);
+ next.copy(0, mb.getNumRows()-1, 0, mb.getNumColumns()-1, mb, true);
+
+ // add worker results
+ BinaryOperator plus = InstructionUtils.parseBinaryOperator("+");
+ resultBlock = prev.binaryOperationsInPlace(plus, next);
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return resultBlock;
+ }
+
+ private Long[] getOutputDimension(ExecutionContext ec, CPOperand inOp, CPOperand outOp, FederatedRange[] federatedRanges) {
+ MatrixObject in = ec.getMatrixObject(inOp);
+ Long[] fedDims = new Long[federatedRanges.length];
+
+ if(!in.isFederated()) {
+ //slice
+ MatrixBlock mb = in.acquireReadAndRelease();
+ IntStream.range(0, federatedRanges.length).forEach(i -> {
+ MatrixBlock sliced = mb
+ .slice(federatedRanges[i].getBeginDimsInt()[0], federatedRanges[i].getEndDimsInt()[0] - 1);
+ fedDims[i] = (long) sliced.max();
+ });
+ return fedDims;
+ }
+
+ // construct new instString
+ String maxInstrString = instString.replace("ctable", "uamax");
+ String[] instParts = maxInstrString.split(Lop.OPERAND_DELIMITOR);
+ String[] maxInstParts = new String[] {instParts[0], instParts[1],
+ InstructionUtils.concatOperandParts(inOp.getName(), DataType.MATRIX.name(), (ValueType.FP64).name()),
+ InstructionUtils.concatOperandParts(outOp.getName(), DataType.SCALAR.name(), (ValueType.FP64).name()), "16"};
+ maxInstrString = String.join(Lop.OPERAND_DELIMITOR, maxInstParts);
+
+ // get max per worker
+ FederationMap map = in.getFedMapping();
+ FederatedRequest fr1 = FederationUtils.callInstruction(maxInstrString, outOp,
+ new CPOperand[]{inOp}, new long[]{in.getFedMapping().getID()});
+ FederatedRequest fr2 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr1.getID());
+ FederatedRequest fr3 = map.cleanup(getTID(), fr1.getID());
+ Future<FederatedResponse>[] tmp = map.execute(getTID(), fr1, fr2, fr3);
Review comment:
Same as the comment above.
##########
File path: src/main/java/org/apache/sysds/runtime/instructions/fed/CtableFEDInstruction.java
##########
@@ -0,0 +1,331 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.runtime.instructions.fed;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.Future;
+import java.util.stream.IntStream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.sysds.common.Types.DataType;
+import org.apache.sysds.common.Types.ValueType;
+import org.apache.sysds.lops.Lop;
+import org.apache.sysds.runtime.DMLRuntimeException;
+import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRange;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedResponse;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedUDF;
+import org.apache.sysds.runtime.controlprogram.federated.FederationMap;
+import org.apache.sysds.runtime.controlprogram.federated.FederationUtils;
+import org.apache.sysds.runtime.functionobjects.And;
+import org.apache.sysds.runtime.instructions.Instruction;
+import org.apache.sysds.runtime.instructions.InstructionUtils;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.ScalarObject;
+import org.apache.sysds.runtime.lineage.LineageItem;
+import org.apache.sysds.runtime.matrix.data.MatrixBlock;
+import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
+
+public class CtableFEDInstruction extends ComputationFEDInstruction {
+ private final CPOperand _outDim1;
+ private final CPOperand _outDim2;
+ private final boolean _isExpand;
+ private final boolean _ignoreZeros;
+
+ private CtableFEDInstruction(CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out, String outputDim1, boolean dim1Literal, String outputDim2, boolean dim2Literal, boolean isExpand,
+ boolean ignoreZeros, String opcode, String istr) {
+ super(FEDType.Ctable, null, in1, in2, in3, out, opcode, istr);
+ _outDim1 = new CPOperand(outputDim1, ValueType.FP64, DataType.SCALAR, dim1Literal);
+ _outDim2 = new CPOperand(outputDim2, ValueType.FP64, DataType.SCALAR, dim2Literal);
+ _isExpand = isExpand;
+ _ignoreZeros = ignoreZeros;
+ }
+
+ public static CtableFEDInstruction parseInstruction(String inst) {
+ String[] parts = InstructionUtils.getInstructionPartsWithValueType(inst);
+ InstructionUtils.checkNumFields(parts, 7);
+
+ String opcode = parts[0];
+
+ //handle opcode
+ if(!(opcode.equalsIgnoreCase("ctable"))) {
+ throw new DMLRuntimeException("Unexpected opcode in CtableFEDInstruction: " + inst);
+ }
+
+ //handle operands
+ CPOperand in1 = new CPOperand(parts[1]);
+ CPOperand in2 = new CPOperand(parts[2]);
+ CPOperand in3 = new CPOperand(parts[3]);
+
+ //handle known dimension information
+ String[] dim1Fields = parts[4].split(Instruction.LITERAL_PREFIX);
+ String[] dim2Fields = parts[5].split(Instruction.LITERAL_PREFIX);
+
+ CPOperand out = new CPOperand(parts[6]);
+ boolean ignoreZeros = Boolean.parseBoolean(parts[7]);
+
+ // ctable does not require any operator, so we simply pass-in a dummy operator with null functionobject
+ return new CtableFEDInstruction(in1,
+ in2, in3, out, dim1Fields[0], Boolean.parseBoolean(dim1Fields[1]),
+ dim2Fields[0], Boolean.parseBoolean(dim2Fields[1]), false, ignoreZeros, opcode, inst);
+ }
+
+ @Override
+ public void processInstruction(ExecutionContext ec) {
+ MatrixObject mo1 = ec.getMatrixObject(input1);
+ MatrixObject mo2 = ec.getMatrixObject(input2);
+
+ boolean reversed = false;
+ if(!mo1.isFederated() && mo2.isFederated()) {
+ mo1 = ec.getMatrixObject(input2);
+ mo2 = ec.getMatrixObject(input1);
+ reversed = true;
+ }
+
+ if(mo2.getNumColumns() != 1 && mo1.getNumColumns() != 1)
+ throw new DMLRuntimeException("Federated ctable: Input vectors should be nx1.");
+
+ // get new output dims
+ Long[] dims1 = getOutputDimension(ec, input1, _outDim1, mo1.getFedMapping().getFederatedRanges());
+ Long[] dims2 = getOutputDimension(ec, input2, _outDim2, mo1.getFedMapping().getFederatedRanges());
+
+ MatrixObject mo3 = input3 != null && input3.isMatrix() ? ec.getMatrixObject(input3) : null;
+
+ boolean reversedWeights = mo3 != null && mo3.isFederated() && !(mo1.isFederated() || mo2.isFederated());
+ if(reversedWeights) {
+ mo3 = mo1;
+ mo1 = ec.getMatrixObject(input3);
+ }
+
+ long dim1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ boolean fedOutput = dim1 % mo1.getFedMapping().getSize() == 0 && dims1.length == Arrays.stream(dims1).distinct().count();
+
+ processRequest(ec, mo1, mo2, mo3, reversed, reversedWeights, fedOutput, dims1, dims2);
+ }
+
+ private Future<FederatedResponse>[] processRequest(ExecutionContext ec, MatrixObject mo1, MatrixObject mo2, MatrixObject mo3,
+ boolean reversed, boolean reversedWeights, boolean fedOutput, Long[] dims1, Long[] dims2) {
+ Future<FederatedResponse>[] ffr;
+
+ FederatedRequest[] fr1 = mo1.getFedMapping().broadcastSliced(mo2, false);
+ FederatedRequest fr2, fr3;
+ if(mo3 == null) {
+ if(!reversed)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr4 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4);
+
+ } else {
+ FederatedRequest[] fr4 = mo1.getFedMapping().broadcastSliced(mo3, false);
+ if(!reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID(), fr4[0].getID()});
+ else if(reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID(), fr4[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), fr4[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr5 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID(), fr4[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4[0], fr5);
+ }
+
+ long fedSize = Collections.max(Arrays.asList(dims1), Long::compare) / ffr.length;
+
+ if(fedOutput && isFedOutput(ffr, fedSize)) {
+ // modify instruction string to remove first empty rows
+ MatrixObject out = ec.getMatrixObject(output);
+ setFedOutput(fr2, mo1, out, dims1, dims2, fedSize);
+ } else {
+ ec.setMatrixOutput(output.getName(), aggResult(ffr));
+ }
+ return ffr;
+ }
+
+ boolean isFedOutput(Future<FederatedResponse>[] ffr, long fedSize) {
+ boolean fedOutput = true;
+
+ try {
+ MatrixBlock curr;
+ MatrixBlock prev =(MatrixBlock) ffr[0].get().getData()[0];
+ for(int i = 1; i < ffr.length && fedOutput; i++) {
+ curr = (MatrixBlock) ffr[i].get().getData()[0];
+ MatrixBlock sliced = curr.slice((int) (curr.getNumRows() - fedSize), curr.getNumRows() - 1);
+
+ // no intersection
+ if(curr.getNumRows() == (i+1) * prev.getNumRows() && curr.getNonZeros() <= prev.getLength()
+ && (curr.getNumRows() - sliced.getNumRows()) == i * prev.getNumRows()
+ && curr.getNonZeros() - sliced.getNonZeros() == 0)
+ continue;
+
+ // check intersect with AND and compare number of nnz
+ MatrixBlock prevExtend = new MatrixBlock(curr.getNumRows(), curr.getNumColumns(), 0.0);
+ prevExtend.copy(0, prev.getNumRows()-1, 0, prev.getNumColumns()-1, prev, true);
+
+ MatrixBlock intersect = curr.binaryOperationsInPlace(new BinaryOperator(And.getAndFnObject()), prevExtend);
+ if(intersect.getNonZeros() != 0)
+ fedOutput = false;
+ prev = sliced;
+ }
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ return fedOutput;
+ }
+
+
+ private void setFedOutput(FederatedRequest fr, MatrixObject mo1, MatrixObject out, Long[] dims1, Long[] dims2, long fedSize) {
+ long d1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ long d2 = Collections.max(Arrays.asList(dims1), Long::compare);
+
+ FederationMap fedMap = mo1.getFedMapping();
+ // modify fed ranges
+ for(int i = 0; i < fedMap.getFederatedRanges().length; i++) {
+ fedMap.getFederatedRanges()[i].setBeginDim(0, i == 0 ? 0 : fedMap.getFederatedRanges()[i-1].getEndDims()[0]);
+ fedMap.getFederatedRanges()[i].setEndDim(0, dims1[i]);
+
+ fedMap.getFederatedRanges()[i].setBeginDim(1, i == 0 ? 0 : fedMap.getFederatedRanges()[i-1].getBeginDims()[1]);
+ fedMap.getFederatedRanges()[i].setEndDim(1, dims2[i]);
+ }
+
+ // set output
+ out.getDataCharacteristics().set(d1, d2, (int) mo1.getBlocksize(), mo1.getNnz());
+ out.setFedMapping(fedMap.copyWithNewID(fr.getID()));
+
+ long varID = FederationUtils.getNextFedDataID();
+ out.getFedMapping().mapParallel(varID, (range, data) -> {
+ try {
+ FederatedResponse response = data.executeFederatedOperation(new FederatedRequest(
+ FederatedRequest.RequestType.EXEC_UDF, -1,
+ new SliceOutput(data.getVarID(), fedSize))).get();
+ if(!response.isSuccessful())
+ response.throwExceptionFromResponse();
+ }
+ catch(Exception e) {
+ throw new DMLRuntimeException(e);
+ }
+ return null;
+ });
+ }
+
+ private MatrixBlock aggResult(Future<FederatedResponse>[] ffr) {
+ MatrixBlock resultBlock = new MatrixBlock(1, 1, 0);
+ int dim1 = 0, dim2 = 0;
+ for(int i = 0; i < ffr.length; i++) {
+ try {
+ MatrixBlock mb = ((MatrixBlock) ffr[i].get().getData()[0]);
+ dim1 = mb.getNumRows() > dim1 ? mb.getNumRows() : dim1;
+ dim2 = mb.getNumColumns() > dim2 ? mb.getNumColumns() : dim2;
+
+ // set next and prev to same output dimensions
+ MatrixBlock prev = new MatrixBlock(dim1, dim2, 0.0);
+ prev.copy(0, resultBlock.getNumRows()-1, 0, resultBlock.getNumColumns()-1, resultBlock, true);
+
+ MatrixBlock next = new MatrixBlock(dim1, dim2, 0.0);
+ next.copy(0, mb.getNumRows()-1, 0, mb.getNumColumns()-1, mb, true);
+
+ // add worker results
+ BinaryOperator plus = InstructionUtils.parseBinaryOperator("+");
+ resultBlock = prev.binaryOperationsInPlace(plus, next);
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return resultBlock;
+ }
+
+ private Long[] getOutputDimension(ExecutionContext ec, CPOperand inOp, CPOperand outOp, FederatedRange[] federatedRanges) {
+ MatrixObject in = ec.getMatrixObject(inOp);
+ Long[] fedDims = new Long[federatedRanges.length];
+
+ if(!in.isFederated()) {
+ //slice
+ MatrixBlock mb = in.acquireReadAndRelease();
+ IntStream.range(0, federatedRanges.length).forEach(i -> {
+ MatrixBlock sliced = mb
+ .slice(federatedRanges[i].getBeginDimsInt()[0], federatedRanges[i].getEndDimsInt()[0] - 1);
+ fedDims[i] = (long) sliced.max();
+ });
+ return fedDims;
+ }
+
+ // construct new instString
+ String maxInstrString = instString.replace("ctable", "uamax");
+ String[] instParts = maxInstrString.split(Lop.OPERAND_DELIMITOR);
+ String[] maxInstParts = new String[] {instParts[0], instParts[1],
+ InstructionUtils.concatOperandParts(inOp.getName(), DataType.MATRIX.name(), (ValueType.FP64).name()),
+ InstructionUtils.concatOperandParts(outOp.getName(), DataType.SCALAR.name(), (ValueType.FP64).name()), "16"};
+ maxInstrString = String.join(Lop.OPERAND_DELIMITOR, maxInstParts);
Review comment:
It improves readability if something like this is put into a separate method with the name you have written in the comment. It would make this method shorter and it would be easier to see which steps the method consists of.
##########
File path: src/main/java/org/apache/sysds/runtime/instructions/fed/CtableFEDInstruction.java
##########
@@ -0,0 +1,331 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sysds.runtime.instructions.fed;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.Future;
+import java.util.stream.IntStream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.sysds.common.Types.DataType;
+import org.apache.sysds.common.Types.ValueType;
+import org.apache.sysds.lops.Lop;
+import org.apache.sysds.runtime.DMLRuntimeException;
+import org.apache.sysds.runtime.controlprogram.caching.MatrixObject;
+import org.apache.sysds.runtime.controlprogram.context.ExecutionContext;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRange;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedRequest;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedResponse;
+import org.apache.sysds.runtime.controlprogram.federated.FederatedUDF;
+import org.apache.sysds.runtime.controlprogram.federated.FederationMap;
+import org.apache.sysds.runtime.controlprogram.federated.FederationUtils;
+import org.apache.sysds.runtime.functionobjects.And;
+import org.apache.sysds.runtime.instructions.Instruction;
+import org.apache.sysds.runtime.instructions.InstructionUtils;
+import org.apache.sysds.runtime.instructions.cp.CPOperand;
+import org.apache.sysds.runtime.instructions.cp.Data;
+import org.apache.sysds.runtime.instructions.cp.ScalarObject;
+import org.apache.sysds.runtime.lineage.LineageItem;
+import org.apache.sysds.runtime.matrix.data.MatrixBlock;
+import org.apache.sysds.runtime.matrix.operators.BinaryOperator;
+
+public class CtableFEDInstruction extends ComputationFEDInstruction {
+ private final CPOperand _outDim1;
+ private final CPOperand _outDim2;
+ private final boolean _isExpand;
+ private final boolean _ignoreZeros;
+
+ private CtableFEDInstruction(CPOperand in1, CPOperand in2, CPOperand in3, CPOperand out, String outputDim1, boolean dim1Literal, String outputDim2, boolean dim2Literal, boolean isExpand,
+ boolean ignoreZeros, String opcode, String istr) {
+ super(FEDType.Ctable, null, in1, in2, in3, out, opcode, istr);
+ _outDim1 = new CPOperand(outputDim1, ValueType.FP64, DataType.SCALAR, dim1Literal);
+ _outDim2 = new CPOperand(outputDim2, ValueType.FP64, DataType.SCALAR, dim2Literal);
+ _isExpand = isExpand;
+ _ignoreZeros = ignoreZeros;
+ }
+
+ public static CtableFEDInstruction parseInstruction(String inst) {
+ String[] parts = InstructionUtils.getInstructionPartsWithValueType(inst);
+ InstructionUtils.checkNumFields(parts, 7);
+
+ String opcode = parts[0];
+
+ //handle opcode
+ if(!(opcode.equalsIgnoreCase("ctable"))) {
+ throw new DMLRuntimeException("Unexpected opcode in CtableFEDInstruction: " + inst);
+ }
+
+ //handle operands
+ CPOperand in1 = new CPOperand(parts[1]);
+ CPOperand in2 = new CPOperand(parts[2]);
+ CPOperand in3 = new CPOperand(parts[3]);
+
+ //handle known dimension information
+ String[] dim1Fields = parts[4].split(Instruction.LITERAL_PREFIX);
+ String[] dim2Fields = parts[5].split(Instruction.LITERAL_PREFIX);
+
+ CPOperand out = new CPOperand(parts[6]);
+ boolean ignoreZeros = Boolean.parseBoolean(parts[7]);
+
+ // ctable does not require any operator, so we simply pass-in a dummy operator with null functionobject
+ return new CtableFEDInstruction(in1,
+ in2, in3, out, dim1Fields[0], Boolean.parseBoolean(dim1Fields[1]),
+ dim2Fields[0], Boolean.parseBoolean(dim2Fields[1]), false, ignoreZeros, opcode, inst);
+ }
+
+ @Override
+ public void processInstruction(ExecutionContext ec) {
+ MatrixObject mo1 = ec.getMatrixObject(input1);
+ MatrixObject mo2 = ec.getMatrixObject(input2);
+
+ boolean reversed = false;
+ if(!mo1.isFederated() && mo2.isFederated()) {
+ mo1 = ec.getMatrixObject(input2);
+ mo2 = ec.getMatrixObject(input1);
+ reversed = true;
+ }
+
+ if(mo2.getNumColumns() != 1 && mo1.getNumColumns() != 1)
+ throw new DMLRuntimeException("Federated ctable: Input vectors should be nx1.");
+
+ // get new output dims
+ Long[] dims1 = getOutputDimension(ec, input1, _outDim1, mo1.getFedMapping().getFederatedRanges());
+ Long[] dims2 = getOutputDimension(ec, input2, _outDim2, mo1.getFedMapping().getFederatedRanges());
+
+ MatrixObject mo3 = input3 != null && input3.isMatrix() ? ec.getMatrixObject(input3) : null;
+
+ boolean reversedWeights = mo3 != null && mo3.isFederated() && !(mo1.isFederated() || mo2.isFederated());
+ if(reversedWeights) {
+ mo3 = mo1;
+ mo1 = ec.getMatrixObject(input3);
+ }
+
+ long dim1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ boolean fedOutput = dim1 % mo1.getFedMapping().getSize() == 0 && dims1.length == Arrays.stream(dims1).distinct().count();
+
+ processRequest(ec, mo1, mo2, mo3, reversed, reversedWeights, fedOutput, dims1, dims2);
+ }
+
+ private Future<FederatedResponse>[] processRequest(ExecutionContext ec, MatrixObject mo1, MatrixObject mo2, MatrixObject mo3,
+ boolean reversed, boolean reversedWeights, boolean fedOutput, Long[] dims1, Long[] dims2) {
+ Future<FederatedResponse>[] ffr;
+
+ FederatedRequest[] fr1 = mo1.getFedMapping().broadcastSliced(mo2, false);
+ FederatedRequest fr2, fr3;
+ if(mo3 == null) {
+ if(!reversed)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr4 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4);
+
+ } else {
+ FederatedRequest[] fr4 = mo1.getFedMapping().broadcastSliced(mo3, false);
+ if(!reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {mo1.getFedMapping().getID(), fr1[0].getID(), fr4[0].getID()});
+ else if(reversed && !reversedWeights)
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), mo1.getFedMapping().getID(), fr4[0].getID()});
+ else
+ fr2 = FederationUtils.callInstruction(instString, output, new CPOperand[] {input1, input2, input3}, new long[] {fr1[0].getID(), fr4[0].getID(), mo1.getFedMapping().getID()});
+
+ fr3 = new FederatedRequest(FederatedRequest.RequestType.GET_VAR, fr2.getID());
+ FederatedRequest fr5 = mo1.getFedMapping().cleanup(getTID(), fr1[0].getID(), fr4[0].getID());
+ ffr = mo1.getFedMapping().execute(getTID(), true, fr1, fr2, fr3, fr4[0], fr5);
+ }
+
+ long fedSize = Collections.max(Arrays.asList(dims1), Long::compare) / ffr.length;
+
+ if(fedOutput && isFedOutput(ffr, fedSize)) {
+ // modify instruction string to remove first empty rows
+ MatrixObject out = ec.getMatrixObject(output);
+ setFedOutput(fr2, mo1, out, dims1, dims2, fedSize);
+ } else {
+ ec.setMatrixOutput(output.getName(), aggResult(ffr));
+ }
+ return ffr;
+ }
+
+ boolean isFedOutput(Future<FederatedResponse>[] ffr, long fedSize) {
+ boolean fedOutput = true;
+
+ try {
+ MatrixBlock curr;
+ MatrixBlock prev =(MatrixBlock) ffr[0].get().getData()[0];
+ for(int i = 1; i < ffr.length && fedOutput; i++) {
+ curr = (MatrixBlock) ffr[i].get().getData()[0];
+ MatrixBlock sliced = curr.slice((int) (curr.getNumRows() - fedSize), curr.getNumRows() - 1);
+
+ // no intersection
+ if(curr.getNumRows() == (i+1) * prev.getNumRows() && curr.getNonZeros() <= prev.getLength()
+ && (curr.getNumRows() - sliced.getNumRows()) == i * prev.getNumRows()
+ && curr.getNonZeros() - sliced.getNonZeros() == 0)
+ continue;
+
+ // check intersect with AND and compare number of nnz
+ MatrixBlock prevExtend = new MatrixBlock(curr.getNumRows(), curr.getNumColumns(), 0.0);
+ prevExtend.copy(0, prev.getNumRows()-1, 0, prev.getNumColumns()-1, prev, true);
+
+ MatrixBlock intersect = curr.binaryOperationsInPlace(new BinaryOperator(And.getAndFnObject()), prevExtend);
+ if(intersect.getNonZeros() != 0)
+ fedOutput = false;
+ prev = sliced;
+ }
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ return fedOutput;
+ }
+
+
+ private void setFedOutput(FederatedRequest fr, MatrixObject mo1, MatrixObject out, Long[] dims1, Long[] dims2, long fedSize) {
+ long d1 = Collections.max(Arrays.asList(dims1), Long::compare);
+ long d2 = Collections.max(Arrays.asList(dims1), Long::compare);
+
+ FederationMap fedMap = mo1.getFedMapping();
+ // modify fed ranges
+ for(int i = 0; i < fedMap.getFederatedRanges().length; i++) {
+ fedMap.getFederatedRanges()[i].setBeginDim(0, i == 0 ? 0 : fedMap.getFederatedRanges()[i-1].getEndDims()[0]);
+ fedMap.getFederatedRanges()[i].setEndDim(0, dims1[i]);
+
+ fedMap.getFederatedRanges()[i].setBeginDim(1, i == 0 ? 0 : fedMap.getFederatedRanges()[i-1].getBeginDims()[1]);
+ fedMap.getFederatedRanges()[i].setEndDim(1, dims2[i]);
+ }
+
+ // set output
+ out.getDataCharacteristics().set(d1, d2, (int) mo1.getBlocksize(), mo1.getNnz());
+ out.setFedMapping(fedMap.copyWithNewID(fr.getID()));
+
+ long varID = FederationUtils.getNextFedDataID();
+ out.getFedMapping().mapParallel(varID, (range, data) -> {
+ try {
+ FederatedResponse response = data.executeFederatedOperation(new FederatedRequest(
+ FederatedRequest.RequestType.EXEC_UDF, -1,
+ new SliceOutput(data.getVarID(), fedSize))).get();
+ if(!response.isSuccessful())
+ response.throwExceptionFromResponse();
+ }
+ catch(Exception e) {
+ throw new DMLRuntimeException(e);
+ }
+ return null;
+ });
+ }
+
+ private MatrixBlock aggResult(Future<FederatedResponse>[] ffr) {
+ MatrixBlock resultBlock = new MatrixBlock(1, 1, 0);
+ int dim1 = 0, dim2 = 0;
+ for(int i = 0; i < ffr.length; i++) {
+ try {
+ MatrixBlock mb = ((MatrixBlock) ffr[i].get().getData()[0]);
+ dim1 = mb.getNumRows() > dim1 ? mb.getNumRows() : dim1;
+ dim2 = mb.getNumColumns() > dim2 ? mb.getNumColumns() : dim2;
+
+ // set next and prev to same output dimensions
+ MatrixBlock prev = new MatrixBlock(dim1, dim2, 0.0);
+ prev.copy(0, resultBlock.getNumRows()-1, 0, resultBlock.getNumColumns()-1, resultBlock, true);
+
+ MatrixBlock next = new MatrixBlock(dim1, dim2, 0.0);
+ next.copy(0, mb.getNumRows()-1, 0, mb.getNumColumns()-1, mb, true);
+
+ // add worker results
+ BinaryOperator plus = InstructionUtils.parseBinaryOperator("+");
+ resultBlock = prev.binaryOperationsInPlace(plus, next);
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return resultBlock;
+ }
+
+ private Long[] getOutputDimension(ExecutionContext ec, CPOperand inOp, CPOperand outOp, FederatedRange[] federatedRanges) {
+ MatrixObject in = ec.getMatrixObject(inOp);
Review comment:
You already loaded this input matrix in the processInstruction method. Why don't you just pass that object to this method instead of loading it again?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org