"runner/vscode:/vscode.git/clone" did not exist on "4987f13d345d77844b6737edadaa1f0432df004c"
Commit 0bedc5e8 authored by Paul's avatar Paul
Browse files

Move device library to seperate directory

parent 8e8f9c3e
...@@ -11,11 +11,12 @@ if(NOT TARGET MIOpen) ...@@ -11,11 +11,12 @@ if(NOT TARGET MIOpen)
endif() endif()
add_library(migraph_device add_library(migraph_device
hip_contiguous.cpp device/contiguous.cpp
) )
rocm_clang_tidy_check(migraph_device) 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>)
target_include_directories(migraph_device PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/device>)
add_library(migraph_gpu add_library(migraph_gpu
eliminate_allocation.cpp eliminate_allocation.cpp
......
#include <hip/hip_runtime.h> #include <hip/hip_runtime.h>
#include <migraph/operators.hpp> #include <migraph/gpu/device/contiguous.hpp>
namespace migraph { namespace migraph {
namespace gpu { namespace gpu {
namespace device {
struct index struct index
{ {
...@@ -107,7 +108,7 @@ struct hip_tensor_descriptor ...@@ -107,7 +108,7 @@ struct hip_tensor_descriptor
size_t strides[NDim] = {}; size_t strides[NDim] = {};
}; };
void hip_contiguous(migraph::shape output_shape, migraph::argument arg, migraph::argument result) void contiguous(shape output_shape, argument arg, argument result)
{ {
visit_all(result, arg)([&](auto output, auto input) { visit_all(result, arg)([&](auto output, auto input) {
visit_tensor_size(output_shape.lens().size(), [&](auto ndim) { visit_tensor_size(output_shape.lens().size(), [&](auto ndim) {
...@@ -130,5 +131,6 @@ void hip_contiguous(migraph::shape output_shape, migraph::argument arg, migraph: ...@@ -130,5 +131,6 @@ void hip_contiguous(migraph::shape output_shape, migraph::argument arg, migraph:
}); });
}); });
} }
} // namespace device
} // namespace gpu } // namespace gpu
} // namespace migraph } // namespace migraph
...@@ -5,11 +5,12 @@ ...@@ -5,11 +5,12 @@
namespace migraph { namespace migraph {
namespace gpu { namespace gpu {
namespace device {
void hip_contiguous(shape output_shape, argument arg, argument result); void contiguous(shape output_shape, argument arg, argument result);
} // namespace device
} // namespace gpu } // namespace gpu
} // namespace migraph } // namespace migraph
#endif #endif
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <migraph/gpu/miopen.hpp> #include <migraph/gpu/miopen.hpp>
#include <migraph/gpu/hip.hpp> #include <migraph/gpu/hip.hpp>
#include <migraph/dfor.hpp> #include <migraph/dfor.hpp>
#include <migraph/gpu/kernels.hpp> #include <migraph/gpu/device/contiguous.hpp>
#include <migraph/iterator_for.hpp> #include <migraph/iterator_for.hpp>
#include <migraph/gpu/rocblas.hpp> #include <migraph/gpu/rocblas.hpp>
#include <migraph/gpu/context.hpp> #include <migraph/gpu/context.hpp>
...@@ -252,7 +252,7 @@ struct miopen_contiguous ...@@ -252,7 +252,7 @@ struct miopen_contiguous
{ {
assert(output_shape == args[1].get_shape()); assert(output_shape == args[1].get_shape());
assert(output_shape.standard()); assert(output_shape.standard());
hip_contiguous(std::move(output_shape), args.at(0), args.at(1)); device::contiguous(std::move(output_shape), args.at(0), args.at(1));
return args.at(1); return args.at(1);
} }
}; };
......
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