Fix initialization of java and native instances

Author: luhenry

arpack/src/main/java/dev/ludovic/netlib/arpack/ARPACK.java

@@ -28,7 +28,7 @@
 public interface ARPACK {
 
   public static ARPACK getInstance() {
-    return InstanceBuilder.getInstance();
+    return InstanceBuilder.arpack();
   }
 
   public void dmout(int lout, int m, int n, double[] a, int lda, int idigit, String ifmt);

arpack/src/main/java/dev/ludovic/netlib/arpack/InstanceBuilder.java

@@ -31,43 +31,41 @@ final class InstanceBuilder {
 
   private static final Logger log = Logger.getLogger(InstanceBuilder.class.getName());
 
-  private static final ARPACK arpack = getInstanceImpl();
+  private static final ARPACK arpack;
+  private static final NativeARPACK nativeArpack;
+  private static final JavaARPACK javaArpack;
 
-  public static ARPACK getInstance() {
-    return arpack;
-  }
-
-  private static ARPACK getInstanceImpl() {
-    try {
-      return NativeARPACK.getInstance();
-    } catch (Throwable t) {
-      log.warning("Failed to load implementation from:" + NativeARPACK.class.getName());
-    }
-    return JavaARPACK.getInstance();
+  static {
+    nativeArpack = initializeNative();
+    javaArpack = initializeJava();
+    arpack = nativeArpack != null ? nativeArpack : javaArpack;
   }
 
-  private static final NativeARPACK nativeArpack = getNativeInstanceImpl();
-
-  public static NativeARPACK getNativeInstance() {
-    return nativeArpack;
+  public static ARPACK arpack() {
+    return arpack;
   }
 
-  private static NativeARPACK getNativeInstanceImpl() {
+  private static NativeARPACK initializeNative() {
     try {
       return JNIARPACK.getInstance();
     } catch (Throwable t) {
       log.warning("Failed to load implementation from:" + JNIARPACK.class.getName());
+      return null;
     }
-    throw new RuntimeException("Unable to load native implementation");
   }
 
-  private static final JavaARPACK javaArpack = getJavaInstanceImpl();
-
-  public static JavaARPACK getJavaInstance() {
-    return javaArpack;
+  public static NativeARPACK nativeArpack() {
+    if (nativeArpack == null) {
+      throw new RuntimeException("Unable to load native implementation");
+    }
+    return nativeArpack;
   }
 
-  private static JavaARPACK getJavaInstanceImpl() {
+  private static JavaARPACK initializeJava() {
     return F2jARPACK.getInstance();
   }
+
+  public static JavaARPACK javaArpack() {
+    return javaArpack;
+  }
 }

arpack/src/main/java/dev/ludovic/netlib/arpack/JavaARPACK.java

@@ -28,6 +28,6 @@
 public interface JavaARPACK extends ARPACK {
 
   public static JavaARPACK getInstance() {
-    return InstanceBuilder.getJavaInstance();
+    return InstanceBuilder.javaArpack();
   }
 }

arpack/src/main/java/dev/ludovic/netlib/arpack/NativeARPACK.java

@@ -28,6 +28,6 @@
 public interface NativeARPACK extends ARPACK {
 
   public static NativeARPACK getInstance() {
-    return InstanceBuilder.getNativeInstance();
+    return InstanceBuilder.nativeArpack();
   }
 }

blas/src/main/java/dev/ludovic/netlib/blas/BLAS.java

@@ -28,7 +28,7 @@
 public interface BLAS {
 
   public static BLAS getInstance() {
-    return InstanceBuilder.getInstance();
+    return InstanceBuilder.blas();
   }
 
   public double dasum(int n, double[] x, int incx);

blas/src/main/java/dev/ludovic/netlib/blas/InstanceBuilder.java

@@ -31,56 +31,57 @@ final class InstanceBuilder {
 
   private static final Logger log = Logger.getLogger(InstanceBuilder.class.getName());
 
-  private static final BLAS blas = getInstanceImpl();
+  private static final BLAS blas;
+  private static final NativeBLAS nativeBlas;
+  private static final JavaBLAS javaBlas;
 
-  public static BLAS getInstance() {
-    return blas;
-  }
-
-  private static dev.ludovic.netlib.blas.BLAS getInstanceImpl() {
-    try {
-      return NativeBLAS.getInstance();
-    } catch (Throwable t) {
-      log.warning("Failed to load implementation from:" + dev.ludovic.netlib.blas.NativeBLAS.class.getName());
-    }
-    return JavaBLAS.getInstance();
+  static {
+    nativeBlas = initializeNative();
+    javaBlas = initializeJava();
+    blas = nativeBlas != null ? nativeBlas : javaBlas;
   }
 
-  private static final NativeBLAS nativeBlas = getNativeInstanceImpl();
-
-  public static NativeBLAS getNativeInstance() {
-    return nativeBlas;
+  public static BLAS blas() {
+    return blas;
   }
 
-  private static NativeBLAS getNativeInstanceImpl() {
+  private static NativeBLAS initializeNative() {
     try {
       return JNIBLAS.getInstance();
     } catch (Throwable t) {
       log.warning("Failed to load implementation from:" + JNIBLAS.class.getName());
+      return null;
     }
-    throw new RuntimeException("Unable to load native implementation");
   }
 
-  private static final JavaBLAS javaBlas = getJavaInstanceImpl();
-
-  public static JavaBLAS getJavaInstance() {
-    return javaBlas;
+  public static NativeBLAS nativeBlas() {
+    if (nativeBlas == null) {
+      throw new RuntimeException("Unable to load native implementation");
+    }
+    return nativeBlas;
   }
 
-  private static JavaBLAS getJavaInstanceImpl() {
+  private static JavaBLAS initializeJava() {
     String[] fullVersion = System.getProperty("java.version").split("[+.\\-]+", 2);
     int major = Integer.parseInt(fullVersion[0]);
     if (major >= 16) {
       try {
+        System.out.println("trying to return java 16 instance");
         return VectorBLAS.getInstance();
       } catch (Throwable t) {
         log.warning("Failed to load implementation from:" + VectorBLAS.class.getName());
       }
     }
     if (major >= 11) {
+      System.out.println("return java 11 instance");
       return Java11BLAS.getInstance();
     } else {
+      System.out.println("return java 8 instance");
       return Java8BLAS.getInstance();
     }
   }
+
+  public static JavaBLAS javaBlas() {
+    return javaBlas;
+  }
 }

blas/src/main/java/dev/ludovic/netlib/blas/JavaBLAS.java

@@ -28,6 +28,6 @@
 public interface JavaBLAS extends BLAS {
 
   public static JavaBLAS getInstance() {
-    return InstanceBuilder.getJavaInstance();
+    return InstanceBuilder.javaBlas();
   }
 }

blas/src/main/java/dev/ludovic/netlib/blas/NativeBLAS.java

@@ -28,6 +28,6 @@
 public interface NativeBLAS extends BLAS {
 
   public static NativeBLAS getInstance() {
-    return InstanceBuilder.getNativeInstance();
+    return InstanceBuilder.nativeBlas();
   }
 }

lapack/src/main/java/dev/ludovic/netlib/lapack/InstanceBuilder.java

@@ -31,43 +31,41 @@ final class InstanceBuilder {
 
   private static final Logger log = Logger.getLogger(InstanceBuilder.class.getName());
 
-  private static final LAPACK lapack = getInstanceImpl();
+  private static final LAPACK lapack;
+  private static final NativeLAPACK nativeLapack;
+  private static final JavaLAPACK javaLapack;
 
-  public static LAPACK getInstance() {
-    return lapack;
-  }
-
-  private static LAPACK getInstanceImpl() {
-    try {
-      return NativeLAPACK.getInstance();
-    } catch (Throwable t) {
-      log.warning("Failed to load implementation from:" + NativeLAPACK.class.getName());
-    }
-    return JavaLAPACK.getInstance();
+  static {
+    nativeLapack = initializeNative();
+    javaLapack = initializeJava();
+    lapack = nativeLapack != null ? nativeLapack : javaLapack;
   }
 
-  private static final NativeLAPACK nativeLapack = getNativeInstanceImpl();
-
-  public static NativeLAPACK getNativeInstance() {
-    return nativeLapack;
+  public static LAPACK lapack() {
+    return lapack;
   }
 
-  private static NativeLAPACK getNativeInstanceImpl() {
+  private static NativeLAPACK initializeNative() {
     try {
       return JNILAPACK.getInstance();
     } catch (Throwable t) {
       log.warning("Failed to load implementation from:" + JNILAPACK.class.getName());
+      return null;
     }
-    throw new RuntimeException("Unable to load native implementation");
   }
 
-  private static final JavaLAPACK javaLapack = getJavaInstanceImpl();
-
-  public static JavaLAPACK getJavaInstance() {
-    return javaLapack;
+  public static NativeLAPACK nativeLapack() {
+    if (nativeLapack == null) {
+      throw new RuntimeException("Unable to load native implementation");
+    }
+    return nativeLapack;
   }
 
-  private static JavaLAPACK getJavaInstanceImpl() {
+  private static JavaLAPACK initializeJava() {
     return F2jLAPACK.getInstance();
   }
+
+  public static JavaLAPACK javaLapack() {
+    return javaLapack;
+  }
 }

lapack/src/main/java/dev/ludovic/netlib/lapack/JavaLAPACK.java

@@ -28,6 +28,6 @@
 public interface JavaLAPACK extends LAPACK {
 
   public static JavaLAPACK getInstance() {
-    return InstanceBuilder.getJavaInstance();
+    return InstanceBuilder.javaLapack();
   }
 }