Skip to content

Commit

Permalink
rename fury-benchmark to benchmark
Browse files Browse the repository at this point in the history
  • Loading branch information
chaokunyang committed Jan 7, 2024
1 parent bcd3665 commit 0301dd8
Show file tree
Hide file tree
Showing 68 changed files with 24 additions and 628 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java/fury-benchmark export-ignore
java/benchmark export-ignore
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ jobs:
with:
java-version: 8
distribution: 'temurin'
- name: Install fury-benchmark jar
run: |
cd java && mvn -T10 -B --no-transfer-progress clean install -DskipTests && cd -
cd java/fury-benchmark && mvn -T10 -B --no-transfer-progress clean install -DskipTests -Pjmh && cd -
- name: Run CI
run: ./ci/run_ci.sh integration_tests

Expand Down
16 changes: 8 additions & 8 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The text of each license is the standard Apache 2.0 license.

* fast-serialization (https://github.com/RuedigerMoeller/fast-serialization)
Files:
java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java
java/benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java

* ray (https://github.com/ray-project/ray)
Files:
Expand All @@ -54,13 +54,13 @@ The text of each license is also included in licenses/LICENSE-[project].txt.

* kryo (https://github.com/EsotericSoftware/kryo)
Files:
java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Data.java
java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Image.java
java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Media.java
java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/MediaContent.java
java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Sample.java
java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/BufferType.java
java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java
java/benchmark/src/main/java/org/apache/fury/benchmark/data/Data.java
java/benchmark/src/main/java/org/apache/fury/benchmark/data/Image.java
java/benchmark/src/main/java/org/apache/fury/benchmark/data/Media.java
java/benchmark/src/main/java/org/apache/fury/benchmark/data/MediaContent.java
java/benchmark/src/main/java/org/apache/fury/benchmark/data/Sample.java
java/benchmark/src/main/java/org/apache/fury/benchmark/state/BufferType.java
java/benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java
java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java
java/fury-core/src/main/java/org/apache/fury/collection/IdentityMap.java
java/fury-core/src/main/java/org/apache/fury/collection/IdentityObjectIntMap.java
Expand Down
2 changes: 1 addition & 1 deletion ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ bump_java_version() {
cd "$ROOT/java"
echo "Set fury java version to $version"
mvn versions:set -DnewVersion="$version"
cd "$ROOT/java/fury-benchmark"
cd "$ROOT/java/benchmark"
mvn versions:set -DnewVersion="$version"
echo "Set fury integration_tests version to $version"
cd "$ROOT/integration_tests/jdk_compatibility_tests"
Expand Down
2 changes: 1 addition & 1 deletion ci/format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ format_java() {
cd "$ROOT/java"
mvn -T10 --no-transfer-progress spotless:apply
mvn -T10 --no-transfer-progress checkstyle:check
cd "$ROOT/java/fury-benchmark"
cd "$ROOT/java/benchmark"
mvn -T10 --no-transfer-progress spotless:apply
cd "$ROOT/integration_tests"
dirs=("graalvm_tests" "jdk_compatibility_tests" "latest_jdk_tests")
Expand Down
2 changes: 1 addition & 1 deletion ci/run_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ integration_tests() {
cd "$ROOT"/java
mvn -T10 -B --no-transfer-progress clean install -DskipTests
echo "benchmark tests"
cd "$ROOT"/java/fury-benchmark
cd "$ROOT"/java/benchmark
mvn -T10 -B --no-transfer-progress clean test -Pjmh
echo "Start latest jdk tests"
cd "$ROOT"/integration_tests/latest_jdk_tests
Expand Down
4 changes: 2 additions & 2 deletions integration_tests/jdk_compatibility_tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.fury</groupId>
<artifactId>fury-benchmark</artifactId>
<artifactId>benchmark</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand All @@ -66,4 +66,4 @@
</plugins>
</build>

</project>
</project>
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion java/fury-benchmark/pom.xml → java/benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<version>0.5.0-SNAPSHOT</version>
</parent>

<artifactId>fury-benchmark</artifactId>
<artifactId>benchmark</artifactId>
<packaging>jar</packaging>

<prerequisites>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 0301dd8

Please sign in to comment.