VX_NN - Updates (#801) (#804)

* Inference - Link to C++14 * Model Compiler - OpenCV C link removed
ROCm · Apr 6, 2022 · a79f523 · a79f523
1 parent f5f7fe1
commit a79f523
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/amd_openvx_extensions/amd_nn/CMakeLists.txt b/amd_openvx_extensions/amd_nn/CMakeLists.txt
@@ -142,5 +142,5 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
 else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -std=c++11")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -std=gnu++14")
 endif()
diff --git a/model_compiler/python/nnir_to_clib.py b/model_compiler/python/nnir_to_clib.py
@@ -147,7 +147,7 @@ def generateCMakeFiles(graph,outputFolder):
 link_directories    (/opt/rocm/mivisionx/lib)
 list(APPEND SOURCES mvmodule.cpp)
 add_library(mv_deploy SHARED ${SOURCES})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -std=gnu++14")
 target_compile_definitions(mv_deploy PRIVATE ENABLE_MVDEPLOY=1)
 target_link_libraries(mv_deploy openvx vx_nn pthread ${CMAKE_DL_LIBS})
 install (TARGETS mv_deploy DESTINATION lib)
@@ -268,7 +268,7 @@ def generateCMakeExtras(graph,outputFolder):
 include_directories (/opt/rocm/mivisionx/include ../)
 link_directories    (/opt/rocm/mivisionx/lib)
 add_library(${PROJECT_NAME} SHARED mv_extras_postproc.cpp)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -std=gnu++14")
 if (OpenCV_FOUND)
   target_compile_definitions(mv_extras PUBLIC ENABLE_OPENCV=1)
   include_directories(${OpenCV_INCLUDE_DIRS})

diff --git a/model_compiler/python/nnir_to_openvx.py b/model_compiler/python/nnir_to_openvx.py
@@ -151,7 +151,7 @@ def generateCMakeFiles(graph,outputFolder):
 
 list(APPEND SOURCES annmodule.cpp)
 add_library(${PROJECT_NAME} SHARED ${SOURCES})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mf16c -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mf16c -std=gnu++14")
 
 if (OPENVX_BACKEND_OPENCL_FOUND)
     target_link_libraries(${PROJECT_NAME} openvx vx_nn pthread ${OpenCL_LIBRARIES})
@@ -185,7 +185,7 @@ def generateCMakeFiles(graph,outputFolder):
 endif()
 
 add_library(annpython SHARED annpython.cpp)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mf16c -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mf16c -std=gnu++14")
 
 if (OPENVX_BACKEND_OPENCL_FOUND)
     target_link_libraries(annpython ${PROJECT_NAME} openvx vx_nn pthread ${OpenCL_LIBRARIES})
@@ -1987,8 +1987,6 @@ def generateTestCPP(graph,argmaxOutput,fileName,virtual_tensor_flag):
 
 #if ENABLE_OPENCV
 #include <opencv2/opencv.hpp>
-#include <opencv/cv.h>
-#include <opencv/highgui.h>
 using namespace cv;
 #if USE_OPENCV_4
 #define CV_LOAD_IMAGE_COLOR IMREAD_COLOR