Skip to content

Move legacy TH functions(sinh,cosh) to TensorIterator + Vec256 #21115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xta0 wants to merge 19 commits into from
Closed

Move legacy TH functions(sinh,cosh) to TensorIterator + Vec256 #21115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c2ab94f
changes
xta0 May 29, 2019
25dd14b
Revert "changes"
xta0 May 29, 2019
f1cb0cf
udpate
xta0 May 29, 2019
5666143
update
xta0 May 29, 2019
b8c9ad1
remove iostream dependency
xta0 May 29, 2019
ac32913
fix typo
xta0 May 29, 2019
5f0f89d
remove iostream dependency
xta0 May 29, 2019
f8adde2
revert unnecessary changes
xta0 May 29, 2019
b9002c5
revert unnecessary changes
xta0 May 29, 2019
f680947
remove unnecessary changes
xta0 May 30, 2019
6159ff4
remove unnecessary changes
xta0 May 30, 2019
c4fce3e
Merge branch 'dispatch_sinh_cosh' of https://github.com/xta0/pytorch …
xta0 May 30, 2019
59cee15
remove unnecessary changes
xta0 May 30, 2019
6e31c50
Merge branch 'dispatch_sinh_cosh' of https://github.com/xta0/pytorch …
xta0 May 30, 2019
534c06c
remove the IMPLEMENT_UNARY_OP_TH macro
xta0 May 30, 2019
8f67195
remove the IMPLEMENT_UNARY_OP_TH macro
xta0 May 30, 2019
85ef253
Merge branch 'dispatch_sinh_cosh' of https://github.com/xta0/pytorch …
xta0 May 30, 2019
e0d5e1f
remove vectorization
xta0 May 30, 2019
7fd9709
remove vectorization
xta0 May 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions aten/src/ATen/Declarations.cwrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,6 @@
types:
- floating_point
backends:
- CPU
- CUDA
variants: function
return: argument 0
Expand Down Expand Up @@ -1236,7 +1235,6 @@
types:
- floating_point
backends:
- CPU
- CUDA
variants: function
return: argument 0
Expand Down
22 changes: 4 additions & 18 deletions aten/src/ATen/native/UnaryOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,22 +157,6 @@ Tensor& _sigmoid_out_cpu(Tensor& result, const Tensor& self) {
return result; \
}

