Merge with master, works with Jetpack 4.3

Signed-off-by: xavier <micaelaverucchi@gmail.com>
2020-01-15 19:24:19 +01:00
parent 23a1365dc4 c32a0be257
commit 0f0c8c28e1
10 changed files with 59 additions and 35 deletions
@@ -18,10 +18,6 @@ Network::Network(dataDim_t input_dim) {
    dataType = CUDNN_DATA_FLOAT;
    tensorFormat = CUDNN_TENSOR_NCHW;
    dontLoadWeights = false;
-
-    checkCUDNN( cudnnCreate(&cudnnHandle) );
-    checkERROR( cublasCreate(&cublasHandle) );
-
    num_layers = 0;

    fp16 = false;
@@ -39,6 +35,11 @@ Network::Network(dataDim_t input_dim) {
        std::cout<<COL_REDB<<"!! FP16 INERENCE ENABLED !!"<<COL_END<<"\n";
    if(dla)
        std::cout<<COL_GREENB<<"!! DLA INERENCE ENABLED !!"<<COL_END<<"\n";
+
+
+    checkCUDNN( cudnnCreate(&cudnnHandle) );
+    checkERROR( cublasCreate(&cublasHandle) );
+
 }

 Network::~Network() {