Yixing/argon link (#459)

* revert to shared argon lib

* installs argon headers

* -DINSTALLED_HEADERS_PATH=${CMAKE_INSTALL_PREFIX}/include

* formatg

* remove debug info

* revert

* revert back to cpp-master

cmake/external_argon_transformer.cmake

@@ -59,6 +59,7 @@ if (NGRAPH_ARGON_ENABLE)
                         -DNGRAPH_INSTALL_PREFIX=${ARGON_TRANSFORMER_CMAKE_PREFIX}
                         -DPREBUILD_ARGON_API_PATH=${NGRAPH_PREBUILD_ARGON_API_PATH}
                         -DEXTERNAL_NGRAPH_INCLUDE_DIR=${NGRAPH_INCLUDE_PATH}
+                        -DINSTALLED_HEADERS_PATH=${CMAKE_INSTALL_PREFIX}/include
                 BUILD_ALWAYS 1
             )
         else()
@@ -72,6 +73,7 @@ if (NGRAPH_ARGON_ENABLE)
                         -DNGRAPH_INSTALL_PREFIX=${ARGON_TRANSFORMER_CMAKE_PREFIX}
                         -DPREBUILD_ARGON_API_PATH=${NGRAPH_PREBUILD_ARGON_API_PATH}
                         -DEXTERNAL_NGRAPH_INCLUDE_DIR=${NGRAPH_INCLUDE_PATH}
+                        -DINSTALLED_HEADERS_PATH=${CMAKE_INSTALL_PREFIX}/include
                 BUILD_ALWAYS 1
             )
         endif()
@@ -86,6 +88,7 @@ if (NGRAPH_ARGON_ENABLE)
                         -DNGRAPH_INSTALL_PREFIX=${ARGON_TRANSFORMER_CMAKE_PREFIX}
                         -DPREBUILD_ARGON_API_PATH=${NGRAPH_PREBUILD_ARGON_API_PATH}
                         -DEXTERNAL_NGRAPH_INCLUDE_DIR=${NGRAPH_INCLUDE_PATH}
+                        -DINSTALLED_HEADERS_PATH=${CMAKE_INSTALL_PREFIX}/include
                 BUILD_BYPRODUCTS ${ARGON_TRANSFORMER_CMAKE_PREFIX}
                 BUILD_ALWAYS 1
             )
@@ -100,6 +103,7 @@ if (NGRAPH_ARGON_ENABLE)
                         -DNGRAPH_INSTALL_PREFIX=${ARGON_TRANSFORMER_CMAKE_PREFIX}
                         -DPREBUILD_ARGON_API_PATH=${NGRAPH_PREBUILD_ARGON_API_PATH}
                         -DEXTERNAL_NGRAPH_INCLUDE_DIR=${NGRAPH_INCLUDE_PATH}
+                        -DINSTALLED_HEADERS_PATH=${CMAKE_INSTALL_PREFIX}/include
                 BUILD_BYPRODUCTS ${ARGON_TRANSFORMER_CMAKE_PREFIX}
                 BUILD_ALWAYS 1
             )
@@ -107,7 +111,7 @@ if (NGRAPH_ARGON_ENABLE)
     endif()
 
     ExternalProject_Get_Property(ext_argon_transformer source_dir)
-    set(ARGON_TRANSFORMER_INCLUDE_DIR ${source_dir}/src PARENT_SCOPE)
+    set(ARGON_TRANSFORMER_INCLUDE_DIR ${ARGON_TRANSFORMER_CMAKE_PREFIX}/include PARENT_SCOPE)
     set(ARGON_TRANSFORMER_LIB_DIR ${ARGON_TRANSFORMER_CMAKE_PREFIX}/lib PARENT_SCOPE)
     set(ARGON_API_INCLUDE_DIR ${NGRAPH_PREBUILD_ARGON_API_PATH}/include PARENT_SCOPE)
     set(ARGON_API_LIB_DIR ${NGRAPH_PREBUILD_ARGON_API_PATH}/lib) # Used by find_library below

src/ngraph/CMakeLists.txt

@@ -212,6 +212,7 @@ endif()
 
 if (NGRAPH_ARGON_ENABLE)
     link_directories(${ARGON_TRANSFORMER_LIB_DIR})
+    include_directories(${ARGON_TRANSFORMER_INCLUDE_DIR})
 endif()
 
 add_library(ngraph SHARED ${SRC})
@@ -276,7 +277,7 @@ endif()
 
 # Argon
 if (NGRAPH_ARGON_ENABLE)
-    target_link_libraries(ngraph PRIVATE ${ARGON_TRANSFORMER_LIB_DIR}/libargon.a)
+    target_link_libraries(ngraph PRIVATE ${ARGON_TRANSFORMER_LIB_DIR}/libargon.so)
     target_link_libraries(ngraph PRIVATE ${ARGON_API_LIBS})
     add_dependencies(ngraph ext_argon_transformer)
     add_dependencies(ext_argon_transformer ext_llvm)
@@ -316,5 +317,13 @@ if (NOT APPLE)
             DESTINATION ${NGRAPH_INSTALL_LIB}
             FILES_MATCHING PATTERN "*.so"
         )
+        install(DIRECTORY ${ARGON_TRANSFORMER_INCLUDE_DIR}/
+            DESTINATION ${NGRAPH_INSTALL_INCLUDE}
+            FILES_MATCHING PATTERN "*.hpp"
+        )
+        install(DIRECTORY ${ARGON_TRANSFORMER_INCLUDE_DIR}/
+            DESTINATION ${NGRAPH_INSTALL_INCLUDE}
+            FILES_MATCHING PATTERN "*.h"
+        )
     endif()
 endif()

test/argon_fusion.cpp

@@ -19,7 +19,10 @@
 #include <memory>
 
 #include "gtest/gtest.h"
+
+#include "ngraph/file_util.hpp"
 #include "ngraph/graph_util.hpp"
+#include "ngraph/json.hpp"
 #include "ngraph/log.hpp"
 #include "ngraph/ngraph.hpp"
 #include "ngraph/ops/sum.hpp"
@@ -28,9 +31,6 @@
 #include "ngraph/pattern/matcher.hpp"
 #include "ngraph/pattern/op/any.hpp"
 #include "ngraph/pattern/op/label.hpp"
-//
-#include "ngraph/file_util.hpp"
-#include "ngraph/json.hpp"
 #include "ngraph/runtime/argon/ops/relu.hpp"
 #include "ngraph/runtime/argon/pass/argon_fusion.hpp"
 #include "ngraph/serializer.hpp"