diff --git a/CMakeLists.txt b/CMakeLists.txt index b4ae0b9..55e3f2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,6 +180,8 @@ else() option(SKIP_GLSLANG_INSTALL "" OFF) option(NCNN_PIXEL_ROTATE "" OFF) + option(NCNN_PIXEL_AFFINE "" OFF) + option(NCNN_PIXEL_DRAWING "" OFF) option(NCNN_VULKAN "" ON) option(NCNN_VULKAN_ONLINE_SPIRV "" ON) option(NCNN_BUILD_BENCHMARK "" OFF) @@ -188,6 +190,7 @@ else() option(NCNN_BUILD_EXAMPLES "" OFF) option(NCNN_DISABLE_RTTI "" ON) option(NCNN_DISABLE_EXCEPTION "" ON) + option(NCNN_INT8 "" OFF) option(NCNN_BUILD_SHARED_LIBS "" OFF) option(WITH_LAYER_absval "" OFF) @@ -198,7 +201,7 @@ else() option(WITH_LAYER_concat "" ON) option(WITH_LAYER_convolution "" ON) option(WITH_LAYER_crop "" ON) - option(WITH_LAYER_deconvolution "" OFF) + option(WITH_LAYER_deconvolution "" ON) option(WITH_LAYER_dropout "" OFF) option(WITH_LAYER_eltwise "" ON) option(WITH_LAYER_elu "" OFF) @@ -211,17 +214,17 @@ else() option(WITH_LAYER_lrn "" OFF) option(WITH_LAYER_memorydata "" OFF) option(WITH_LAYER_mvn "" OFF) - option(WITH_LAYER_pooling "" OFF) + option(WITH_LAYER_pooling "" ON) option(WITH_LAYER_power "" OFF) option(WITH_LAYER_prelu "" ON) option(WITH_LAYER_proposal "" OFF) - option(WITH_LAYER_reduction "" OFF) + option(WITH_LAYER_reduction "" ON) option(WITH_LAYER_relu "" ON) option(WITH_LAYER_reshape "" OFF) option(WITH_LAYER_roipooling "" OFF) - option(WITH_LAYER_scale "" OFF) - option(WITH_LAYER_sigmoid "" OFF) - option(WITH_LAYER_slice "" OFF) + option(WITH_LAYER_scale "" ON) + option(WITH_LAYER_sigmoid "" ON) + option(WITH_LAYER_slice "" ON) option(WITH_LAYER_softmax "" OFF) option(WITH_LAYER_split "" ON) option(WITH_LAYER_spp "" OFF) @@ -231,7 +234,7 @@ else() option(WITH_LAYER_rnn "" OFF) option(WITH_LAYER_lstm "" OFF) option(WITH_LAYER_binaryop "" ON) - option(WITH_LAYER_unaryop "" OFF) + option(WITH_LAYER_unaryop "" ON) option(WITH_LAYER_convolutiondepthwise "" OFF) option(WITH_LAYER_padding "" ON) option(WITH_LAYER_squeeze "" OFF) @@ -244,7 +247,7 @@ else() option(WITH_LAYER_deconvolutiondepthwise "" OFF) option(WITH_LAYER_shufflechannel "" OFF) option(WITH_LAYER_instancenorm "" OFF) - option(WITH_LAYER_clip "" OFF) + option(WITH_LAYER_clip "" ON) option(WITH_LAYER_reorg "" OFF) option(WITH_LAYER_yolodetectionoutput "" OFF) option(WITH_LAYER_quantize "" OFF) @@ -268,6 +271,22 @@ else() option(WITH_LAYER_groupnorm "" OFF) option(WITH_LAYER_layernorm "" OFF) option(WITH_LAYER_softplus "" OFF) + option(WITH_LAYER_gru "" OFF) + option(WITH_LAYER_multiheadattention "" OFF) + option(WITH_LAYER_gelu "" OFF) + option(WITH_LAYER_convolution1d "" OFF) + option(WITH_LAYER_pooling1d "" OFF) + option(WITH_LAYER_convolutiondepthwise1d "" OFF) + option(WITH_LAYER_convolution3d "" OFF) + option(WITH_LAYER_convolutiondepthwise3d "" OFF) + option(WITH_LAYER_pooling3d "" OFF) + option(WITH_LAYER_matmul "" OFF) + option(WITH_LAYER_deconvolution1d "" OFF) + option(WITH_LAYER_deconvolutiondepthwise1d "" OFF) + option(WITH_LAYER_deconvolution3d "" OFF) + option(WITH_LAYER_deconvolutiondepthwise3d "" OFF) + option(WITH_LAYER_einsum "" OFF) + option(WITH_LAYER_deformableconv2d "" OFF) add_subdirectory(third_party/ncnn) endif() diff --git a/third_party/librealcugan_ncnn_vulkan b/third_party/librealcugan_ncnn_vulkan index 97faecb..501e631 160000 --- a/third_party/librealcugan_ncnn_vulkan +++ b/third_party/librealcugan_ncnn_vulkan @@ -1 +1 @@ -Subproject commit 97faecb22d2c32d9bbd9478e726b1add6eabcf9c +Subproject commit 501e631792349f23b9a2d5ac5ec350d7798cff88 diff --git a/third_party/librealesrgan_ncnn_vulkan b/third_party/librealesrgan_ncnn_vulkan index 95ce7b8..d4ad3cc 160000 --- a/third_party/librealesrgan_ncnn_vulkan +++ b/third_party/librealesrgan_ncnn_vulkan @@ -1 +1 @@ -Subproject commit 95ce7b81685a5a324c347df60f16ce96a1dd6e50 +Subproject commit d4ad3cc138357a90507121379aa052eb98003b9c diff --git a/third_party/librife_ncnn_vulkan b/third_party/librife_ncnn_vulkan index 8bdf0a5..a8296af 160000 --- a/third_party/librife_ncnn_vulkan +++ b/third_party/librife_ncnn_vulkan @@ -1 +1 @@ -Subproject commit 8bdf0a596d8562f909cea96d5816460d8bf7e024 +Subproject commit a8296af6cd2216db920bfa396d70582c668e44ff diff --git a/third_party/ncnn b/third_party/ncnn index a6d3ef5..5285895 160000 --- a/third_party/ncnn +++ b/third_party/ncnn @@ -1 +1 @@ -Subproject commit a6d3ef5a0bb59fb496c553c3ef54d141642b4fc5 +Subproject commit 528589571085b673be7313a9c6e65801f150f607