Skip to content

Move macros out of torch::executor namespace #2436

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
wants to merge 1 commit into from
+11 −8
Closed

Move macros out of torch::executor namespace #2436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions extension/aten_util/make_aten_functor_from_et_functor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,16 @@ struct wrapper_impl<R (*)(Args...), f, int, N> {
}
};

} // namespace executor
} // namespace torch

// Wrapper macro for out variant function. N is the index of the out tensor.
// We need N to know how to preserve the semantics of modifying out tensor and
// return the reference without allocating a new memory buffer for out tensor.
#define _WRAP_2(func, N) \
wrapper_impl<decltype(&func), func, decltype(N), N>::wrap
#define _WRAP_1(func) wrapper_impl<decltype(&func), func>::wrap
::torch::executor::wrapper_impl<decltype(&func), func, decltype(N), N>::wrap
#define _WRAP_1(func) \
::torch::executor::wrapper_impl<decltype(&func), func>::wrap

#define GET_MACRO(_1, _2, NAME, ...) NAME
#define WRAP_TO_ATEN(...) GET_MACRO(__VA_ARGS__, _WRAP_2, _WRAP_1)(__VA_ARGS__)

} // namespace executor
} // namespace torch
8 changes: 5 additions & 3 deletions extension/kernel_util/make_boxed_from_unboxed_functor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,10 @@ static Kernel make_boxed_kernel(const char* name, FuncType) {
return Kernel(name, WrapUnboxedIntoFunctor<FuncType>::call);
}

#define EXECUTORCH_LIBRARY(ns, op_name, func) \
static auto res_##ns = register_kernels( \
make_boxed_kernel(#ns "::" op_name, EXECUTORCH_FN(func)))
} // namespace executor
} // namespace torch

#define EXECUTORCH_LIBRARY(ns, op_name, func) \
static auto res_##ns = ::torch::executor::register_kernels( \
::torch::executor::make_boxed_kernel( \
#ns "::" op_name, EXECUTORCH_FN(func)))