Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #1743 - KExtremeMsg.chpl JSON Message Arguments #1744

Merged
merged 1 commit into from
Sep 8, 2022
Merged

Closes #1743 - KExtremeMsg.chpl JSON Message Arguments #1744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions arkouda/pdarrayclass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2224,7 +2224,7 @@ def mink(pda: pdarray, k: int_scalars) -> pdarray:
if pda.size == 0:
raise ValueError("must be a non-empty pdarray of type int or float")

repMsg = generic_msg(cmd="mink", args="{} {} {}".format(pda.name, k, False))
repMsg = generic_msg(cmd="mink", args={"array": pda, "k": k, "rtnInd": False})
return create_pdarray(cast(str, repMsg))


Expand Down Expand Up @@ -2280,7 +2280,7 @@ def maxk(pda: pdarray, k: int_scalars) -> pdarray:
if pda.size == 0:
raise ValueError("must be a non-empty pdarray of type int or float")

repMsg = generic_msg(cmd="maxk", args="{} {} {}".format(pda.name, k, False))
repMsg = generic_msg(cmd="maxk", args={"array": pda, "k": k, "rtnInd": False})
return create_pdarray(repMsg)


Expand Down Expand Up @@ -2333,7 +2333,7 @@ def argmink(pda: pdarray, k: int_scalars) -> pdarray:
if pda.size == 0:
raise ValueError("must be a non-empty pdarray of type int or float")

repMsg = generic_msg(cmd="mink", args="{} {} {}".format(pda.name, k, True))
repMsg = generic_msg(cmd="mink", args={"array": pda, "k": k, "rtnInd": True})
return create_pdarray(repMsg)


Expand Down Expand Up @@ -2389,7 +2389,7 @@ def argmaxk(pda: pdarray, k: int_scalars) -> pdarray:
if pda.size == 0:
raise ValueError("must be a non-empty pdarray of type int or float")

repMsg = generic_msg(cmd="maxk", args="{} {} {}".format(pda.name, k, True))
repMsg = generic_msg(cmd="maxk", args={"array": pda, "k": k, "rtnInd": True})
return create_pdarray(repMsg)


Expand Down
38 changes: 20 additions & 18 deletions src/KExtremeMsg.chpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,23 @@ module KExtremeMsg
proc minkMsg(cmd: string, payload: string, st: borrowed SymTab): MsgTuple throws {
param pn = Reflection.getRoutineName();
var repMsg: string; // response message
// split request into fields
var (name, k, returnIndices) = payload.splitMsgToTuple(3);
var msgArgs = parseMessageArgs(payload, 3);

var vname = st.nextName();

var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st);
var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(msgArgs.getValueOf("array"), st);
var k = msgArgs.get("k").getIntValue();
var returnIndices = msgArgs.get("rtnInd").getBoolValue();

select(gEnt.dtype) {
when (DType.Int64) {
var e = toSymEntry(gEnt,int);
var aV;

if !stringtobool(returnIndices) {
aV = computeExtremaValues(e.a, k:int);
if !returnIndices {
aV = computeExtremaValues(e.a, k);
} else {
aV = computeExtremaIndices(e.a, k:int);
aV = computeExtremaIndices(e.a, k);
}

st.addEntry(vname, new shared SymEntry(aV));
Expand All @@ -62,17 +63,17 @@ module KExtremeMsg
return new MsgTuple(repMsg, MsgType.NORMAL);
}
when (DType.Float64) {
if !stringtobool(returnIndices) {
if !returnIndices {
var e = toSymEntry(gEnt,real);
var aV = computeExtremaValues(e.a, k:int);
var aV = computeExtremaValues(e.a, k);
st.addEntry(vname, new shared SymEntry(aV));

repMsg = "created " + st.attrib(vname);
keLogger.debug(getModuleName(),getRoutineName(),getLineNumber(),repMsg);
return new MsgTuple(repMsg, MsgType.NORMAL);
} else {
var e = toSymEntry(gEnt,real);
var aV = computeExtremaIndices(e.a, k:int);
var aV = computeExtremaIndices(e.a, k);
st.addEntry(vname, new shared SymEntry(aV));

repMsg = "created " + st.attrib(vname);
Expand All @@ -99,20 +100,21 @@ module KExtremeMsg
proc maxkMsg(cmd: string, payload: string, st: borrowed SymTab): MsgTuple throws {
param pn = Reflection.getRoutineName();
var repMsg: string; // response message
// split request into fields
var (name, k, returnIndices) = payload.splitMsgToTuple(3);
var msgArgs = parseMessageArgs(payload, 3);

var vname = st.nextName();
var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(name, st);
var gEnt: borrowed GenSymEntry = getGenericTypedArrayEntry(msgArgs.getValueOf("array"), st);
var k = msgArgs.get("k").getIntValue();
var returnIndices = msgArgs.get("rtnInd").getBoolValue();

select(gEnt.dtype) {
when (DType.Int64) {
var e = toSymEntry(gEnt,int);
var aV;
if !stringtobool(returnIndices) {
aV = computeExtremaValues(e.a, k:int, false);
if !returnIndices {
aV = computeExtremaValues(e.a, k, false);
} else {
aV = computeExtremaIndices(e.a, k:int, false);
aV = computeExtremaIndices(e.a, k, false);
}

st.addEntry(vname, new shared SymEntry(aV));
Expand All @@ -122,9 +124,9 @@ module KExtremeMsg
return new MsgTuple(repMsg, MsgType.NORMAL);
}
when (DType.Float64) {
if !stringtobool(returnIndices) {
if !returnIndices {
var e = toSymEntry(gEnt,real);
var aV = computeExtremaValues(e.a, k:int, false);
var aV = computeExtremaValues(e.a, k, false);

st.addEntry(vname, new shared SymEntry(aV));

Expand All @@ -133,7 +135,7 @@ module KExtremeMsg
return new MsgTuple(repMsg, MsgType.NORMAL);
} else {
var e = toSymEntry(gEnt,real);
var aV = computeExtremaIndices(e.a, k:int, false);
var aV = computeExtremaIndices(e.a, k, false);

st.addEntry(vname, new shared SymEntry(aV));

Expand Down