Skip to content

Commit 3c18670

Browse files
committed
Remove max JDK version check
1 parent ced0bd7 commit 3c18670

File tree

6 files changed

+2
-14
lines changed

6 files changed

+2
-14
lines changed

jvector-base/src/main/java/io/github/jbellis/jvector/vector/VectorizationProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected VectorizationProvider() {
7777
// visible for tests
7878
static VectorizationProvider lookup(boolean testMode) {
7979
final int runtimeVersion = Runtime.version().feature();
80-
if (runtimeVersion >= 20 && runtimeVersion <= 22) {
80+
if (runtimeVersion >= 20) {
8181
// is locale sane (only buggy in Java 20)
8282
if (isAffectedByJDK8301190()) {
8383
LOG.warning(
@@ -136,8 +136,6 @@ static VectorizationProvider lookup(boolean testMode) {
136136
} catch (Throwable th) {
137137
throw new AssertionError(th);
138138
}
139-
} else if (runtimeVersion >= 23) {
140-
LOG.warning("You are running with Java 24 or later. To make full use of the Vector API, please update jvector.");
141139
} else {
142140
LOG.warning("You are running with Java 19 or earlier, which do not support the required incubating Vector API. Falling back to slower defaults.");
143141
}

jvector-examples/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@
164164
<arguments>
165165
<argument>-classpath</argument>
166166
<classpath/>
167-
<argument>--enable-preview</argument>
168167
<argument>--enable-native-access=ALL-UNNAMED</argument>
169168
<argument>--add-modules=jdk.incubator.vector</argument>
170169
<argument>-XX:+HeapDumpOnOutOfMemoryError</argument>
@@ -181,7 +180,6 @@
181180
<arguments>
182181
<argument>-classpath</argument>
183182
<classpath/>
184-
<argument>--enable-preview</argument>
185183
<argument>--enable-native-access=ALL-UNNAMED</argument>
186184
<argument>--add-modules=jdk.incubator.vector</argument>
187185
<argument>-XX:+HeapDumpOnOutOfMemoryError</argument>
@@ -196,7 +194,6 @@
196194
<arguments>
197195
<argument>-classpath</argument>
198196
<classpath/>
199-
<argument>--enable-preview</argument>
200197
<argument>--enable-native-access=ALL-UNNAMED</argument>
201198
<argument>--add-modules=jdk.incubator.vector</argument>
202199
<argument>-XX:+HeapDumpOnOutOfMemoryError</argument>
@@ -247,7 +244,6 @@
247244
<arguments>
248245
<argument>-classpath</argument>
249246
<classpath/>
250-
<argument>--enable-preview</argument>
251247
<argument>--enable-native-access=ALL-UNNAMED</argument>
252248
<argument>--add-modules=jdk.incubator.vector</argument>
253249
<argument>-ea</argument>
@@ -262,7 +258,6 @@
262258
<arguments>
263259
<argument>-classpath</argument>
264260
<classpath/>
265-
<argument>--enable-preview</argument>
266261
<argument>--enable-native-access=ALL-UNNAMED</argument>
267262
<argument>--add-modules=jdk.incubator.vector</argument>
268263
<argument>-XX:+HeapDumpOnOutOfMemoryError</argument>
@@ -280,7 +275,6 @@
280275
<arguments>
281276
<argument>-classpath</argument>
282277
<classpath/>
283-
<argument>--enable-preview</argument>
284278
<argument>--enable-native-access=ALL-UNNAMED</argument>
285279
<argument>--add-modules=jdk.incubator.vector</argument>
286280
<argument>-ea</argument>
@@ -295,7 +289,6 @@
295289
<arguments>
296290
<argument>-classpath</argument>
297291
<classpath/>
298-
<argument>--enable-preview</argument>
299292
<argument>--enable-native-access=ALL-UNNAMED</argument>
300293
<argument>--add-modules=jdk.incubator.vector</argument>
301294
<argument>-Djava.util.concurrent.ForkJoinPool.common.parallelism=1</argument>

jvector-native/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<compilerArgs>
2323
<arg>--add-modules</arg>
2424
<arg>jdk.incubator.vector</arg>
25-
<arg>--enable-preview</arg>
2625
</compilerArgs>
2726
</configuration>
2827
</plugin>

jvector-native/src/main/java/io/github/jbellis/jvector/vector/cnative/LibraryLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static boolean loadJvector() {
3737
// as a resource and then copy it to a tmp directory and load it from there
3838
String libName = System.mapLibraryName("jvector");
3939
File tmpLibFile = File.createTempFile(libName.substring(0, libName.lastIndexOf('.')), libName.substring(libName.lastIndexOf('.')));
40-
try (var in = LibraryLoader.class.getResourceAsStream(STR."/\{libName}");
40+
try (var in = LibraryLoader.class.getResourceAsStream("/" + libName);
4141
var out = Files.newOutputStream(tmpLibFile.toPath())) {
4242
if (in != null) {
4343
in.transferTo(out);

jvector-tests/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
--add-modules jdk.incubator.vector
8686
--enable-native-access=ALL-UNNAMED
8787
-Djvector.experimental.enable_native_vectorization=true
88-
--enable-preview
8988
</argLine>
9089
<skip>${skipSIMD}</skip>
9190
</configuration>

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
<skippedModules>jvector-examples,jvector-tests</skippedModules>
120120
<additionalJOptions>
121121
<additionalJOption>--add-modules=jdk.incubator.vector</additionalJOption>
122-
<additionalJOption>--enable-preview</additionalJOption>
123122
</additionalJOptions>
124123
<release>22</release>
125124
</configuration>

0 commit comments

Comments
 (0)