Remove denoise module and thirdparty OIDN.

This is replaced by a much lighter weight and faster JNLM denoiser. OIDN is still much more accurate, and may be provided as an optional backend in the future, but the JNLM denoiser seems good enough for most use cases and removing OIDN reduces the build system complexity, binary size, and build times very significantly.

1 files changed, 0 insertions, 324 deletions

diff --git a/thirdparty/oidn/mkl-dnn/src/cpu/cpu_engine.cpp b/thirdparty/oidn/mkl-dnn/src/cpu/cpu_engine.cpp
deleted file mode 100644
index ce0a3667ad..0000000000
--- a/thirdparty/oidn/mkl-dnn/src/cpu/cpu_engine.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
-* Copyright 2016-2018 Intel Corporation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*******************************************************************************/
-
-#include <assert.h>
-
-#include "type_helpers.hpp"
-#include "verbose.hpp"
-
-#include "cpu_engine.hpp"
-#include "cpu_memory.hpp"
-
-//#include "cpu/rnn/ref_rnn.hpp"
-
-//#include "cpu/jit_avx512_core_x8s8s32x_1x1_convolution.hpp"
-//#include "cpu/jit_avx512_common_1x1_convolution.hpp"
-#include "cpu/jit_avx512_core_fp32_wino_conv_4x3.hpp"
-#include "cpu/jit_avx512_common_convolution_winograd.hpp"
-//#include "cpu/jit_avx512_core_x8s8s32x_convolution.hpp"
-#include "cpu/jit_avx512_common_convolution.hpp"
-//#include "cpu/jit_avx2_1x1_convolution.hpp"
-//#include "cpu/jit_sse42_1x1_convolution.hpp"
-#include "cpu/jit_avx2_convolution.hpp"
-#include "cpu/jit_sse42_convolution.hpp"
-//#include "cpu/gemm_convolution.hpp"
-//#include "cpu/gemm_x8s8s32x_convolution.hpp"
-//#include "cpu/ref_convolution.hpp"
-//#include "cpu/jit_avx512_core_x8s8s32x_deconvolution.hpp"
-//#include "cpu/jit_avx512_core_x8s8s32x_1x1_deconvolution.hpp"
-//#include "cpu/ref_deconvolution.hpp"
-//#include "cpu/ref_shuffle.hpp"
-//#include "cpu/jit_uni_eltwise.hpp"
-//#include "cpu/ref_eltwise.hpp"
-//#include "cpu/ref_softmax.hpp"
-#include "cpu/jit_uni_pooling.hpp"
-//#include "cpu/jit_uni_i8i8_pooling.hpp"
-//#include "cpu/ref_pooling.hpp"
-//#include "cpu/nchw_pooling.hpp"
-//#include "cpu/nhwc_pooling.hpp"
-//#include "cpu/jit_avx512_common_lrn.hpp"
-//#include "cpu/jit_uni_lrn.hpp"
-//#include "cpu/ref_lrn.hpp"
-//#include "cpu/jit_uni_batch_normalization.hpp"
-//#include "cpu/ref_batch_normalization.hpp"
-//#include "cpu/ncsp_batch_normalization.hpp"
-//#include "cpu/nspc_batch_normalization.hpp"
-//#include "cpu/ref_inner_product.hpp"
-//#include "cpu/gemm_inner_product.hpp"
-//#include "cpu/gemm_x8s8s32x_inner_product.hpp"
-//#include "cpu/jit_uni_dw_convolution.hpp"
-//#include "cpu/jit_avx512_core_u8s8s32x_wino_convolution.hpp"
-#include "cpu/jit_avx512_core_fp32_wino_conv_2x3.hpp"
-
-namespace mkldnn {
-namespace impl {
-namespace cpu {
-
-status_t cpu_engine_t::memory_create(memory_t **memory,
-        const memory_desc_t *md, void *handle) {
-    auto _memory = new cpu_memory_t(this, md, handle);
-    if (_memory == nullptr)
-        return status::out_of_memory;
-
-    status_t status = _memory->init();
-    if (status != status::success) {
-        delete _memory;
-        return status;
-    }
-
-    return safe_ptr_assign<memory_t>(*memory, _memory);
-}
-
-using pd_create_f = mkldnn::impl::engine_t::primitive_desc_create_f;
-
-namespace {
-using namespace mkldnn::impl::data_type;
-
-#define INSTANCE(...) &primitive_desc_t::create<__VA_ARGS__::pd_t>
-static const pd_create_f cpu_impl_list[] = {
-    /* RNN */
-    /*
-    INSTANCE(ref_rnn_fwd_f32_t),
-    INSTANCE(ref_rnn_fwd_u8s8_t),
-    INSTANCE(ref_rnn_bwd_f32_t),
-    */
-    /* conv */
-    /*
-    INSTANCE(jit_avx512_common_dw_convolution_fwd_t),
-    INSTANCE(jit_avx512_common_dw_convolution_bwd_data_t),
-    INSTANCE(jit_avx512_common_dw_convolution_bwd_weights_t),
-    INSTANCE(jit_avx512_common_1x1_convolution_fwd_f32_t),
-    INSTANCE(jit_avx512_common_1x1_convolution_bwd_data_f32_t),
-    INSTANCE(jit_avx512_common_1x1_convolution_bwd_weights_t),
-    */
-    INSTANCE(jit_avx512_core_fp32_wino_conv_2x3_fwd_t),
-    INSTANCE(jit_avx512_core_fp32_wino_conv_4x3_fwd_t),
-    //INSTANCE(jit_avx512_core_fp32_wino_conv_4x3_bwd_data_t),
-    //INSTANCE(jit_avx512_core_fp32_wino_conv_4x3_bwd_weights_t),
-    INSTANCE(jit_avx512_common_convolution_winograd_fwd_t),
-    //INSTANCE(jit_avx512_common_convolution_winograd_bwd_data_t),
-    //INSTANCE(jit_avx512_common_convolution_winograd_bwd_weights_t),
-    INSTANCE(jit_avx512_common_convolution_fwd_t<f32>),
-    //INSTANCE(jit_avx512_common_convolution_bwd_data_t<f32>),
-    //INSTANCE(jit_avx512_common_convolution_bwd_weights_t<f32>),
-    /*
-    INSTANCE(jit_avx2_dw_convolution_fwd_t),
-    INSTANCE(jit_avx2_dw_convolution_bwd_data_t),
-    INSTANCE(jit_avx2_dw_convolution_bwd_weights_t),
-    INSTANCE(jit_avx2_1x1_convolution_fwd_t),
-    INSTANCE(jit_avx2_1x1_convolution_bwd_data_t),
-    INSTANCE(jit_avx2_1x1_convolution_bwd_weights_t),
-    INSTANCE(jit_sse42_dw_convolution_fwd_t),
-    INSTANCE(jit_sse42_dw_convolution_bwd_data_t),
-    INSTANCE(jit_sse42_dw_convolution_bwd_weights_t),
-    INSTANCE(jit_sse42_1x1_convolution_fwd_t),
-    */
-    INSTANCE(jit_avx2_convolution_fwd_t),
-    //INSTANCE(jit_avx2_convolution_bwd_data_t),
-    //INSTANCE(jit_avx2_convolution_bwd_weights_t),
-    INSTANCE(jit_sse42_convolution_fwd_t),
-    /*
-    INSTANCE(gemm_convolution_fwd_t),
-    INSTANCE(gemm_convolution_bwd_data_t),
-    INSTANCE(gemm_convolution_bwd_weights_t),
-    INSTANCE(ref_convolution_fwd_t<f32>),
-    INSTANCE(ref_convolution_bwd_data_t<f32, f32, f32, f32>),
-    INSTANCE(ref_convolution_bwd_weights_t<f32, f32, f32, f32>),
-    */
-    /* conv (int) */
-    /*
-    INSTANCE(jit_avx512_core_u8s8s32x_wino_convolution_fwd_t<f32>),
-    INSTANCE(jit_avx512_core_u8s8s32x_wino_convolution_fwd_t<s32>),
-    INSTANCE(jit_avx512_core_u8s8s32x_wino_convolution_fwd_t<s8>),
-    INSTANCE(jit_avx512_core_u8s8s32x_wino_convolution_fwd_t<u8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_convolution_fwd_t<u8,f32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_convolution_fwd_t<u8,s32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_convolution_fwd_t<u8,u8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_convolution_fwd_t<u8,s8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_convolution_fwd_t<s8,f32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_convolution_fwd_t<s8,s32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_convolution_fwd_t<s8,u8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_convolution_fwd_t<s8,s8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_convolution_fwd_t<u8,f32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_convolution_fwd_t<u8,s32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_convolution_fwd_t<u8,u8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_convolution_fwd_t<u8,s8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_convolution_fwd_t<s8,f32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_convolution_fwd_t<s8,s32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_convolution_fwd_t<s8,u8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_convolution_fwd_t<s8,s8>),
-    INSTANCE(_gemm_x8s8s32x_convolution_fwd_t<u8, s32>),
-    INSTANCE(_gemm_x8s8s32x_convolution_fwd_t<u8, u8>),
-    INSTANCE(_gemm_x8s8s32x_convolution_fwd_t<u8, s8>),
-    INSTANCE(_gemm_x8s8s32x_convolution_fwd_t<u8, f32>),
-    INSTANCE(_gemm_x8s8s32x_convolution_fwd_t<s8, s32>),
-    INSTANCE(_gemm_x8s8s32x_convolution_fwd_t<s8, u8>),
-    INSTANCE(_gemm_x8s8s32x_convolution_fwd_t<s8, s8>),
-    INSTANCE(_gemm_x8s8s32x_convolution_fwd_t<s8, f32>),
-    INSTANCE(_gemm_u8s8s32x_convolution_bwd_data_t<s32>),
-    INSTANCE(_gemm_u8s8s32x_convolution_bwd_data_t<u8>),
-    INSTANCE(_gemm_u8s8s32x_convolution_bwd_data_t<s8>),
-    INSTANCE(_gemm_u8s8s32x_convolution_bwd_data_t<f32>),
-    INSTANCE(ref_convolution_fwd_t<u8, s8, f32, s32>),
-    INSTANCE(ref_convolution_fwd_t<u8, s8, s32, s32>),
-    INSTANCE(ref_convolution_fwd_t<u8, s8, s8, s32>),
-    INSTANCE(ref_convolution_fwd_t<u8, s8, u8, s32>),
-    INSTANCE(ref_convolution_bwd_data_t<f32, s8, u8, s32>),
-    INSTANCE(ref_convolution_bwd_data_t<s32, s8, u8, s32>),
-    INSTANCE(ref_convolution_bwd_data_t<s8, s8, u8, s32>),
-    INSTANCE(ref_convolution_bwd_data_t<u8, s8, u8, s32>),
-    */
-    /* deconv */
-    /*
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_deconvolution_fwd_t<u8,f32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_deconvolution_fwd_t<u8,s32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_deconvolution_fwd_t<u8,u8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_deconvolution_fwd_t<u8,s8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_deconvolution_fwd_t<s8,f32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_deconvolution_fwd_t<s8,s32>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_deconvolution_fwd_t<s8,u8>),
-    INSTANCE(jit_avx512_core_x8s8s32x_1x1_deconvolution_fwd_t<s8,s8>),
-    INSTANCE(_jit_avx512_core_x8s8s32x_deconvolution_fwd_t<u8,s32>),
-    INSTANCE(_jit_avx512_core_x8s8s32x_deconvolution_fwd_t<u8,u8>),
-    INSTANCE(_jit_avx512_core_x8s8s32x_deconvolution_fwd_t<u8,s8>),
-    INSTANCE(_jit_avx512_core_x8s8s32x_deconvolution_fwd_t<u8,f32>),
-    INSTANCE(_jit_avx512_core_x8s8s32x_deconvolution_fwd_t<s8,s32>),
-    INSTANCE(_jit_avx512_core_x8s8s32x_deconvolution_fwd_t<s8,u8>),
-    INSTANCE(_jit_avx512_core_x8s8s32x_deconvolution_fwd_t<s8,s8>),
-    INSTANCE(_jit_avx512_core_x8s8s32x_deconvolution_fwd_t<s8,f32>),
-    INSTANCE(ref_deconvolution_bwd_weights_t),
-    INSTANCE(ref_deconvolution_bwd_data_t),
-    INSTANCE(ref_deconvolution_fwd_t),
-    */
-    /* shuffle */
-    /*
-    INSTANCE(ref_shuffle_t<4>), // f32 or s32
-    INSTANCE(ref_shuffle_t<1>), // s8 or u8
-    */
-    /* eltwise */
-    /*
-    INSTANCE(jit_uni_eltwise_fwd_t<avx512_common>),
-    INSTANCE(jit_uni_eltwise_bwd_t<avx512_common>),
-    INSTANCE(jit_uni_eltwise_fwd_t<avx2>),
-    INSTANCE(jit_uni_eltwise_bwd_t<avx2>),
-    INSTANCE(jit_uni_eltwise_fwd_t<sse42>),
-    INSTANCE(jit_uni_eltwise_bwd_t<sse42>),
-    INSTANCE(ref_eltwise_fwd_t<f32>),
-    INSTANCE(ref_eltwise_bwd_t<f32>),
-    */
-    /* eltwise (int) */
-    /*
-    INSTANCE(ref_eltwise_fwd_t<s32>),
-    INSTANCE(ref_eltwise_fwd_t<s8>),
-    INSTANCE(ref_eltwise_fwd_t<u8>),
-    INSTANCE(ref_eltwise_bwd_t<s32>),
-    */
-    /* softmax */
-    /*
-    INSTANCE(ref_softmax_fwd_t<f32>),
-    INSTANCE(ref_softmax_bwd_t<f32>),
-    */
-    /* pool */
-    INSTANCE(jit_uni_pooling_fwd_t<avx512_common>),
-    //INSTANCE(jit_uni_pooling_bwd_t<avx512_common>),
-    INSTANCE(jit_uni_pooling_fwd_t<avx>),
-    //INSTANCE(jit_uni_pooling_bwd_t<avx>),
-    INSTANCE(jit_uni_pooling_fwd_t<sse42>),
-    //INSTANCE(jit_uni_pooling_bwd_t<sse42>),
-    /*
-    INSTANCE(nchw_pooling_fwd_t<f32>),
-    INSTANCE(nchw_pooling_bwd_t<f32>),
-    INSTANCE(nhwc_pooling_fwd_t<f32>),
-    INSTANCE(nhwc_pooling_bwd_t<f32>),
-    INSTANCE(ref_pooling_fwd_t<f32>),
-    INSTANCE(ref_pooling_bwd_t<f32>),
-    */
-    /* pool (int) */
-    /*
-    INSTANCE(jit_uni_i8i8_pooling_fwd_t<avx512_core>),
-    INSTANCE(jit_uni_i8i8_pooling_fwd_t<avx2>),
-    INSTANCE(ref_pooling_fwd_t<s32>),
-    INSTANCE(ref_pooling_fwd_t<s8, s32>),
-    INSTANCE(ref_pooling_fwd_t<u8, s32>),
-    INSTANCE(ref_pooling_bwd_t<s32>),
-    */
-    /* lrn */
-    /*
-    INSTANCE(jit_avx512_common_lrn_fwd_t),
-    INSTANCE(jit_avx512_common_lrn_bwd_t),
-    INSTANCE(jit_uni_lrn_fwd_t<avx2>),
-    INSTANCE(jit_uni_lrn_bwd_t<avx2>),
-    INSTANCE(jit_uni_lrn_fwd_t<sse42>),
-    INSTANCE(ref_lrn_fwd_t<f32>),
-    INSTANCE(ref_lrn_bwd_t<f32>),
-    */
-    /* batch normalization */
-    /*
-    INSTANCE(jit_uni_batch_normalization_fwd_t<avx512_common>),
-    INSTANCE(jit_uni_batch_normalization_bwd_t<avx512_common>),
-    INSTANCE(jit_uni_batch_normalization_fwd_t<avx2>),
-    INSTANCE(jit_uni_batch_normalization_bwd_t<avx2>),
-    INSTANCE(jit_uni_batch_normalization_fwd_t<sse42>),
-    INSTANCE(jit_uni_batch_normalization_bwd_t<sse42>),
-    INSTANCE(ncsp_batch_normalization_fwd_t),
-    INSTANCE(ncsp_batch_normalization_bwd_t),
-    INSTANCE(nspc_batch_normalization_fwd_t),
-    INSTANCE(nspc_batch_normalization_bwd_t),
-    INSTANCE(ref_batch_normalization_fwd_t<f32>),
-    INSTANCE(ref_batch_normalization_bwd_t<f32>),
-    INSTANCE(ref_batch_normalization_fwd_t<s8>),
-    */
-    /* inner product */
-    /*
-    INSTANCE(gemm_inner_product_fwd_t<f32>),
-    INSTANCE(gemm_inner_product_bwd_data_t<f32>),
-    INSTANCE(gemm_inner_product_bwd_weights_t<f32>),
-    INSTANCE(ref_inner_product_fwd_t<f32>),
-    INSTANCE(ref_inner_product_bwd_data_t<f32, f32, f32, f32>),
-    INSTANCE(ref_inner_product_bwd_weights_t<f32>),
-    */
-    /* inner product (int) */
-    /*
-    INSTANCE(gemm_x8s8s32x_inner_product_fwd_t<u8, u8>),
-    INSTANCE(gemm_x8s8s32x_inner_product_fwd_t<u8, s8>),
-    INSTANCE(gemm_x8s8s32x_inner_product_fwd_t<u8, s32>),
-    INSTANCE(gemm_x8s8s32x_inner_product_fwd_t<u8, f32>),
-    INSTANCE(gemm_x8s8s32x_inner_product_fwd_t<s8, u8>),
-    INSTANCE(gemm_x8s8s32x_inner_product_fwd_t<s8, s8>),
-    INSTANCE(gemm_x8s8s32x_inner_product_fwd_t<s8, s32>),
-    INSTANCE(gemm_x8s8s32x_inner_product_fwd_t<s8, f32>),
-    INSTANCE(ref_inner_product_fwd_t<u8, s8, u8, s32>),
-    INSTANCE(ref_inner_product_fwd_t<u8, s8, s8, s32>),
-    INSTANCE(ref_inner_product_fwd_t<u8, s8, s32, s32>),
-    INSTANCE(ref_inner_product_fwd_t<u8, s8, f32, s32>),
-    */
-    /* eol */
-    nullptr,
-};
-#undef INSTANCE
-}
-
-const pd_create_f* cpu_engine_t::get_implementation_list() const {
-    return cpu_impl_list;
-}
-
-cpu_engine_factory_t engine_factory;
-
-}
-}
-}
-
-// vim: et ts=4 sw=4 cindent cino^=l0,\:0,N-s