Browse Source

build(python_module): use consistent flag declaration in SWIG and c++

Include cmake generated megbrain_build_config.h in SWIG in order to remove usage of MGB_DEF.

GitOrigin-RevId: d3e841eaf6
release-0.3
Megvii Engine Team Xinran Xu 5 years ago
parent
commit
d84dc7f75c
3 changed files with 4 additions and 3 deletions
  1. +3
    -1
      python_module/CMakeLists.txt
  2. +1
    -0
      python_module/src/swig/mgb.i
  3. +0
    -2
      src/CMakeLists.txt

+ 3
- 1
python_module/CMakeLists.txt View File

@@ -63,8 +63,10 @@ endif()

include(UseSWIG)
set_property(SOURCE ${SWIG_SRC} PROPERTY CPLUSPLUS ON)

# cmake < 3.12 do not honor INCLUDE_DIRECTORIES property, just add include directory into SWIG_FLAGS
set_property(SOURCE ${SWIG_SRC} PROPERTY SWIG_FLAGS ${MGB_DEF} -I${PROJECT_SOURCE_DIR}/src/serialization/include)
# Add -I${PROJECT_BINARY_DIR}/genfiles in order to include megbrain_build_config.h so that we don't need to pass cmake flags by -D.
set_property(SOURCE ${SWIG_SRC} PROPERTY SWIG_FLAGS -I${PROJECT_SOURCE_DIR}/src/serialization/include -I${PROJECT_BINARY_DIR}/genfiles)

set(SWIG_OUTFILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/megengine/_internal)


+ 1
- 0
python_module/src/swig/mgb.i View File

@@ -49,6 +49,7 @@ intb4 = _mgb.intb4
#include "plugin.h"
%}

%include "megbrain_build_config.h"
%include "comp_node.i"
%include "comp_graph.i"
%include "symbol_var.i"


+ 0
- 2
src/CMakeLists.txt View File

@@ -31,10 +31,8 @@ if(MGE_WITH_CUDA AND MGE_WITH_TRT)
list(APPEND SOURCES ${SOURCES_})
endif()

set(MGB_DEF ${MGB_DEF} PARENT_SCOPE)
add_library(megbrain STATIC EXCLUDE_FROM_ALL ${SOURCES})
target_link_libraries(megbrain mgb_opr_param_defs)
target_compile_definitions(megbrain PUBLIC ${MGB_DEF})
target_include_directories(megbrain PUBLIC ${MGB_INC})

if(MGE_WITH_CUDA)


Loading…
Cancel
Save