Merge branch 'main' of https://github.com/msrocka/olca-mkl

README.md

@@ -6,7 +6,19 @@ This is an experimental project that links the Intel Math Kernel (MKL) as calcul
 
 ## Building
 
-The build scripts are written in Dart so that you need to have a current version of Dart (3.x) installed.
+The build scripts are written in Dart so that you need to have a current version of Dart (3.x) installed as well as the `archive`
+library. To install the library, run:
+```bash
+dart pub add archive
+```
+
+On macOS with Apple M1/M2, one will need to set the Rust toolchain to `stable-x86_64-apple-darwin`:
+```bash
+rustup install stable-x86_64-apple-darwin
+rustup default stable-x86_64-apple-darwin
+```
+
+Then to build:
 
 ```bash
 cd olca-mkl
@@ -19,6 +31,15 @@ The Java part has an `MKL` class with the native method-bindings and methods for
 
 **Note** that there is only support for `x64` CPUs, e.g.  on macOS M1/2, you need to run a `x64` JVM using the compatibility layer.
 
+## Python scripts
+
+On macOS Apple M1/M2, one needs to use `python3-intel64`:
+
+```bash
+python3-intel64 -m pip install scipy numpy
+python3-intel64 scripts/pardiso_example.py
+```
+
 ## TODO
 
 * test performance on AMD processors (we added a method `mkl_serv_intel_cpu_true`, see https://danieldk.eu/mkl-amd-zen/)

build/deps.dart

@@ -92,7 +92,7 @@ fetch() async {
           e.name.contains("third-party-programs.txt")) {
         var name = lib.name + "_" + e.name.split("/").last;
         var licenseFile = File(workDir.path + "/" + name);
-        print("consinder the license(s) in ${licenseFile.path}");
+        print("consider the license(s) in ${licenseFile.path}");
         if (!licenseFile.existsSync()) {
           licenseFile
             ..createSync()

scripts/pardiso_example.py

@@ -2,8 +2,17 @@
 
 import ctypes
 import numpy as np
+from sys import platform
+
+if platform == "darwin":
+    lib = ctypes.CDLL("./bin/libmkl_rt.2.dylib")
+elif platform == "win32":
+    lib = ctypes.CDLL("./bin/mkl_rt.2.dll")
+elif platform == "linux" or platform == "linux2":
+    lib = ctypes.CDLL("./bin/mkl_rt.2.so")
+else:
+    raise Exception("Could not detect the OS.")
 
-lib = ctypes.CDLL("./bin/mkl_rt.2.dll")
 # lib = ctypes.CDLL("./bin/libmkl_rt.so.2")
 pardiso = lib.pardiso
 pardiso.argtypes = [

scripts/solve_sparse_example.py

@@ -1,9 +1,18 @@
 import ctypes
 import numpy as np
+
 from scipy.sparse import csc_matrix
+from sys import platform
 
+if platform == "darwin":
+    lib = ctypes.CDLL("./bin/libolcamkl.dylib")
+elif platform == "win32":
+    lib = ctypes.CDLL("./bin/olcamkl.dll")
+elif platform == "linux" or platform == "linux2":
+    lib = ctypes.CDLL("./bin/olcamkl.so")
+else:
+    raise Exception("Could not detect the OS.")
 
-lib = ctypes.CDLL("./bin/olcamkl.dll")
 solve = lib.solve_sparse
 float_ptr = ctypes.POINTER(ctypes.c_double)
 int_ptr = ctypes.POINTER(ctypes.c_int32)

src/main/java/org/openlca/mkl/OS.java

@@ -10,7 +10,7 @@ enum OS {
 	}),
 
 	MacOS(new String[]{
-		"libmkl_rt.dylib",
+		"libmkl_rt.2.dylib",
 		"libolcamkl.dylib"
 	}),
 

src/mkl.rs

@@ -3,7 +3,7 @@ use std::ffi::c_char;
 #[allow(non_snake_case)]
 #[cfg_attr(target_os = "windows", link(name = "mkl_rt.2"))]
 #[cfg_attr(target_os = "linux", link(name = "mkl_rt"))]
-#[cfg_attr(target_os = "macos", link(name = "mkl_rt"))]
+#[cfg_attr(target_os = "macos", link(name = "mkl_rt.2"))]
 extern "C" {
 
   /// [DGEMV](http://www.netlib.org/lapack/explore-html/dc/da8/dgemv_8f.html)