Merge pull request #245 from NervanaSystems/yixing/argon-codegen-v3

Argon codegen small fixes (get_instance_id for function and install LLVM)

src/ngraph/CMakeLists.txt

@@ -211,6 +211,19 @@ install(DIRECTORY
     DESTINATION "${NGRAPH_INSTALL_LIB}"
 )
 endif()
+if (NGRAPH_CPU_ENABLE AND LLVM_INCLUDE_DIR AND
+    MKLDNN_INCLUDE_DIR)
+    # Currently this is required for Argon codegen. To avoid this, we'll need to decouple LLVM from
+    # compiler.hpp
+    install(DIRECTORY
+        ${LLVM_INCLUDE_DIR}/
+        DESTINATION "${NGRAPH_INSTALL_INCLUDE}"
+    )
+    install(DIRECTORY
+        ${LLVM_LIB_DIR}/
+        DESTINATION "${NGRAPH_INSTALL_LIB}"
+)
+endif()
 
 add_dependencies(ngraph eigen)
 

src/ngraph/function.hpp

@@ -55,7 +55,7 @@ namespace ngraph
         void set_ordered_ops_valid() { m_ordered_ops_valid = true; }
         void clear_ordered_ops_valid() { m_ordered_ops_valid = false; }
         friend std::ostream& operator<<(std::ostream&, const Function&);
-
+        size_t get_instance_id() { return m_instance_id; }
     protected:
         std::shared_ptr<Node> m_result;
         std::vector<std::shared_ptr<ngraph::op::Parameter>> m_parameters;