* Add missing mkl_gnu_thread preload in presets for OpenBLAS, MKL-…

…DNN, and TensorFlow (pull #729)
bytedeco · May 21, 2019 · 13a23ec · 13a23ec
1 parent d13bbe9
commit 13a23ec
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Add missing `mkl_gnu_thread` preload in presets for OpenBLAS, MKL-DNN, and TensorFlow ([pull #729](https://github.com/bytedeco/javacpp-presets/pull/729))
  * Overload `Tensor.create()` factory methods for TensorFlow with handy `long... shape` ([issue bytedeco/javacpp#301](https://github.com/bytedeco/javacpp/issues/301))
  * Add build for `linux-arm64` to presets for OpenBLAS ([pull #726](https://github.com/bytedeco/javacpp-presets/pull/726))
  * Bundle complete binary packages of CPython itself for convenience ([issue #712](https://github.com/bytedeco/javacpp-presets/issues/712))

diff --git a/mkl-dnn/src/main/java/org/bytedeco/mkldnn/presets/mklml.java b/mkl-dnn/src/main/java/org/bytedeco/mkldnn/presets/mklml.java
@@ -79,7 +79,7 @@ public class mklml implements LoadEnabled, InfoMapper {
         int i = 0;
         if (lib.equals("mkl") || lib.equals("mkl_rt")) {
             String[] libs = {"iomp5", "libiomp5md", "mkl_core", "mkl_avx", "mkl_avx2", "mkl_avx512", "mkl_avx512_mic",
-                             "mkl_def", "mkl_mc", "mkl_mc3", "mkl_intel_lp64", "mkl_intel_thread", "mkl_rt"};
+                             "mkl_def", "mkl_mc", "mkl_mc3", "mkl_intel_lp64", "mkl_intel_thread", "mkl_gnu_thread", "mkl_rt"};
             for (i = 0; i < libs.length; i++) {
                 preloads.add(i, libs[i] + "#" + libs[i]);
             }

diff --git a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java
@@ -92,7 +92,7 @@ public class openblas_nolapack implements LoadEnabled, InfoMapper {
                 resources.add("/org/bytedeco/mkldnn/");
             } else if (lib.equals("mkl") || lib.equals("mkl_rt")) {
                 String[] libs = {"iomp5", "libiomp5md", "mkl_core", "mkl_avx", "mkl_avx2", "mkl_avx512", "mkl_avx512_mic",
-                                 "mkl_def", "mkl_mc", "mkl_mc3", "mkl_intel_lp64", "mkl_intel_thread", "mkl_rt"};
+                                 "mkl_def", "mkl_mc", "mkl_mc3", "mkl_intel_lp64", "mkl_intel_thread", "mkl_gnu_thread", "mkl_rt"};
                 for (i = 0; i < libs.length; i++) {
                     preloads.add(i, libs[i] + "#" + libs[i]);
                 }

diff --git a/tensorflow/src/main/java/org/bytedeco/tensorflow/presets/tensorflow.java b/tensorflow/src/main/java/org/bytedeco/tensorflow/presets/tensorflow.java
@@ -431,7 +431,7 @@ public void init(Logger logger, java.util.Properties properties, String encoding
         int i = 0;
         if (load.equals("mkl") || load.equals("mkl_rt")) {
             String[] libs = {"iomp5", "libiomp5md", "mkl_core", "mkl_avx", "mkl_avx2", "mkl_avx512", "mkl_avx512_mic",
-                             "mkl_def", "mkl_mc", "mkl_mc3", "mkl_intel_lp64", "mkl_intel_thread", "mkl_rt"};
+                             "mkl_def", "mkl_mc", "mkl_mc3", "mkl_intel_lp64", "mkl_intel_thread", "mkl_gnu_thread", "mkl_rt"};
             for (i = 0; i < libs.length; i++) {
                 preloads.add(i, libs[i] + "#" + libs[i]);
             }