Skip to content

Commit

Permalink
tableexpand
Browse files Browse the repository at this point in the history
  • Loading branch information
Baunsgaard committed Jan 17, 2025
1 parent b2056eb commit 67e43ee
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ private CtableFEDInstruction(CPOperand in1, CPOperand in2, CPOperand in3, CPOper
}

public static CtableFEDInstruction parseInstruction(CtableCPInstruction inst, ExecutionContext ec) {
if((inst.getOpcode().equalsIgnoreCase("ctable") || inst.getOpcode().equalsIgnoreCase("ctableexpand")) &&
// TODO: add support for new tableexpand intruction.
if((inst.getOpcode().equalsIgnoreCase("ctable") ) &&
((inst.input1.isMatrix() && ec.getCacheableData(inst.input1).isFederated(FType.ROW) ||
(inst.input2.isMatrix() && ec.getCacheableData(inst.input2).isFederated(FType.ROW)) ||
(inst.input3.isMatrix() && ec.getCacheableData(inst.input3).isFederated(FType.ROW)))))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,11 @@ void checkResults(boolean fedOutput) {
compareResults(TOLERANCE);

// check for federated operations
Assert.assertTrue(heavyHittersContainsString("fed_ctable") || heavyHittersContainsString("fed_ctableexpand"));
// TODO: add support for ctableexpand back when rewrite change first parameter to string seq
if(heavyHittersContainsString("ctableexpand"))
return;

Assert.assertTrue(heavyHittersContainsString("fed_ctable") || heavyHittersContainsString("ctableexpand"));
if(fedOutput) { // verify output is federated
Assert.assertTrue(heavyHittersContainsString("fed_uak+"));
Assert.assertTrue(heavyHittersContainsString("fed_*"));
Expand Down

0 comments on commit 67e43ee

Please sign in to comment.