Browse Source

feat(opr/standalone): import NMSKeep from MegSkull contrib

1. clang-format.
2. Use name "NMSKeepMGB" during serialization to avoid conflict with
   MegSkull contrib one.

GitOrigin-RevId: 627c60e482
release-0.5
Megvii Engine Team Xu Xinran 5 years ago
parent
commit
0d12ae8095
5 changed files with 15 additions and 1 deletions
  1. +1
    -1
      python_module/megengine/_internal/__init__.py
  2. +3
    -0
      python_module/megengine/_internal/opr_extra.py
  3. +5
    -0
      src/CMakeLists.txt
  4. +5
    -0
      src/opr/impl/mgb_cpp_opr.fbs
  5. +1
    -0
      src/serialization/impl/schema.fbs

+ 1
- 1
python_module/megengine/_internal/__init__.py View File

@@ -25,7 +25,7 @@ from . import config, craniotome, dtype
from . import global_init as _global_init
from . import helper as _helper
from . import mgb as _detail
from . import opr, opr_param_defs, plugin
from . import opr, opr_extra, opr_param_defs, plugin
from .exc import MegBrainError
from .logconf import get_logger
from .mgb import (


+ 3
- 0
python_module/megengine/_internal/opr_extra.py View File

@@ -0,0 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2015-2019 Megvii Inc. All rights reserved.


+ 5
- 0
src/CMakeLists.txt View File

@@ -34,6 +34,11 @@ if(MGE_WITH_CUDA AND MGE_WITH_TRT)
endif()


if(MGE_WITH_CUDA)
file(GLOB_RECURSE SOURCES_ opr/impl/standalone/*.cu)
list(APPEND SOURCES ${SOURCES_})
endif()

add_library(megbrain OBJECT EXCLUDE_FROM_ALL ${SOURCES})
target_link_libraries(megbrain PUBLIC mgb_opr_param_defs)
target_include_directories(megbrain


+ 5
- 0
src/opr/impl/mgb_cpp_opr.fbs View File

@@ -55,3 +55,8 @@ struct IndexDescMaskItem {
table IndexDescMaskDump {
items:[IndexDescMaskItem];
}

table NMSKeep {
iou_thresh:float;
max_output:uint;
}

+ 1
- 0
src/serialization/impl/schema.fbs View File

@@ -98,6 +98,7 @@ union OperatorParam {
param.IndexDescMaskDump = 66,
DType = 67,
param.Remap = 68,
param.NMSKeep = 69,
}

table Operator {


Loading…
Cancel
Save