         x_desc_ = TensorDescriptor4d<T1>(format, n, c, h, w);
         w_desc_ = FilterDescriptor4d<T1>(format, k, c, r, s);
 
-#if CUDNN_MAJOR >= 7
-#if USE_TENSOR_OP_MATH == 1
+#if CUDNN_MAJOR >= 7 && USE_TENSOR_CORES == 1
         cudnnSetConvolutionMathType(conv_desc_.desc(), CUDNN_TENSOR_OP_MATH);
 #endif
-#endif
-
         // Get output dimensions
         CHECK_CUDNN_ERROR(cudnnGetConvolution2dForwardOutputDim(conv_desc_.desc(),
                                                                 x_desc_.desc(),

            std::cout << std::setw(19) << std::setprecision(8) << fwd_time + bwd_inputs_time + bwd_params_time;
        }

        if (USE_TENSOR_OP_MATH && PAD_KERNELS && !inference) {
            std::cout << std::setw(15) <<  need_padding;
        }


#define PAD_KERNELS 1
#endif

#ifndef USE_TENSOR_CORES
#define USE_TENSOR_CORES 1
#endif


