Commit c49b17e1 authored by Paul's avatar Paul
Browse files

Move miopen target to gpu

parent 9aad7df0
...@@ -11,5 +11,5 @@ target_include_directories(migraph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOUR ...@@ -11,5 +11,5 @@ target_include_directories(migraph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOUR
add_subdirectory(onnx) add_subdirectory(onnx)
add_subdirectory(targets/cpu) add_subdirectory(targets/cpu)
if(MIGRAPH_ENABLE_MIOPEN) if(MIGRAPH_ENABLE_MIOPEN)
add_subdirectory(targets/miopen) add_subdirectory(targets/gpu)
endif() endif()
...@@ -17,13 +17,13 @@ rocm_clang_tidy_check(migraph_device) ...@@ -17,13 +17,13 @@ rocm_clang_tidy_check(migraph_device)
target_link_libraries(migraph_device migraph hip::device) target_link_libraries(migraph_device migraph hip::device)
target_include_directories(migraph_device PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>) target_include_directories(migraph_device PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
add_library(migraph_miopen add_library(migraph_gpu
hip.cpp hip.cpp
target.cpp target.cpp
lowering.cpp lowering.cpp
write_literals.cpp write_literals.cpp
rocblas.cpp rocblas.cpp
) )
rocm_clang_tidy_check(migraph_miopen) rocm_clang_tidy_check(migraph_gpu)
target_link_libraries(migraph_miopen migraph MIOpen migraph_device roc::rocblas) target_link_libraries(migraph_gpu migraph MIOpen migraph_device roc::rocblas)
target_include_directories(migraph_miopen PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>) target_include_directories(migraph_gpu PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
#include <migraph/miopen/hip.hpp> #include <migraph/gpu/hip.hpp>
#include <migraph/manage_ptr.hpp> #include <migraph/manage_ptr.hpp>
#include <miopen/miopen.h> #include <miopen/miopen.h>
......
#ifndef MIGRAPH_GUARD_RTGLIB_CONTEXT_HPP #ifndef MIGRAPH_GUARD_RTGLIB_CONTEXT_HPP
#define MIGRAPH_GUARD_RTGLIB_CONTEXT_HPP #define MIGRAPH_GUARD_RTGLIB_CONTEXT_HPP
#include <migraph/miopen/miopen.hpp> #include <migraph/gpu/miopen.hpp>
#include <migraph/miopen/rocblas.hpp> #include <migraph/gpu/rocblas.hpp>
namespace migraph { namespace migraph {
namespace miopen { namespace miopen {
......
#include <rocblas.h> #include <rocblas.h>
#include <migraph/miopen/lowering.hpp> #include <migraph/gpu/lowering.hpp>
#include <migraph/manage_ptr.hpp> #include <migraph/manage_ptr.hpp>
#include <migraph/instruction.hpp> #include <migraph/instruction.hpp>
#include <migraph/operators.hpp> #include <migraph/operators.hpp>
#include <migraph/shape_for_each.hpp> #include <migraph/shape_for_each.hpp>
#include <migraph/miopen/miopen.hpp> #include <migraph/gpu/miopen.hpp>
#include <migraph/miopen/hip.hpp> #include <migraph/gpu/hip.hpp>
#include <migraph/dfor.hpp> #include <migraph/dfor.hpp>
#include <migraph/miopen/kernels.hpp> #include <migraph/gpu/kernels.hpp>
#include <migraph/iterator_for.hpp> #include <migraph/iterator_for.hpp>
#include <migraph/miopen/rocblas.hpp> #include <migraph/gpu/rocblas.hpp>
#include <migraph/miopen/context.hpp> #include <migraph/gpu/context.hpp>
namespace migraph { namespace migraph {
namespace miopen { namespace miopen {
......
#include <migraph/miopen/rocblas.hpp> #include <migraph/gpu/rocblas.hpp>
namespace migraph { namespace migraph {
namespace miopen { namespace miopen {
......
#include <migraph/miopen/target.hpp> #include <migraph/gpu/target.hpp>
#include <migraph/miopen/lowering.hpp> #include <migraph/gpu/lowering.hpp>
#include <migraph/miopen/write_literals.hpp> #include <migraph/gpu/write_literals.hpp>
#include <migraph/miopen/context.hpp> #include <migraph/gpu/context.hpp>
namespace migraph { namespace migraph {
namespace miopen { namespace miopen {
......
#include <migraph/miopen/write_literals.hpp> #include <migraph/gpu/write_literals.hpp>
#include <migraph/iterator_for.hpp> #include <migraph/iterator_for.hpp>
#include <migraph/miopen/hip.hpp> #include <migraph/gpu/hip.hpp>
#include <migraph/instruction.hpp> #include <migraph/instruction.hpp>
namespace migraph { namespace migraph {
......
...@@ -102,6 +102,6 @@ if(MIGRAPH_ENABLE_MIOPEN) ...@@ -102,6 +102,6 @@ if(MIGRAPH_ENABLE_MIOPEN)
foreach(TEST ${MIOPEN_TESTS}) foreach(TEST ${MIOPEN_TESTS})
get_filename_component(BASE_NAME ${TEST} NAME_WE) get_filename_component(BASE_NAME ${TEST} NAME_WE)
add_test_executable(test_miopen_${BASE_NAME} ${TEST}) add_test_executable(test_miopen_${BASE_NAME} ${TEST})
target_link_libraries(test_miopen_${BASE_NAME} migraph_miopen) target_link_libraries(test_miopen_${BASE_NAME} migraph_gpu)
endforeach() endforeach()
endif() endif()
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#include <migraph/operators.hpp> #include <migraph/operators.hpp>
#include <migraph/generate.hpp> #include <migraph/generate.hpp>
#include <migraph/cpu/cpu_target.hpp> #include <migraph/cpu/cpu_target.hpp>
#include <migraph/miopen/target.hpp> #include <migraph/gpu/target.hpp>
#include <migraph/miopen/miopen.hpp> #include <migraph/gpu/miopen.hpp>
#include <migraph/miopen/hip.hpp> #include <migraph/gpu/hip.hpp>
#include <migraph/manage_ptr.hpp> #include <migraph/manage_ptr.hpp>
#include <miopen/miopen.h> #include <miopen/miopen.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment