manual merge

d2549384 · Khalique · 67048d04 · ab6cd9d3 · d2549384 · d2549384
Commit d2549384 authored Feb 01, 2019 by Khalique
20 changed files
--- a/src/targets/gpu/include/migraphx/gpu/acos.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/acos.hpp
--- a/src/targets/gpu/include/migraphx/gpu/add.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/add.hpp
--- a/src/targets/gpu/include/migraphx/gpu/asin.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/asin.hpp
--- a/src/targets/gpu/include/migraphx/gpu/atan.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/atan.hpp
--- a/src/targets/gpu/include/migraph/gpu/batchnorm.hpp
+++ b/src/targets/gpu/include/migraph/gpu/batchnorm.hpp
--- a/src/targets/gpu/include/migraph/gpu/concat.hpp
+++ b/src/targets/gpu/include/migraph/gpu/concat.hpp
--- a/src/targets/gpu/include/migraph/gpu/concat_gpu_opt.hpp
+++ b/src/targets/gpu/include/migraph/gpu/concat_gpu_opt.hpp
--- a/src/targets/gpu/include/migraph/gpu/context.hpp
+++ b/src/targets/gpu/include/migraph/gpu/context.hpp
--- a/src/targets/gpu/include/migraph/gpu/contiguous.hpp
+++ b/src/targets/gpu/include/migraph/gpu/contiguous.hpp
--- a/src/targets/gpu/include/migraph/gpu/convolution.hpp
+++ b/src/targets/gpu/include/migraph/gpu/convolution.hpp
--- a/src/targets/gpu/include/migraphx/gpu/cos.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/cos.hpp
--- a/src/targets/gpu/include/migraphx/gpu/cosh.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/cosh.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/acos.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/acos.hpp
--- a/src/targets/gpu/include/migraph/gpu/device/add.hpp
+++ b/src/targets/gpu/include/migraph/gpu/device/add.hpp
--- a/src/targets/gpu/include/migraph/gpu/device/add_relu.hpp
+++ b/src/targets/gpu/include/migraph/gpu/device/add_relu.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/asin.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/asin.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/atan.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/atan.hpp
--- a/src/targets/gpu/include/migraph/gpu/device/concat.hpp
+++ b/src/targets/gpu/include/migraph/gpu/device/concat.hpp
--- a/src/targets/gpu/include/migraph/gpu/device/contiguous.hpp
+++ b/src/targets/gpu/include/migraph/gpu/device/contiguous.hpp
--- a/src/targets/gpu/include/migraphx/gpu/device/cos.hpp
+++ b/src/targets/gpu/include/migraphx/gpu/device/cos.hpp