Skip to content

Commit

Permalink
perf(java): merge perftests into benchmark (#1318)
Browse files Browse the repository at this point in the history
  • Loading branch information
chaokunyang authored Jan 7, 2024
1 parent 2d04ac1 commit bcd3665
Show file tree
Hide file tree
Showing 29 changed files with 211 additions and 488 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
java/fury-benchmark export-ignore
integration_tests/perftests export-ignore
4 changes: 1 addition & 3 deletions ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ bump_java_version() {
echo "Set fury integration_tests version to $version"
cd "$ROOT/integration_tests/jdk_compatibility_tests"
mvn versions:set -DnewVersion="$version"
cd "$ROOT/integration_tests/perftests"
mvn versions:set -DnewVersion="$version"
cd "$ROOT/integration_tests/latest_jdk_tests"
mvn versions:set -DnewVersion="$version"
}
Expand Down Expand Up @@ -176,4 +174,4 @@ python) # Deploy wheel to pypi
echo "Execute command $*"
"$@"
;;
esac
esac
4 changes: 2 additions & 2 deletions ci/format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ BLACK_VERSION_REQUIRED="22.1.0"
SHELLCHECK_VERSION_REQUIRED="0.7.1"

install_nodejs() {
#intall nodejs
#intall nodejs
filename="node-v16.17.1-linux-x64"
pkg="$filename.tar.gz"
NODE_URL="https://nodejs.org/dist/v16.17.1/$pkg"
Expand Down Expand Up @@ -188,7 +188,7 @@ format_java() {
cd "$ROOT/java/fury-benchmark"
mvn -T10 --no-transfer-progress spotless:apply
cd "$ROOT/integration_tests"
dirs=("graalvm_tests" "jdk_compatibility_tests" "latest_jdk_tests" "perftests")
dirs=("graalvm_tests" "jdk_compatibility_tests" "latest_jdk_tests")
for d in "${dirs[@]}" ; do
pushd "$d"
mvn -T10 --no-transfer-progress spotless:apply
Expand Down
3 changes: 3 additions & 0 deletions ci/run_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ graalvm_test() {
integration_tests() {
cd "$ROOT"/java
mvn -T10 -B --no-transfer-progress clean install -DskipTests
echo "benchmark tests"
cd "$ROOT"/java/fury-benchmark
mvn -T10 -B --no-transfer-progress clean test -Pjmh
echo "Start latest jdk tests"
cd "$ROOT"/integration_tests/latest_jdk_tests
echo "latest_jdk_tests: JDK 21"
Expand Down
3 changes: 2 additions & 1 deletion integration_tests/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Integration tests for fury:
- [jdk_compatibility_tests](jdk_compatibility_tests): test fury compatibility across multiple jdk versions.
- [perftests](perftests): benchmark with protobuf/flatbuffers directly.
- [latest_jdk_tests](latest_jdk_tests): test latest jdk.
- [graalvm_tests](graalvm_tests): test graalvm native image support.

> Note that this integration_tests is not designed as a maven multi-module project on purpose, so we can introduce features of higher jdk version without breaking compilation for lower jdk, and add integration tests for other languages.
24 changes: 0 additions & 24 deletions integration_tests/perftests/README.md

This file was deleted.

251 changes: 0 additions & 251 deletions integration_tests/perftests/pom.xml

This file was deleted.

Loading

0 comments on commit bcd3665

Please sign in to comment.