diff --git a/arpack/pom.xml b/arpack/pom.xml index 50ef839..d3de301 100644 --- a/arpack/pom.xml +++ b/arpack/pom.xml @@ -42,7 +42,7 @@ information or have any questions. jar - 5.8.2 + 5.13.4 dev.ludovic.netlib.arpack diff --git a/arpack/src/main/java/dev/ludovic/netlib/arpack/InstanceBuilder.java b/arpack/src/main/java/dev/ludovic/netlib/arpack/InstanceBuilder.java index 0e69aa2..b591a4b 100644 --- a/arpack/src/main/java/dev/ludovic/netlib/arpack/InstanceBuilder.java +++ b/arpack/src/main/java/dev/ludovic/netlib/arpack/InstanceBuilder.java @@ -25,6 +25,7 @@ package dev.ludovic.netlib.arpack; +import java.util.logging.Level; import java.util.logging.Logger; final class InstanceBuilder { @@ -39,6 +40,8 @@ final class InstanceBuilder { nativeArpack = initializeNative(); javaArpack = initializeJava(); arpack = nativeArpack != null ? nativeArpack : javaArpack; + + log.info("Using " + arpack.getClass().getName()); } public static ARPACK arpack() { @@ -49,7 +52,7 @@ private static NativeARPACK initializeNative() { try { return JNIARPACK.getInstance(); } catch (Throwable t) { - log.warning("Failed to load implementation from:" + JNIARPACK.class.getName()); + log.log(Level.FINE, "Failed to load implementation from:" + JNIARPACK.class.getName(), t); return null; } } diff --git a/arpack/src/main/java/dev/ludovic/netlib/arpack/JNIARPACK.java b/arpack/src/main/java/dev/ludovic/netlib/arpack/JNIARPACK.java index dea23de..0abeb2b 100644 --- a/arpack/src/main/java/dev/ludovic/netlib/arpack/JNIARPACK.java +++ b/arpack/src/main/java/dev/ludovic/netlib/arpack/JNIARPACK.java @@ -25,8 +25,9 @@ package dev.ludovic.netlib.arpack; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; @@ -55,7 +56,7 @@ protected JNIARPACK() { StandardCopyOption.REPLACE_EXISTING); temp.toFile().deleteOnExit(); } catch (IOException e) { - throw new RuntimeException("Unable to load native implementation", e); + throw new UncheckedIOException("Unable to load native implementation", e); } System.load(temp.toString()); diff --git a/blas/pom.xml b/blas/pom.xml index 0af504a..2dac2a7 100644 --- a/blas/pom.xml +++ b/blas/pom.xml @@ -42,7 +42,7 @@ information or have any questions. jar - 5.8.2 + 5.13.4 dev.ludovic.netlib.blas diff --git a/blas/src/main/java/dev/ludovic/netlib/blas/InstanceBuilder.java b/blas/src/main/java/dev/ludovic/netlib/blas/InstanceBuilder.java index e5c1792..236fd84 100644 --- a/blas/src/main/java/dev/ludovic/netlib/blas/InstanceBuilder.java +++ b/blas/src/main/java/dev/ludovic/netlib/blas/InstanceBuilder.java @@ -25,6 +25,7 @@ package dev.ludovic.netlib.blas; +import java.util.logging.Level; import java.util.logging.Logger; final class InstanceBuilder { @@ -39,6 +40,8 @@ final class InstanceBuilder { nativeBlas = initializeNative(); javaBlas = initializeJava(); blas = nativeBlas != null ? nativeBlas : javaBlas; + + log.info("Using " + blas.getClass().getName()); } public static BLAS blas() { @@ -49,7 +52,7 @@ private static NativeBLAS initializeNative() { try { return JNIBLAS.getInstance(); } catch (Throwable t) { - log.warning("Failed to load implementation from:" + JNIBLAS.class.getName()); + log.log(Level.FINE, "Failed to load implementation from:" + JNIBLAS.class.getName(), t); return null; } } @@ -69,16 +72,15 @@ private static JavaBLAS initializeJava() { log.finest("trying to return java 16 instance"); return VectorBLAS.getInstance(); } catch (Throwable t) { - log.warning("Failed to load implementation from:" + VectorBLAS.class.getName()); + log.log(Level.FINE, "Failed to load implementation from:" + VectorBLAS.class.getName(), t); } } if (major >= 11) { log.finest("return java 11 instance"); return Java11BLAS.getInstance(); - } else { - log.finest("return java 8 instance"); - return Java8BLAS.getInstance(); } + log.finest("return java 8 instance"); + return Java8BLAS.getInstance(); } public static JavaBLAS javaBlas() { diff --git a/blas/src/main/java/dev/ludovic/netlib/blas/JNIBLAS.java b/blas/src/main/java/dev/ludovic/netlib/blas/JNIBLAS.java index 7cd5d71..b573dfc 100644 --- a/blas/src/main/java/dev/ludovic/netlib/blas/JNIBLAS.java +++ b/blas/src/main/java/dev/ludovic/netlib/blas/JNIBLAS.java @@ -25,8 +25,9 @@ package dev.ludovic.netlib.blas; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; @@ -55,7 +56,7 @@ protected JNIBLAS() { StandardCopyOption.REPLACE_EXISTING); temp.toFile().deleteOnExit(); } catch (IOException e) { - throw new RuntimeException("Unable to load native implementation", e); + throw new UncheckedIOException("Unable to load native implementation", e); } System.load(temp.toString()); diff --git a/lapack/pom.xml b/lapack/pom.xml index be3019b..3b780eb 100644 --- a/lapack/pom.xml +++ b/lapack/pom.xml @@ -42,7 +42,7 @@ information or have any questions. jar - 5.8.2 + 5.13.4 dev.ludovic.netlib.lapack diff --git a/lapack/src/main/java/dev/ludovic/netlib/lapack/InstanceBuilder.java b/lapack/src/main/java/dev/ludovic/netlib/lapack/InstanceBuilder.java index 83be7ea..bb0c5ef 100644 --- a/lapack/src/main/java/dev/ludovic/netlib/lapack/InstanceBuilder.java +++ b/lapack/src/main/java/dev/ludovic/netlib/lapack/InstanceBuilder.java @@ -25,6 +25,7 @@ package dev.ludovic.netlib.lapack; +import java.util.logging.Level; import java.util.logging.Logger; final class InstanceBuilder { @@ -39,6 +40,8 @@ final class InstanceBuilder { nativeLapack = initializeNative(); javaLapack = initializeJava(); lapack = nativeLapack != null ? nativeLapack : javaLapack; + + log.info("Using " + lapack.getClass().getName()); } public static LAPACK lapack() { @@ -49,14 +52,14 @@ private static NativeLAPACK initializeNative() { try { return JNILAPACK.getInstance(); } catch (Throwable t) { - log.warning("Failed to load implementation from:" + JNILAPACK.class.getName()); + log.log(Level.FINE, "Failed to load implementation from:" + JNILAPACK.class.getName(), t); return null; } } public static NativeLAPACK nativeLapack() { if (nativeLapack == null) { - throw new RuntimeException("Unable to load native implementation"); + throw new RuntimeException("Unable to load native LAPACK implementation"); } return nativeLapack; } diff --git a/lapack/src/main/java/dev/ludovic/netlib/lapack/JNILAPACK.java b/lapack/src/main/java/dev/ludovic/netlib/lapack/JNILAPACK.java index 04247eb..4e0fbc0 100644 --- a/lapack/src/main/java/dev/ludovic/netlib/lapack/JNILAPACK.java +++ b/lapack/src/main/java/dev/ludovic/netlib/lapack/JNILAPACK.java @@ -26,6 +26,7 @@ package dev.ludovic.netlib.lapack; import java.io.InputStream; +import java.io.UncheckedIOException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -55,10 +56,11 @@ protected JNILAPACK() { StandardCopyOption.REPLACE_EXISTING); temp.toFile().deleteOnExit(); } catch (IOException e) { - throw new RuntimeException("Unable to load native implementation", e); + throw new UncheckedIOException("Unable to load native implementation", e); } - System.load(temp.toString());} + System.load(temp.toString()); + } public static NativeLAPACK getInstance() { return instance;