Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions arpack/src/main/java/dev/ludovic/netlib/arpack/JNIARPACK.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.FileAttribute;
import java.nio.file.attribute.PosixFilePermissions;

final class JNIARPACK extends AbstractARPACK implements NativeARPACK {
Expand All @@ -42,24 +44,31 @@ protected JNIARPACK() {
if (osName == null || osName.isEmpty()) {
throw new RuntimeException("Unable to load native implementation");
}
boolean isWindows = osName.startsWith("Windows");
if (osName.equals("Mac OS X")) {
osName = "macos";
} else if (isWindows) {
osName = "windows";
}
String osArch = System.getProperty("os.arch");
if (osArch == null || osArch.isEmpty()) {
throw new RuntimeException("Unable to load native implementation");
}

String libPrefix = "libnetlibarpackjni";
String libExtension = osName.equals("macos") ? ".dylib" : ".so";
String libExtension = osName.equals("macos") ? ".dylib" : isWindows ? ".dll" : ".so";
String libName = libPrefix + libExtension;

FileAttribute<?>[] attrs = FileSystems.getDefault()
.supportedFileAttributeViews().contains("posix")
? new FileAttribute<?>[]{ PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-x---")) }
: new FileAttribute<?>[0];

Path temp;
try (InputStream resource = this.getClass().getClassLoader().getResourceAsStream(
String.format("resources/native/%s-%s/%s", osName, osArch, libName))) {
assert resource != null;
Files.copy(resource, temp = Files.createTempFile(libPrefix, libExtension,
PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-x---"))),
Files.copy(resource, temp = Files.createTempFile(libPrefix, libExtension, attrs),
StandardCopyOption.REPLACE_EXISTING);
temp.toFile().deleteOnExit();
} catch (IOException e) {
Expand Down
15 changes: 11 additions & 4 deletions blas/src/main/java/dev/ludovic/netlib/blas/JNIBLAS.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.FileAttribute;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.logging.Logger;

Expand All @@ -45,27 +47,32 @@ protected JNIBLAS() {
if (osName == null || osName.isEmpty()) {
throw new RuntimeException("Unable to load native implementation");
}
boolean isWindows = osName.startsWith("Windows");
if (osName.equals("Mac OS X")) {
osName = "macos";
} else if (isWindows) {
osName = "windows";
}
String osArch = System.getProperty("os.arch");
if (osArch == null || osArch.isEmpty()) {
throw new RuntimeException("Unable to load native implementation");
}

String libPrefix = "libnetlibblasjni";
String libExtension = osName.equals("macos") ? ".dylib" : ".so";
String libExtension = osName.equals("macos") ? ".dylib" : isWindows ? ".dll" : ".so";
String libName = libPrefix + libExtension;

log.fine(String.format("Trying to load native implementation from resource: resources/native/%s-%s/%s", osName, osArch, libName));
FileAttribute<?>[] attrs = FileSystems.getDefault()
.supportedFileAttributeViews().contains("posix")
? new FileAttribute<?>[]{ PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-x---")) }
: new FileAttribute<?>[0];

Path temp;
try (InputStream resource = this.getClass().getClassLoader().getResourceAsStream(
String.format("resources/native/%s-%s/%s", osName, osArch, libName))) {
assert resource != null;
Files.copy(resource, temp = Files.createTempFile(libPrefix, libExtension,
PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-x---"))),
StandardCopyOption.REPLACE_EXISTING);
Files.copy(resource, temp = Files.createTempFile(libPrefix, libExtension, attrs), StandardCopyOption.REPLACE_EXISTING);
temp.toFile().deleteOnExit();
} catch (IOException e) {
throw new UncheckedIOException("Unable to load native implementation", e);
Expand Down
15 changes: 12 additions & 3 deletions lapack/src/main/java/dev/ludovic/netlib/lapack/JNILAPACK.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.io.IOException;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.FileAttribute;
import java.nio.file.attribute.PosixFilePermissions;

final class JNILAPACK extends AbstractLAPACK implements NativeLAPACK {
Expand All @@ -42,24 +44,31 @@ protected JNILAPACK() {
if (osName == null || osName.isEmpty()) {
throw new RuntimeException("Unable to load native implementation");
}
boolean isWindows = osName.startsWith("Windows");
if (osName.equals("Mac OS X")) {
osName = "macos";
} else if (isWindows) {
osName = "windows";
}
String osArch = System.getProperty("os.arch");
if (osArch == null || osArch.isEmpty()) {
throw new RuntimeException("Unable to load native implementation");
}

String libPrefix = "libnetliblapackjni";
String libExtension = osName.equals("macos") ? ".dylib" : ".so";
String libExtension = osName.equals("macos") ? ".dylib" : isWindows ? ".dll" : ".so";
String libName = libPrefix + libExtension;

FileAttribute<?>[] attrs = FileSystems.getDefault()
.supportedFileAttributeViews().contains("posix")
? new FileAttribute<?>[]{ PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-x---")) }
: new FileAttribute<?>[0];

Path temp;
try (InputStream resource = this.getClass().getClassLoader().getResourceAsStream(
String.format("resources/native/%s-%s/%s", osName, osArch, libName))) {
assert resource != null;
Files.copy(resource, temp = Files.createTempFile(libPrefix, libExtension,
PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwxr-x---"))),
Files.copy(resource, temp = Files.createTempFile(libPrefix, libExtension, attrs),
StandardCopyOption.REPLACE_EXISTING);
temp.toFile().deleteOnExit();
} catch (IOException e) {
Expand Down
Loading