Properly check for conv/sub helper supported

deeplearning4j · Feb 25, 2019 · 72a0251 · 72a0251
1 parent 688be3a
commit 72a0251
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...earning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayer.java b/...earning4j-nn/src/main/java/org/deeplearning4j/nn/layers/convolution/ConvolutionLayer.java
@@ -96,6 +96,10 @@ void initializeHelper() {
             helper = new MKLDNNConvHelper();
             log.info("Created MKLDNNConvHelper");
         }
+        if (helper != null && !helper.checkSupported()) {
+            log.debug("Removed helper {} as not supported", helper.getClass());
+            helper = null;
+        }
     }
 
     @Override

diff --git a/.../src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/SubsamplingLayer.java b/.../src/main/java/org/deeplearning4j/nn/layers/convolution/subsampling/SubsamplingLayer.java
@@ -94,10 +94,13 @@ void initializeHelper() {
                 }
             }
         } else if("CPU".equalsIgnoreCase(backend) ){
-
             //TODO check if native libraries are available
             helper = new MKLDNNSubsamplingHelper();
-            log.info("Created MKL-DNN helper");
+            log.info("Created MKL-DNN helper: MKLDNNSubsamplingHelper");
+        }
+        if (helper != null && !helper.checkSupported()) {
+            log.debug("Removed helper {} as not supported", helper.getClass());
+            helper = null;
         }
     }