Bundle MKL libraries as well when found on the system

CampagneLaboratory · Aug 5, 2016 · bb06449 · bb06449
1 parent 5fbd3db
commit bb06449
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...4j-native/src/main/resources/org/bytedeco/javacpp/properties/linux-x86_64-nd4j.properties b/...4j-native/src/main/resources/org/bytedeco/javacpp/properties/linux-x86_64-nd4j.properties
@@ -21,4 +21,4 @@ platform.framework=
 platform.library.prefix=lib
 platform.library.suffix=.so
 platform.preloadpath=/usr/lib64/:/usr/lib/
-platform.preload=mkl_rt#[email protected]:[email protected]:[email protected]:[email protected]:[email protected]:[email protected]#[email protected]:[email protected]
+platform.preload=mkl_rt:mkl_avx:mkl_avx2:mkl_core:mkl_gnu_thread:mkl_intel_lp64:mkl_intel_thread:mkl_rt#[email protected]:[email protected]:[email protected]:[email protected]:[email protected]:[email protected]#[email protected]:[email protected]
diff --git a/...-native/src/main/resources/org/bytedeco/javacpp/properties/windows-x86_64-nd4j.properties b/...-native/src/main/resources/org/bytedeco/javacpp/properties/windows-x86_64-nd4j.properties
@@ -20,4 +20,4 @@ platform.framework=
 platform.library.prefix=
 platform.library.suffix=.dll
 platform.preloadpath=C:/msys64/mingw64/bin/
-platform.preload=mkl_rt#libopenblas;libwinpthread-1;libgcc_s_seh-1;libgomp-1;libstdc++-6;libquadmath-0;libgfortran-3;libopenblas;libblas3#libopenblas;libblas3;libnd4j
+platform.preload=mkl_rt;mkl_avx;mkl_avx2;mkl_core;mkl_gnu_thread;mkl_intel_lp64;mkl_intel_thread;mkl_rt#libopenblas;libwinpthread-1;libgcc_s_seh-1;libgomp-1;libstdc++-6;libquadmath-0;libgfortran-3;libopenblas;libblas3#libopenblas;libblas3;libnd4j