j143 commented on code in PR #2319: URL: https://github.com/apache/systemds/pull/2319#discussion_r2312232986
########## src/main/java/org/apache/sysds/runtime/instructions/ooc/MatrixMatrixBinaryOOCInstruction.java: ########## @@ -0,0 +1,252 @@ +/* + * 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.ooc; + +import org.apache.sysds.common.Opcodes; +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.parfor.LocalTaskQueue; +import org.apache.sysds.runtime.functionobjects.Multiply; +import org.apache.sysds.runtime.functionobjects.Plus; +import org.apache.sysds.runtime.instructions.InstructionUtils; +import org.apache.sysds.runtime.instructions.cp.CPOperand; +import org.apache.sysds.runtime.instructions.spark.data.IndexedMatrixValue; +import org.apache.sysds.runtime.matrix.data.MatrixBlock; +import org.apache.sysds.runtime.matrix.data.MatrixIndexes; +import org.apache.sysds.runtime.matrix.operators.AggregateBinaryOperator; +import org.apache.sysds.runtime.matrix.operators.AggregateOperator; +import org.apache.sysds.runtime.matrix.operators.BinaryOperator; +import org.apache.sysds.runtime.matrix.operators.Operator; +import org.apache.sysds.runtime.util.CommonThreadPool; + +import java.util.*; +import java.util.concurrent.ExecutorService; + +public class MatrixMatrixBinaryOOCInstruction extends ComputationOOCInstruction { + + + protected MatrixMatrixBinaryOOCInstruction(OOCType type, Operator op, CPOperand in1, CPOperand in2, CPOperand out, String opcode, String istr) { + super(type, op, in1, in2, out, opcode, istr); + } + + public static MatrixMatrixBinaryOOCInstruction parseInstruction(String str) { + String[] parts = InstructionUtils.getInstructionPartsWithValueType(str); + InstructionUtils.checkNumFields(parts, 4); + String opcode = parts[0]; + CPOperand in1 = new CPOperand(parts[1]); // the 1st large matrix (streamed) + CPOperand in2 = new CPOperand(parts[2]); // the 2nd large matrix (streamed) + CPOperand out = new CPOperand(parts[3]); + + AggregateOperator agg = new AggregateOperator(0, Plus.getPlusFnObject()); + AggregateBinaryOperator ba = new AggregateBinaryOperator(Multiply.getMultiplyFnObject(), agg); + + return new MatrixMatrixBinaryOOCInstruction(OOCType.MAPMM, ba, in1, in2, out, opcode, str); + } + + /** + * + * @param ec execution context + */ + @Override + public void processInstruction( ExecutionContext ec ) { + // 1. Identify the inputs + MatrixObject min1 = ec.getMatrixObject(input1); + MatrixObject min2 = ec.getMatrixObject(input2); + + + LocalTaskQueue<IndexedMatrixValue> qIn1 = min1.getStreamHandle(); + LocalTaskQueue<IndexedMatrixValue> qIn2 = min2.getStreamHandle(); + LocalTaskQueue<IndexedMatrixValue> qOut = new LocalTaskQueue<>(); + BinaryOperator plus = InstructionUtils.parseBinaryOperator(Opcodes.PLUS.toString()); + ec.getMatrixObject(output).setStreamHandle(qOut); + + // Result matrix rows, cols = rows of A, cols of B + long resultRowBlocks = min1.getDataCharacteristics().getNumRowBlocks(); + System.out.println("resultRowBlocks: " + resultRowBlocks); + long resultColBlocks = min2.getDataCharacteristics().getNumColBlocks(); + System.out.println("resultColBlocks: " + resultColBlocks); + + ExecutorService pool = CommonThreadPool.get(); + try { + // Core logic: background thread + pool.submit(() -> { + IndexedMatrixValue tmpA = null; + IndexedMatrixValue tmpB = null; + try { + // Phase 1: grouping the output blocks by block Index (The Shuffle) + Map<MatrixIndexes, List<TaggedMatrixValue>> groupedBlocks = new HashMap<>(); + HashMap<Long, MatrixBlock> partialResults = new HashMap<>(); + + // Process matrix A: each block A(i,k) contributes to C(i,j) for all j + while((tmpA = qIn1.dequeueTask()) != LocalTaskQueue.NO_MORE_TASKS) { + long i = tmpA.getIndexes().getRowIndex(); + long k = tmpA.getIndexes().getColumnIndex(); + + for (int j=0; j<resultColBlocks; j++) { + MatrixIndexes index = new MatrixIndexes(i, j); // 1,1= A11,A12,A13,B11,B21,B31 + + // Create a copy + MatrixBlock sourceBlock = (MatrixBlock) tmpA.getValue(); +// sourceBlock.isInSparseFormat(); +// MatrixBlock blockCopy = new MatrixBlock(sourceBlock.getNumRows(), sourceBlock.getNumColumns(), sourceBlock.isInSparseFormat()); + MatrixBlock blockCopy = new MatrixBlock(sourceBlock); +// ((MatrixBlock)tmpA.getValue()).copy(blockCopy); Review Comment: I'm not sure, if this copy is the right way. .copy is giving copied result as 0 x 0 matrix. with this ``` MatrixBlock blockCopy = new MatrixBlock(sourceBlock); ``` I could see the `blockCopy` value is same as `tmpA.getValue()` ########## src/main/java/org/apache/sysds/runtime/instructions/OOCInstructionParser.java: ########## @@ -59,7 +60,8 @@ public static OOCInstruction parseSingleInstruction(InstructionType ooctype, Str return BinaryOOCInstruction.parseInstruction(str); case AggregateBinary: case MAPMM: - return MatrixVectorBinaryOOCInstruction.parseInstruction(str); + return MatrixMatrixBinaryOOCInstruction.parseInstruction(str); +// return MatrixVectorBinaryOOCInstruction.parseInstruction(str); Review Comment: need some help in wiring this. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