#define IMPLEMENT_UNARY_OP_TH(op) \
Tensor op(const Tensor& self) { \
Tensor result = at::empty({0}, self.options()); \
at::op##_out(result, self); \
return result; \
} \
Tensor& _##op##__cpu(Tensor& self) { \
return at::op##_out(self, self); \
} \
Tensor& _##op##_out_cpu(Tensor& result, const Tensor& self) { \
checkBackend(#op, {result}, Backend::CPU); \
assert_no_internal_overlap(result, #op); \
result.resize_(self.sizes()); \
return legacy::cpu::_th_##op##_out(result, self); \
}

// NB: Temp. defaulting to TH implementation of abs due to issues with Apple

IMPLEMENT_UNARY_OP_VEC(abs)
Expand All @@ -181,7 +165,7 @@ IMPLEMENT_UNARY_OP_VEC(asin)
IMPLEMENT_UNARY_OP_VEC(atan)
IMPLEMENT_UNARY_OP_VEC(ceil)
IMPLEMENT_UNARY_OP_VEC(cos)
IMPLEMENT_UNARY_OP_TH(cosh)
IMPLEMENT_UNARY_OP_VEC(cosh)
Copy link
Contributor

@ljk53 ljk53 May 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove the IMPLEMENT_UNARY_OP_TH macro defined above?

Copy link
Contributor Author

@xta0 xta0 May 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good.

Copy link
Contributor

@VitalyFedyunin VitalyFedyunin May 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we comment here, that kernels are not using Vec256 (because _VEC is confusing )

IMPLEMENT_UNARY_OP_VEC(erf)
IMPLEMENT_UNARY_OP_VEC(erfc)
IMPLEMENT_UNARY_OP_VEC(exp)
Expand All @@ -197,7 +181,7 @@ IMPLEMENT_UNARY_OP_VEC(reciprocal)
IMPLEMENT_UNARY_OP_VEC(round)
IMPLEMENT_UNARY_OP_VEC(rsqrt)
IMPLEMENT_UNARY_OP_VEC(sin)
IMPLEMENT_UNARY_OP_TH(sinh)
IMPLEMENT_UNARY_OP_VEC(sinh)
IMPLEMENT_UNARY_OP_VEC(sqrt)
IMPLEMENT_UNARY_OP_VEC(tan)
IMPLEMENT_UNARY_OP_VEC(tanh)
Expand All @@ -209,6 +193,7 @@ DEFINE_DISPATCH(asin_stub);
DEFINE_DISPATCH(atan_stub);
DEFINE_DISPATCH(ceil_stub);
DEFINE_DISPATCH(cos_stub);
DEFINE_DISPATCH(cosh_stub);
DEFINE_DISPATCH(erf_stub);
DEFINE_DISPATCH(erfc_stub);
DEFINE_DISPATCH(exp_stub);
Expand All @@ -225,6 +210,7 @@ DEFINE_DISPATCH(round_stub);
DEFINE_DISPATCH(rsqrt_stub);
DEFINE_DISPATCH(sigmoid_stub);
DEFINE_DISPATCH(sin_stub);
DEFINE_DISPATCH(sinh_stub);
DEFINE_DISPATCH(sqrt_stub);
DEFINE_DISPATCH(tan_stub);
DEFINE_DISPATCH(tanh_stub);
Expand Down
4 changes: 2 additions & 2 deletions aten/src/ATen/native/UnaryOps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ DECLARE_DISPATCH(unary_fn, asin_stub);
DECLARE_DISPATCH(unary_fn, atan_stub);
DECLARE_DISPATCH(unary_fn, ceil_stub);
DECLARE_DISPATCH(unary_fn, cos_stub);
// DECLARE_DISPATCH(unary_fn, cosh_stub);
DECLARE_DISPATCH(unary_fn, cosh_stub);
DECLARE_DISPATCH(unary_fn, erf_stub);
DECLARE_DISPATCH(unary_fn, erfc_stub);
DECLARE_DISPATCH(unary_fn, exp_stub);
Expand All @@ -36,7 +36,7 @@ DECLARE_DISPATCH(unary_fn, round_stub);
DECLARE_DISPATCH(unary_fn, rsqrt_stub);
DECLARE_DISPATCH(unary_fn, sigmoid_stub);
DECLARE_DISPATCH(unary_fn, sin_stub);
// DECLARE_DISPATCH(unary_fn, sinh_stub);
DECLARE_DISPATCH(unary_fn, sinh_stub);
DECLARE_DISPATCH(unary_fn, sqrt_stub);
DECLARE_DISPATCH(unary_fn, tan_stub);
DECLARE_DISPATCH(unary_fn, tanh_stub);
Expand Down
18 changes: 18 additions & 0 deletions aten/src/ATen/native/cpu/UnaryOpsKernel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,22 @@ static void neg_kernel(TensorIterator& iter) {
});
}

static void sinh_kernel(TensorIterator& iter) {
AT_DISPATCH_FLOATING_TYPES(iter.dtype(), "sinh_cpu", [&]() {
unary_kernel(
iter,
[=](scalar_t a) -> scalar_t { return std::sinh(a); });
});
}

static void cosh_kernel(TensorIterator& iter) {
AT_DISPATCH_FLOATING_TYPES(iter.dtype(), "cosh_cpu", [&]() {
unary_kernel(
iter,
[=](scalar_t a) -> scalar_t { return std::cosh(a); });
});
}

#if !AT_MKL_ENABLED()
void bernoulli_mkl_kernel(Tensor &output, const double p, Generator* gen) {
// Use AT_ASSERTM because this should never be reached, and AT_ASSERTM tells
Expand Down Expand Up @@ -212,6 +228,8 @@ REGISTER_DISPATCH(frac_stub, &frac_kernel);
REGISTER_DISPATCH(reciprocal_stub, &reciprocal_kernel);
REGISTER_DISPATCH(neg_stub, &neg_kernel);
REGISTER_DISPATCH(fill_stub, &fill_kernel);
REGISTER_DISPATCH(sinh_stub, &sinh_kernel);
REGISTER_DISPATCH(cosh_stub, &cosh_kernel);

// IMPLEMENT_FLOAT_KERNEL(ALL, abs)
IMPLEMENT_FLOAT_KERNEL(FLOATING, acos)
Expand Down