Skip to content

Commit

Permalink
Added python dh native build, start, and stop scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
@stanbrub
stanbrub committed Feb 12, 2024
1 parent 85979c9 commit c065f60
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 54 deletions.
52 changes: 52 additions & 0 deletions .github/scripts/dh-jetty-start.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#!/usr/bin/env bash

set -o errexit
set -o pipefail

# Build and start the python native Deephaven Community Server

MY_ID=DH_JETTY_BY_STAN
ID_PATTERN="-DMY_ID=${MY_ID}"
JAVA=temurin-17-jdk-amd64
ROOT=./tmp/dh-server-jetty
VENV=${ROOT}/py-venv
BIN=${ROOT}/bin
LOGS=${ROOT}/logs

rm -rf server/jetty-app/build/distributions
rm -rf ${ROOT}
mkdir -p ${BIN} ${LOGS}

OLD_JAVA_HOME="${JAVA_HOME}"
export JAVA_HOME=/usr/lib/jvm/${JAVA}
./gradlew server-jetty-app:build
tar xvf server/jetty-app/build/distributions/server-jetty-*.tar -C ${BIN}
export JAVA_HOME="${OLD_JAVA_HOME}"

rm -f $(find py/server/build/wheel -name "*py3-none-any.whl")
./gradlew py-server:assemble
rm -rf ${VENV}
python3 -m venv ${VENV}
source ${VENV}/bin/activate
pip install "$(find py/server/build/wheel -name '*py3-none-any.whl')[autocomplete]"

export DEBUG="${DEBUG:-"-agentlib:jdwp=transport=dt_socket,server=y,suspend=${SUSPEND:-"n"},address=*:5005"}"

export CONSOLE_TYPE="-Ddeephaven.console.type=${CONSOLE:-"python"}"
export STORAGE="${STORAGE:-"-Dstorage.path=./data/"}"

export CYCLE_TM="${CYCLE_TM:-1000}"
export BARRAGE="${BARRAGE:-"-Dbarrage.minUpdateInterval=${CYCLE_TM} -DPeriodicUpdateGraph.targetCycleDurationMillis=${CYCLE_TM}"}"

export GC_APP="-Dio.deephaven.app.GcApplication.enabled=true"
export GRPC_APP="-Dio.deephaven.server.grpc_api_app.GrpcApiApplication.enabled=true"
export APPS="${APPS:-"$GRPC_APP $GC_APP"}"

export AUTH="-DAuthHandlers=io.deephaven.auth.AnonymousAuthenticationHandler"
export EXTRA_OPS="-Xmx24g ${ID_PATTERN}"

cat redpanda-standalone/docker-compose.yml | sed 's/redpanda:29/localhost:29/g' | sed 's/redpanda:80/localhost:80/g' > ${ROOT}/redpanda-docker-compose.yml
docker compose -f ${ROOT}/redpanda-docker-compose.yml up -d

JAVA_OPTS="$DEBUG $STORAGE $APPS $CONSOLE_TYPE $BARRAGE $AUTH $EXTRA_OPS" ${BIN}/server-jetty-*/bin/start &> ${LOGS}/dh.log &

26 changes: 26 additions & 0 deletions .github/scripts/dh-jetty-stop.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash

# set -o errexit
# set -o pipefail
# set -o nounset

# Stop the native python Deephaven Community Server

MY_ID=DH_JETTY_BY_STAN
ID_PATTERN="-DMY_ID=${MY_ID}"
ROOT=./tmp/dh-server-jetty
KILL_FILE=${ROOT}/pkill.stop.count.txt

echo "Shutting Down: ${MY_ID}"
pkill -c -f -SIGTERM "^.*${ID_PATTERN}.*$" > ${KILL_FILE}

STOP_COUNT=$(cat ${KILL_FILE})
if [[ ${STOP_COUNT} -ge 1 ]]; then
echo "Shut Down: ${MY_ID}"
else
echo "Shut Down: Nothing to shut down"
fi

rm -f ${KILL_FILE}

docker compose -f ${ROOT}/redpanda-docker-compose.yml down
55 changes: 1 addition & 54 deletions src/it/java/io/deephaven/benchmark/tests/standard/formula/UserFormulaTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void udfIntArrayToIntNumpyHints() {
var setup = """
def f(arr: npt.NDArray[np.int32]) -> np.int32:
return arr[0]
source = source.update(['int250 = repeat(int250,5)'])
source = source.update(['int250=repeat(int250,5)'])
""";
runner.addSetupQuery(setup);
var q = "source.select(['int250=f(int250)'])";
Expand Down Expand Up @@ -96,57 +96,4 @@ def f(num1: np.int32, num2: np.int32) -> np.int32:
runner.test("UDF- 2 Ints to Int Numpy Hints", q, "int250", "int640");
}

// @Test
// public void udfIntArrayToArrayNumpyHints() {
// runner.setScaleFactors(1, 1);
// var setup = """
// def f(arr: npt.NDArray[np.int32]) -> npt.NDArray[np.int32]:
// return arr
// source = source.update(['int250 = repeat(int250,5)'])
// """;
// runner.addSetupQuery(setup);
// var q = "source.select(['int250=f(int250)'])";
// runner.test("UDF- Int Array to Int Array Numpy Hints", q, "int250");
// }
//
// @Test
// public void udfIntArrayToIntNumbaJit() {
// runner.setScaleFactors(1, 1);
// var setup = """
// @nb.jit(nopython=True)
// def f(arr: npt.NDArray[np.int32]) -> np.int32:
// return arr[0]
// source = source.update(['int250 = repeat(int250,5)'])
// """;
// runner.addSetupQuery(setup);
// var q = "source.select(['int250=f(int250)'])";
// runner.test("UDF- Int Array to Int Numba Jit", q, "int250");
// }
//
// @Test
// public void udfIntToIntArrayNumbaJit() {
// runner.setScaleFactors(1, 1);
// var setup = """
// @nb.jit(nopython=True)
// def f(num: np.int32) -> npt.NDArray[np.int32]:
// return np.repeat(num,5)
// """;
// runner.addSetupQuery(setup);
// var q = "source.select(['int250=f(int250)'])";
// runner.test("UDF- Int to Int Array Numba Jit", q, "int250");
// }
//
// @Test
// public void udf2IntsToIntNumbaJit() {
// runner.setScaleFactors(1, 1);
// var setup = """
// @nb.jit(nopython=True)
// def f(num1: np.int32, num2: np.int32) -> np.int32:
// return num1 + num2
// """;
// runner.addSetupQuery(setup);
// var q = "source.select(['int250=f(int250, int640)'])";
// runner.test("UDF- 2 Ints to Int Numba Jit", q, "int250", "int640");
// }

}

0 comments on commit c065f60

Please sign in to comment.