manual merge

87d35010 · Khalique · 6aebef15 · 84e7335e · 87d35010 · 87d35010
Commit 87d35010 authored Nov 29, 2018 by Khalique
20 changed files
--- a/src/targets/gpu/include/migraphx/gpu/convolution.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/convolution.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/add.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/add.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/add_relu.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/add_relu.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/concat.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/concat.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/contiguous.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/contiguous.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/mul.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/mul.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/sin.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/sin.hpp
--- a/src/targets/gpu/include/migraphx/gpu/eliminate_workspace.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/eliminate_workspace.hpp
--- a/src/targets/gpu/include/migraphx/gpu/fuse_ops.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/fuse_ops.hpp
--- a/src/targets/gpu/include/migraphx/gpu/gemm.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/gemm.hpp
--- a/src/targets/gpu/include/migraphx/gpu/hip.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/hip.hpp
--- a/src/targets/gpu/include/migraphx/gpu/leaky_relu.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/leaky_relu.hpp
--- a/src/targets/gpu/include/migraphx/gpu/lowering.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/lowering.hpp
--- a/src/targets/gpu/include/migraphx/gpu/miopen.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/miopen.hpp
--- a/src/targets/gpu/include/migraphx/gpu/mul.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/mul.hpp
--- a/src/targets/gpu/include/migraphx/gpu/pooling.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/pooling.hpp
--- a/src/targets/gpu/include/migraphx/gpu/relu.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/relu.hpp
--- a/src/targets/gpu/include/migraphx/gpu/rocblas.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/rocblas.hpp
--- a/src/targets/gpu/include/migraphx/gpu/sin.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/sin.hpp
--- a/src/targets/gpu/include/migraphx/gpu/softmax.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/softmax.hpp