From f20c14c90aa1d17a351c833ed569249f97a46cbd Mon Sep 17 00:00:00 2001 From: Nikita Shulga <2453524+malfet@users.noreply.github.com> Date: Mon, 6 May 2024 10:53:50 -0700 Subject: [PATCH 1/2] [BE] Delete unused `AT_FORALL_SCALAR_TYPES_AND[456]` Check that they are not used by running the following ``` % grep -h "AT_FORALL_SCALAR_TYPES_AND" . -R|cut -d\( -f1|sort|uniq ``` or by checking online using https://github.com/search?type=code&q=AT_FORALL_SCALAR_TYPES_AND4+repo%3Apytorch%2Fpytorch --- c10/core/ScalarType.h | 80 ------------------------------------------- 1 file changed, 80 deletions(-) diff --git a/c10/core/ScalarType.h b/c10/core/ScalarType.h index b97e43f9e683..e389e2e60d7c 100644 --- a/c10/core/ScalarType.h +++ b/c10/core/ScalarType.h @@ -259,86 +259,6 @@ AT_FORALL_SCALAR_TYPES_WITH_COMPLEX_AND_QINTS(SPECIALIZE_CppTypeToScalarType) ::c10::ScalarType::SCALARTYPE3>::t), \ SCALARTYPE3) -#define AT_FORALL_SCALAR_TYPES_AND4( \ - SCALARTYPE1, SCALARTYPE2, SCALARTYPE3, SCALARTYPE4, _) \ - _(uint8_t, Byte) \ - _(int8_t, Char) \ - _(int16_t, Short) \ - _(int, Int) \ - _(int64_t, Long) \ - _(float, Float) \ - _(double, Double) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE1>::t), \ - SCALARTYPE1) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE2>::t), \ - SCALARTYPE2) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE3>::t), \ - SCALARTYPE3) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE4>::t), \ - SCALARTYPE4) - -#define AT_FORALL_SCALAR_TYPES_AND5( \ - SCALARTYPE1, SCALARTYPE2, SCALARTYPE3, SCALARTYPE4, SCALARTYPE5, _) \ - _(uint8_t, Byte) \ - _(int8_t, Char) \ - _(int16_t, Short) \ - _(int, Int) \ - _(int64_t, Long) \ - _(float, Float) \ - _(double, Double) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE1>::t), \ - SCALARTYPE1) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE2>::t), \ - SCALARTYPE2) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE3>::t), \ - SCALARTYPE3) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE4>::t), \ - SCALARTYPE4) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE5>::t), \ - SCALARTYPE5) - -#define AT_FORALL_SCALAR_TYPES_AND6( \ - SCALARTYPE1, \ - SCALARTYPE2, \ - SCALARTYPE3, \ - SCALARTYPE4, \ - SCALARTYPE5, \ - SCALARTYPE6, \ - _) \ - _(uint8_t, Byte) \ - _(int8_t, Char) \ - _(int16_t, Short) \ - _(int, Int) \ - _(int64_t, Long) \ - _(float, Float) \ - _(double, Double) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE1>::t), \ - SCALARTYPE1) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE2>::t), \ - SCALARTYPE2) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE3>::t), \ - SCALARTYPE3) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE4>::t), \ - SCALARTYPE4) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE5>::t), \ - SCALARTYPE5) \ - _(decltype(::c10::impl::ScalarTypeToCPPType< \ - ::c10::ScalarType::SCALARTYPE6>::t), \ - SCALARTYPE6) #define AT_FORALL_SCALAR_TYPES_AND7( \ SCALARTYPE1, \ From ebd30ad9c986737b7326264a2331f0fc146c1c5a Mon Sep 17 00:00:00 2001 From: Nikita Shulga <2453524+malfet@users.noreply.github.com> Date: Mon, 6 May 2024 11:36:45 -0700 Subject: [PATCH 2/2] Fix lint --- c10/core/ScalarType.h | 1 - 1 file changed, 1 deletion(-) diff --git a/c10/core/ScalarType.h b/c10/core/ScalarType.h index e389e2e60d7c..fb2e6de267a7 100644 --- a/c10/core/ScalarType.h +++ b/c10/core/ScalarType.h @@ -259,7 +259,6 @@ AT_FORALL_SCALAR_TYPES_WITH_COMPLEX_AND_QINTS(SPECIALIZE_CppTypeToScalarType) ::c10::ScalarType::SCALARTYPE3>::t), \ SCALARTYPE3) - #define AT_FORALL_SCALAR_TYPES_AND7( \ SCALARTYPE1, \ SCALARTYPE2, \