Skip to content

Commit 6178afa

Browse files
committed
Fix jar selection: use fixed output name compactor-benchmark.jar
The benchmarks-jmh-*.jar glob expands to multiple jars (shaded + javadoc), causing -cp to misinterpret the second jar as the main class. Configure shade plugin outputFile to produce a fixed compactor-benchmark.jar name. Update docs and CI workflow.
1 parent 06fff17 commit 6178afa

4 files changed

Lines changed: 8 additions & 10 deletions

File tree

.github/workflows/run-compaction.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,10 @@ jobs:
9393
SAFE_BRANCH=$(echo "${{ matrix.branch }}" | sed 's/[^A-Za-z0-9_-]/_/g')
9494
echo "safe_branch=$SAFE_BRANCH" >> $GITHUB_OUTPUT
9595
96-
JMH_JAR=$(ls benchmarks-jmh/target/benchmarks-jmh-*.jar | grep -Ev -- '-(javadoc|sources)\.jar$' | head -1)
97-
echo "Using JMH jar: $JMH_JAR"
98-
9996
java --enable-native-access=ALL-UNNAMED --add-modules=jdk.incubator.vector \
10097
-Djvector.experimental.enable_native_vectorization=true \
10198
-Xmx${HALF_MEM_GB}g \
102-
-cp "$JMH_JAR" \
99+
-cp benchmarks-jmh/target/compactor-benchmark.jar \
103100
io.github.jbellis.jvector.bench.CompactorBenchmark \
104101
-p workloadMode=PARTITION_AND_COMPACT \
105102
-p datasetNames=$DATASET \

benchmarks-jmh/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
<goal>shade</goal>
9494
</goals>
9595
<configuration>
96+
<outputFile>${project.build.directory}/compactor-benchmark.jar</outputFile>
9697
<transformers>
9798
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
9899
<mainClass>org.openjdk.jmh.Main</mainClass>

benchmarks-jmh/src/main/java/io/github/jbellis/jvector/bench/CompactorBenchmark.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The default mode builds partitions and immediately compacts them. Use this when
3939

4040
```bash
4141
java -Xmx220g --add-modules jdk.incubator.vector \
42-
-cp benchmarks-jmh/target/benchmarks-jmh-*.jar \
42+
-cp benchmarks-jmh/target/compactor-benchmark.jar \
4343
io.github.jbellis.jvector.bench.CompactorBenchmark \
4444
-p workloadMode=PARTITION_AND_COMPACT \
4545
-p datasetNames=ada002-100k \
@@ -63,7 +63,7 @@ Run with a large heap since the full dataset must be loaded into memory.
6363

6464
```bash
6565
java -Xmx220g --add-modules jdk.incubator.vector \
66-
-cp benchmarks-jmh/target/benchmarks-jmh-*.jar \
66+
-cp benchmarks-jmh/target/compactor-benchmark.jar \
6767
io.github.jbellis.jvector.bench.CompactorBenchmark \
6868
-p workloadMode=PARTITION_ONLY \
6969
-p datasetNames=ada002-100k \
@@ -81,7 +81,7 @@ The dataset is **not** loaded in this mode. Use a small `-Xmx` to measure and pr
8181

8282
```bash
8383
java -Xmx5g --add-modules jdk.incubator.vector \
84-
-cp benchmarks-jmh/target/benchmarks-jmh-*.jar \
84+
-cp benchmarks-jmh/target/compactor-benchmark.jar \
8585
io.github.jbellis.jvector.bench.CompactorBenchmark \
8686
-p workloadMode=COMPACT_ONLY \
8787
-p datasetNames=ada002-100k \

docs/compaction.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ Adjust `-Xmx` to fit the dataset in memory (e.g., 220g for large datasets).
122122

123123
```bash
124124
java -Xmx220g --add-modules jdk.incubator.vector \
125-
-cp benchmarks-jmh/target/benchmarks-jmh-*.jar \
125+
-cp benchmarks-jmh/target/compactor-benchmark.jar \
126126
io.github.jbellis.jvector.bench.CompactorBenchmark \
127127
-p workloadMode=PARTITION_AND_COMPACT \
128128
-p datasetNames=<dataset> \
@@ -140,7 +140,7 @@ To measure how little RAM compaction actually needs — without the dataset occu
140140

141141
```bash
142142
java -Xmx220g --add-modules jdk.incubator.vector \
143-
-cp benchmarks-jmh/target/benchmarks-jmh-*.jar \
143+
-cp benchmarks-jmh/target/compactor-benchmark.jar \
144144
io.github.jbellis.jvector.bench.CompactorBenchmark \
145145
-p workloadMode=PARTITION_ONLY \
146146
-p datasetNames=<dataset> \
@@ -154,7 +154,7 @@ java -Xmx220g --add-modules jdk.incubator.vector \
154154

155155
```bash
156156
java -Xmx5g --add-modules jdk.incubator.vector \
157-
-cp benchmarks-jmh/target/benchmarks-jmh-*.jar \
157+
-cp benchmarks-jmh/target/compactor-benchmark.jar \
158158
io.github.jbellis.jvector.bench.CompactorBenchmark \
159159
-p workloadMode=COMPACT_ONLY \
160160
-p datasetNames=<dataset> \

0 commit comments

Comments
 (0)