Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add mkl_gnu_thread #729

Merged
merged 8 commits into from
May 21, 2019
Merged

Add mkl_gnu_thread #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b34b51
* Link OpenCV with OpenBLAS/MKL to accelerate some matrix operations
saudet Apr 15, 2019
b842d33
Merge branch 'master' of https://github.com/bytedeco/javacpp-presets
HGuillemet Apr 16, 2019
1836492
Merge branch 'master' of https://github.com/bytedeco/javacpp-presets
HGuillemet Apr 17, 2019
b478cf0
Merge branch 'master' of https://github.com/bytedeco/javacpp-presets
HGuillemet Apr 24, 2019
fe8b287
Merge branch 'master' of https://github.com/bytedeco/javacpp-presets
HGuillemet May 19, 2019
e24ccc5
Added lib mkl_gnu_thread when wrapping MKL
HGuillemet May 20, 2019
cf0e90d
Add more missing entries for mkl_gnu_thread
saudet May 21, 2019
9299ad6
Update CHANGELOG.md
saudet May 21, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
2 changes: 1 addition & 1 deletion mkl-dnn/src/main/java/org/bytedeco/mkldnn/presets/mklml.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
Expand Down
2 changes: 1 addition & 1 deletion openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/src/main/java/org/bytedeco/tensorflow/presets/tensorflow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
Expand Down