From 24846f54c242a5d95deb7ac59d97ee061af4c201 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Tue, 8 Mar 2022 10:36:50 +0900 Subject: [PATCH] Ensure `zlibwapi.dll` gets preloaded in presets that need it for cuDNN (issue bytedeco/javacv#1767) --- caffe/src/main/java/org/bytedeco/caffe/presets/caffe.java | 2 +- mxnet/src/main/java/org/bytedeco/mxnet/presets/mxnet.java | 2 +- .../main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java | 2 +- .../src/main/java/org/bytedeco/opencv/presets/opencv_core.java | 2 +- pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java | 2 +- .../main/java/org/bytedeco/tensorflow/presets/tensorflow.java | 2 +- .../src/main/java/org/bytedeco/tensorrt/presets/nvinfer.java | 2 +- tvm/src/main/java/org/bytedeco/tvm/presets/tvm_runtime.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/caffe/src/main/java/org/bytedeco/caffe/presets/caffe.java b/caffe/src/main/java/org/bytedeco/caffe/presets/caffe.java index 05aaa1fc088..7af14622818 100644 --- a/caffe/src/main/java/org/bytedeco/caffe/presets/caffe.java +++ b/caffe/src/main/java/org/bytedeco/caffe/presets/caffe.java @@ -80,7 +80,7 @@ public class caffe implements LoadEnabled, InfoMapper { return; } int i = 0; - String[] libs = {"cudart", "cublasLt", "cublas", "curand", "cudnn", + String[] libs = {"cudart", "cublasLt", "cublas", "curand", "cudnn", "zlibwapi", "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; for (String lib : libs) { diff --git a/mxnet/src/main/java/org/bytedeco/mxnet/presets/mxnet.java b/mxnet/src/main/java/org/bytedeco/mxnet/presets/mxnet.java index 02fbc0b5152..0997ef9c524 100644 --- a/mxnet/src/main/java/org/bytedeco/mxnet/presets/mxnet.java +++ b/mxnet/src/main/java/org/bytedeco/mxnet/presets/mxnet.java @@ -77,7 +77,7 @@ public class mxnet implements LoadEnabled, InfoMapper { return; } int i = 0; - String[] libs = {"cudart", "cublasLt", "cublas", "cufft", "curand", "cusolver", "cudnn", "nccl", "nvrtc", + String[] libs = {"cudart", "cublasLt", "cublas", "cufft", "curand", "cusolver", "cudnn", "nccl", "nvrtc", "zlibwapi", "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; for (String lib : libs) { if (platform.startsWith("linux")) { diff --git a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java index c2bb62c9b86..280816c1b45 100644 --- a/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java +++ b/onnxruntime/src/main/java/org/bytedeco/onnxruntime/presets/onnxruntime.java @@ -90,7 +90,7 @@ public class onnxruntime implements LoadEnabled, InfoMapper { return; } int i = 0; - String[] libs = {"cudart", "cublasLt", "cublas", "cufft", "curand", "cudnn", + String[] libs = {"cudart", "cublasLt", "cublas", "cufft", "curand", "cudnn", "zlibwapi", "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; for (String lib : libs) { diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java index 9b09e46854f..d1d57212332 100644 --- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java +++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java @@ -90,7 +90,7 @@ public class opencv_core implements LoadEnabled, InfoMapper { } int i = 0; String[] libs = {"cudart", "cublasLt", "cublas", "cufft", "cudnn", "nppc", "nppial", "nppicc", "nppicom", - "nppidei", "nppif", "nppig", "nppim", "nppist", "nppisu", "nppitc", "npps", + "nppidei", "nppif", "nppig", "nppim", "nppist", "nppisu", "nppitc", "npps", "zlibwapi", "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; for (String lib : libs) { if (platform.startsWith("linux")) { diff --git a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java index 7d6d68e6bdc..aa0ce662f60 100644 --- a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java +++ b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java @@ -458,7 +458,7 @@ public class torch implements LoadEnabled, InfoMapper { } int i = 0; String[] libs = {"cudart", "cublasLt", "cublas", "cufft", "curand", "cusolver", "cusparse", "cudnn", "nccl", "nvrtc", "myelin", "nvinfer", - "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; + "zlibwapi", "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; for (String lib : libs) { if (platform.startsWith("linux")) { lib += lib.startsWith("cudnn") ? "@.8" diff --git a/tensorflow/src/main/java/org/bytedeco/tensorflow/presets/tensorflow.java b/tensorflow/src/main/java/org/bytedeco/tensorflow/presets/tensorflow.java index 54fd81db34d..8643d5edda4 100644 --- a/tensorflow/src/main/java/org/bytedeco/tensorflow/presets/tensorflow.java +++ b/tensorflow/src/main/java/org/bytedeco/tensorflow/presets/tensorflow.java @@ -511,7 +511,7 @@ public void init(Logger logger, java.util.Properties properties, String encoding return; } String[] libs = {"cudart", "cublasLt", "cublas", "cufft", "curand", "cusolver", "cusparse", "cudnn", "nccl", "nvrtc", "myelin", "nvinfer", - "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; + "zlibwapi", "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; for (String lib : libs) { if (platform.startsWith("linux")) { lib += lib.startsWith("cudnn") ? "@.8" diff --git a/tensorrt/src/main/java/org/bytedeco/tensorrt/presets/nvinfer.java b/tensorrt/src/main/java/org/bytedeco/tensorrt/presets/nvinfer.java index fa00ada47ff..922a0e2cd96 100644 --- a/tensorrt/src/main/java/org/bytedeco/tensorrt/presets/nvinfer.java +++ b/tensorrt/src/main/java/org/bytedeco/tensorrt/presets/nvinfer.java @@ -88,7 +88,7 @@ public class nvinfer implements LoadEnabled, InfoMapper { return; } int i = 0; - String[] libs = {"cudart", "cublasLt", "cublas", "cudnn", "nvrtc", + String[] libs = {"cudart", "cublasLt", "cublas", "cudnn", "nvrtc", "zlibwapi", "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; for (String lib : libs) { diff --git a/tvm/src/main/java/org/bytedeco/tvm/presets/tvm_runtime.java b/tvm/src/main/java/org/bytedeco/tvm/presets/tvm_runtime.java index a8077ead71d..176744df131 100644 --- a/tvm/src/main/java/org/bytedeco/tvm/presets/tvm_runtime.java +++ b/tvm/src/main/java/org/bytedeco/tvm/presets/tvm_runtime.java @@ -115,7 +115,7 @@ public class tvm_runtime implements LoadEnabled, InfoMapper { return; } int i = 0; - String[] libs = {"cudart", "cublasLt", "cublas", "cudnn", "nvrtc", + String[] libs = {"cudart", "cublasLt", "cublas", "cudnn", "nvrtc", "zlibwapi", "cudnn_ops_infer", "cudnn_ops_train", "cudnn_adv_infer", "cudnn_adv_train", "cudnn_cnn_infer", "cudnn_cnn_train"}; for (String lib : libs) {