Skip to content

Move ScalarTypeUtils.h to c10 #14024

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 9 commits into from
Closed

Move ScalarTypeUtils.h to c10 #14024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1a5e4da
V1: Initial commit
smessmer Nov 15, 2018
883592d
V1: Merge with parent diff changes
smessmer Nov 16, 2018
f5cdb75
V3: Merge with parent diff changes
smessmer Nov 17, 2018
b06b952
V4: Merge with parent diff changes
smessmer Nov 19, 2018
9956234
V7: Merge with parent diff changes
smessmer Nov 22, 2018
3b19703
V8: Merge with parent diff changes
smessmer Nov 27, 2018
5cb940a
V9: Merge with parent diff changes
smessmer Nov 27, 2018
fe88ebc
V10: Merge with parent diff changes
smessmer Nov 27, 2018
39c715f
V11: Merge with parent diff changes
smessmer Nov 27, 2018
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
4 changes: 2 additions & 2 deletions aten/src/ATen/core/StorageImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <ATen/core/Allocator.h>
#include <c10/core/ScalarType.h>
#include <ATen/core/ScalarTypeUtils.h>
#include <c10/core/ScalarTypeUtils.h>

#include <c10/util/intrusive_ptr.h>

Expand Down Expand Up @@ -72,7 +72,7 @@ struct CAFFE2_API StorageImpl : public c10::intrusive_ptr_target {
inline T* data() const {
// TODO: This is bad: it means storage.data<T>() calls only work on
// T that are valid ScalarType. FIXME!
auto data_type_T = at::scalarTypeToDataType(at::CTypeToScalarType<T>::to());
auto data_type_T = at::scalarTypeToDataType(c10::CTypeToScalarType<T>::to());
if (dtype().id() != data_type_T) {
AT_ERROR(
"Attempt to access StorageImpl having data type ",
Expand Down
2 changes: 1 addition & 1 deletion aten/src/ATen/core/TensorOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <c10/Device.h>
#include <ATen/core/Layout.h>
#include <c10/core/ScalarType.h>
#include <ATen/core/ScalarTypeUtils.h>
#include <c10/core/ScalarTypeUtils.h>

#include <c10/util/Optional.h>
#include <c10/util/C++17.h>
Expand Down
2 changes: 1 addition & 1 deletion aten/src/THC/THCStorage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <cuda_runtime.h>
#include <cuda_fp16.h>

namespace at {
namespace c10 {

#if defined(__CUDACC__) || defined(__HIP_PLATFORM_HCC__)
template <>
Expand Down
4 changes: 2 additions & 2 deletions aten/src/ATen/core/ScalarTypeUtils.h → c10/core/ScalarTypeUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <c10/core/ScalarType.h>

namespace at {
namespace c10 {

template <typename T>

This comment was marked as off-topic.

Sign in to view

struct CTypeToScalarType {
Expand All @@ -16,4 +16,4 @@ struct CTypeToScalarType<ct> { \
AT_FORALL_SCALAR_TYPES_WITH_COMPLEX(DEFINE_TO_SCALAR_TYPE)
#undef DEFINE_TO_SCALAR_TYPE

} // namespace at
} // namespace c10