staging

CMakeLists.txt

@@ -18,7 +18,7 @@ else()
     set(MIGRAPH_ENABLE_GPU Off CACHE BOOL "")
 endif()
 
-add_compile_options(-std=c++14)
+add_compile_options(-std=c++14 -g -O0)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 include(EnableCompilerWarnings)

src/CMakeLists.txt

@@ -4,6 +4,8 @@ add_library(migraph
     generate.cpp
     program.cpp
     shape.cpp
+    opt/dfs.cpp
+    opt/optimize.cpp
 )
 rocm_clang_tidy_check(migraph)
 target_include_directories(migraph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
@@ -13,3 +15,9 @@ add_subdirectory(targets/cpu)
 if(MIGRAPH_ENABLE_GPU)
 add_subdirectory(targets/gpu)
 endif()
+
+install (TARGETS migraph
+   LIBRARY DESTINATION /opt/rocm/lib)
+
+install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
+ 

src/include/migraph/optimize.hpp

+#ifndef MIGRAPH_GUARD_RTGLIB_OPTIMIZE_HPP
+#define MIGRAPH_GUARD_RTGLIB_OPTIMIZE_HPP
+
+#include <string>
+#include <migraph/instruction_ref.hpp>
+
+namespace migraph {
+struct program;
+
+struct optimize
+{
+    std::string name() const { return "optimize"; }
+    void apply(program& p) const;
+};
+    
+} // namespace migraph
+
+
+#endif

src/opt/dfs.cpp

+namespace migraph {
+
+    void foo() {
+
+    }
+} // namespace migraph

src/opt/optimize.cpp

+#include <migraph/optimize.hpp>
+#include <migraph/program.hpp>
+#include <migraph/instruction.hpp>
+#include <migraph/operators.hpp>
+#include <migraph/iterator_for.hpp>
+
+namespace migraph {
+void optimize::apply(program &p) const
+{
+    std::cout << p << std::endl;
+    for(auto ins : iterator_for(p)) {
+        
+    }
+}
+} // namespace migraph

src/targets/cpu/CMakeLists.txt

@@ -6,3 +6,7 @@ add_library(migraph_cpu
 rocm_clang_tidy_check(migraph_cpu)
 target_link_libraries(migraph_cpu migraph)
 target_include_directories(migraph_cpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+
+install (TARGETS migraph_cpu
+  LIBRARY DESTINATION /opt/rocm/lib)
+install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)

src/targets/gpu/CMakeLists.txt

@@ -27,3 +27,11 @@ add_library(migraph_gpu
 rocm_clang_tidy_check(migraph_gpu)
 target_link_libraries(migraph_gpu migraph MIOpen migraph_device roc::rocblas)
 target_include_directories(migraph_gpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+
+install (TARGETS migraph_gpu
+  LIBRARY DESTINATION /opt/rocm/lib)
+install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)
+
+install (TARGETS migraph_device
+  LIBRARY DESTINATION /opt/rocm/lib)
+install (DIRECTORY include/migraph DESTINATION /opt/rocm/include)

src/targets/gpu/hip.cpp

@@ -16,6 +16,8 @@ hip_ptr allocate_gpu(std::size_t sz)
     void* result;
     // TODO: Check status
     hipMalloc(&result, sz);
+    if (result == nullptr)
+        throw std::runtime_error("can not allocate GPU memory");
     return hip_ptr{result};
 }
 

src/targets/gpu/target.cpp

 #include <migraph/gpu/target.hpp>
 #include <migraph/gpu/lowering.hpp>
+#include <migraph/optimize.hpp>
 #include <migraph/gpu/write_literals.hpp>
 #include <migraph/gpu/context.hpp>
 
@@ -8,7 +9,7 @@ namespace gpu {
 
 std::vector<pass> target::get_passes(migraph::context&) const
 {
-    return {lowering{}, write_literals{}};
+    return {lowering{}, optimize{}, write_literals{}};
 }
 
 std::string target::name() const { return "miopen"; }