frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

turn on -Werror=unused-function in our Bazel CPU build

Browse Source 
Summary:
We also fix any existing issues. Note that we only do this for the CPU
build because nvcc is considered a C++ toolchain but it does not have
the same flag support. Adding flags to the GPU build will cause nvcc
errors.

Test Plan: Built locally, rely on CI to confirm.

Reviewers: malfet

Subscribers:

Tasks:

Tags:

Pull Request resolved: https://github.com/pytorch/pytorch/pull/79154

Approved by: https://github.com/seemethere, https://github.com/osalpekar, https://github.com/albanD
This commit is contained in:
Michael Andreas Dagitses
2022-06-09 13:15:50 -07:00
committed by PyTorch MergeBot
parent 3734fcc8f8
commit 67d313a032
26 changed files with 82 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.bazelrc
View File

@ -49,5 +49,19 @@ build:cpu-only --@rules_cuda//cuda:enable_cuda=False
# On the bright side, this means we don't have to more broadly apply
# the exceptions to an entire target.
build \
--per_file_copt='^//.*\.(cpp|cc)$'@-Werror=type-limits \
--per_file_copt=^//.*\.cu$@--compiler-options=-Werror=type-limits
--per_file_copt='^//.*\.(cpp|cc)$'@-Werror=type-limits \
--per_file_copt=^//.*\.cu$@--compiler-options=-Werror=type-limits \
--per_file_copt='^//.*\.(cpp|cc)$'@-Werror=unused-function \
--per_file_copt=^//.*\.cu$@--compiler-options=-Werror=unused-function
build \
--per_file_copt=//:aten/src/ATen/RegisterCompositeExplicitAutograd.cpp@-Wno-error=unused-function \
--per_file_copt=//:aten/src/ATen/RegisterCompositeImplicitAutograd.cpp@-Wno-error=unused-function \
--per_file_copt=//:aten/src/ATen/RegisterMkldnnCPU.cpp$@-Wno-error=unused-function \
--per_file_copt=//:aten/src/ATen/RegisterNestedTensorCPU.cpp$@-Wno-error=unused-function \
--per_file_copt=//:aten/src/ATen/RegisterQuantizedCPU.cpp$@-Wno-error=unused-function \
--per_file_copt=//:aten/src/ATen/RegisterSparseCPU.cpp$@-Wno-error=unused-function \
--per_file_copt=//:aten/src/ATen/RegisterSparseCsrCPU.cpp$@-Wno-error=unused-function \
--per_file_copt=//:aten/src/ATen/RegisterZeroTensor.cpp$@-Wno-error=unused-function \
--per_file_copt=//:torch/csrc/lazy/generated/RegisterAutogradLazy.cpp@-Wno-error=unused-function \
--per_file_copt=//:torch/csrc/lazy/generated/RegisterLazy.cpp@-Wno-error=unused-function

57
aten/src/ATen/NamedTensorUtils.cpp
View File

@ -260,33 +260,6 @@ std::vector<Dimname> compute_diagonal_outnames(
return outnames;
}
// tensor_dotted_dim and other_dotted_dim are the dimensions of the two
// tensors that we contract together. Usually other_dotted_dim is 0
// and tensor_dotted_dim is the last dim of tensor, but there are some special
// cases like einsum and tensordot where one can contract arbitrary dims.
// NOLINTNEXTLINE(clang-diagnostic-unused-function)
static std::vector<Dimname> compute_dot_product_outnames(
DimnameList tensor_names,
int64_t tensor_dotted_dim,
DimnameList other_names,
int64_t other_dotted_dim) {
int64_t num_outnames = tensor_names.size() + other_names.size() - 2;
if (num_outnames == 0) {
return {};
}
std::vector<Dimname> outnames(num_outnames, Dimname::wildcard());
int64_t index = 0;
for (const auto j : c10::irange(static_cast<int64_t>(tensor_names.size()))) {
if (j == tensor_dotted_dim) continue;
outnames[index++] = tensor_names[j];
}
for (const auto j : c10::irange(static_cast<int64_t>(other_names.size()))) {
if (j == other_dotted_dim) continue;
outnames[index++] = other_names[j];
}
return outnames;
}
static void check_feature_names_are_distinct(
DimnameList self_names,
DimnameList other_names,
@ -306,36 +279,6 @@ static void check_feature_names_are_distinct(
". Please rename the input tensors with `Tensor.rename` to prevent this.");
}
// NOLINTNEXTLINE(clang-diagnostic-unused-function)
static DimnameList batch_dims(DimnameList names) {
if (names.size() <= 2) {
return {};
}
return DimnameList(names.begin(), names.end() - 2);
}
// NOLINTNEXTLINE(clang-diagnostic-unused-function)
static DimnameList feature_dims(DimnameList names) {
if (names.size() <= 2) {
return names;
}
return DimnameList(names.end() - 2, 2);
}
// NOLINTNEXTLINE(clang-diagnostic-unused-function)
static bool are_distinct(DimnameList batch_dims, DimnameList feature_dims) {
for (const auto& target : feature_dims) {
if (target.isWildcard()) {
continue;
}
if (std::any_of(batch_dims.begin(), batch_dims.end(),
[&](const Dimname& dim) { return target == dim; })) {
return false;
}
}
return true;
}
static int64_t num_batch_dims(DimnameList names) {
if (names.size() <= 2) {
return 0;

20
aten/src/ATen/native/BinaryOps.cpp
View File

@ -12,26 +12,6 @@
#include <torch/library.h>
namespace at {
namespace native {
// These are still needed because we don't have C++ conversions from number
// types (int, float, etc.) to Tensor (only to Scalar). They're not exposed
// to Python.
static void check_convert(const Scalar& scalar, ScalarType scalarType) {
// Validate that is possible to convert scalar to tensor dtype without
// overflow
AT_DISPATCH_ALL_TYPES_AND_COMPLEX_AND4(
at::ScalarType::Bool,
at::ScalarType::BFloat16,
at::ScalarType::Half,
at::ScalarType::ComplexHalf,
scalarType,
"check_convert",
[&] { scalar.to<scalar_t>(); });
}
} // namespace native
namespace meta {

12
aten/src/ATen/native/ReduceOps.cpp
View File

@ -1111,18 +1111,6 @@ Tensor nansum(const Tensor& self, IntArrayRef dim, bool keepdim, c10::optional<S
return at::native::nansum_out(self, dim, keepdim, dtype, result);
}
static Tensor& prod_out_impl(Tensor& result, const Tensor& self, IntArrayRef dim,
bool keepdim, c10::optional<ScalarType> opt_dtype) {
ScalarType dtype = get_dtype_from_result(result, opt_dtype);
auto iter = make_reduction("prod", result, self, dim, keepdim, dtype);
if (iter.numel() == 0) {
result.fill_(1);
} else {
prod_stub(iter.device_type(), iter);
}
return result;
}
// NOTE: this could be implemented via diag and sum, but this has perf problems,
// see https://github.com/pytorch/pytorch/pull/47305,
Tensor trace_cpu(const Tensor& self) {

5
aten/src/ATen/native/quantized/AffineQuantizer.cpp
View File

@ -35,11 +35,6 @@ void checkRoundingMode(const std::string& fn_name) {
return;
}
void checkCPUTensor(const std::string& fn_name, const Tensor& t) {
TORCH_CHECK(
t.device().type() == kCPU, fn_name, " only supports CPU device type.");
}
void checkFloatTensor(const std::string& fn_name, const Tensor& t) {
TORCH_CHECK(
t.scalar_type() == kFloat, fn_name, " expects a Float Tensor, got ",

8
c10/test/util/exception_test.cpp
View File

@ -5,9 +5,6 @@
using c10::Error;
namespace {
bool throw_func() {
throw std::runtime_error("I'm throwing...");
}
template <class Functor>
inline void expectThrowsEq(Functor&& functor, const char* expectedMessage) {
@ -26,9 +23,10 @@ TEST(ExceptionTest, TORCH_INTERNAL_ASSERT_DEBUG_ONLY) {
#ifdef NDEBUG
// NOLINTNEXTLINE(cppcoreguidelines-avoid-goto,hicpp-avoid-goto)
ASSERT_NO_THROW(TORCH_INTERNAL_ASSERT_DEBUG_ONLY(false));
// Does nothing - `throw_func()` should not be evaluated
// Does nothing - `throw ...` should not be evaluated
// NOLINTNEXTLINE(cppcoreguidelines-avoid-goto,hicpp-avoid-goto)
ASSERT_NO_THROW(TORCH_INTERNAL_ASSERT_DEBUG_ONLY(throw_func()));
ASSERT_NO_THROW(TORCH_INTERNAL_ASSERT_DEBUG_ONLY(
(throw std::runtime_error("I'm throwing..."), true)));
#else
ASSERT_THROW(TORCH_INTERNAL_ASSERT_DEBUG_ONLY(false), c10::Error);
ASSERT_NO_THROW(TORCH_INTERNAL_ASSERT_DEBUG_ONLY(true));

25
caffe2/ideep/operators/adam_op.cc
View File

@ -4,31 +4,6 @@ using namespace caffe2;
namespace {
// NOLINTNEXTLINE(clang-diagnostic-unused-function)
void adam_ideep_update(
int N,
const float* g,
const float* m,
const float* v,
float* ng,
float* nm,
float* nv,
float beta1,
float beta2,
float eps_hat,
float correction,
const float* lr) {
#ifdef _OPENMP
#pragma omp parallel for schedule(static)
#endif
for (auto i = 0; i < N; ++i) {
float gi = g[i];
float mi = nm[i] = m[i] * beta1 + gi * (1 - beta1);
float vi = nv[i] = v[i] * beta2 + gi * gi * (1 - beta2);
ng[i] = lr[0] * correction * mi / (std::sqrt(vi) + eps_hat);
}
}
void adam_ideep_compute(
int N,
const float* w,

22
caffe2/opt/onnxifi_transformer.cc
View File

@ -31,28 +31,6 @@ std::unordered_map<std::string, TensorShape> stripShapeInfoMap(
return shape_map;
}
// NOLINTNEXTLINE(clang-diagnostic-unused-function)
uint64_t onnxifiDataType(caffe2::TensorProto::DataType t) {
#define CAFFE2_TO_ONNXIFI_TYPE(x, y) \
case (caffe2::TensorProto::x): \
return y
switch (t) {
CAFFE2_TO_ONNXIFI_TYPE(FLOAT, ONNXIFI_DATATYPE_FLOAT32);
CAFFE2_TO_ONNXIFI_TYPE(INT8, ONNXIFI_DATATYPE_INT8);
CAFFE2_TO_ONNXIFI_TYPE(UINT8, ONNXIFI_DATATYPE_UINT8);
CAFFE2_TO_ONNXIFI_TYPE(INT16, ONNXIFI_DATATYPE_INT16);
CAFFE2_TO_ONNXIFI_TYPE(UINT16, ONNXIFI_DATATYPE_UINT16);
CAFFE2_TO_ONNXIFI_TYPE(INT32, ONNXIFI_DATATYPE_INT32);
CAFFE2_TO_ONNXIFI_TYPE(INT64, ONNXIFI_DATATYPE_INT64);
CAFFE2_TO_ONNXIFI_TYPE(FLOAT16, ONNXIFI_DATATYPE_FLOAT16);
default:
LOG(WARNING) << "Unsupported Caffe2 tensor type: " << t
<< ", fallback to FLOAT";
return ONNXIFI_DATATYPE_FLOAT32;
}
#undef CAFFE2_TO_ONNXIFI_TYPE
}
std::vector<::ONNX_NAMESPACE::ValueInfoProto> convertToValueInfo(
const std::vector<std::string>& names,
const std::unordered_map<std::string, TensorShape>& shape_hints,

41
test/cpp/jit/torch_python_test.cpp
View File

@ -34,29 +34,30 @@ void testEvalModeForLoadedModule() {
AT_ASSERT(module.attr("dropout").toModule().is_training());
}
void testSerializationInterop() {
if (isSandcastle()) {
// The module file to load is not generated in Sandcastle
return;
}
// TODO: this test never ran before and is broken.
// void testSerializationInterop() {
// if (isSandcastle()) {
// // The module file to load is not generated in Sandcastle
// return;
// }
// This should be generated by `test/cpp/jit/tests_setup.py`
std::ifstream input_stream("ivalue.pt");
std::vector<char> input;
input.insert(
input.begin(),
std::istream_iterator<char>(input_stream),
std::istream_iterator<char>());
IValue ivalue = pickle_load(input);
// // This should be generated by `test/cpp/jit/tests_setup.py`
// std::ifstream input_stream("ivalue.pt");
// std::vector<char> input;
// input.insert(
// input.begin(),
// std::istream_iterator<char>(input_stream),
// std::istream_iterator<char>());
// IValue ivalue = pickle_load(input);
auto elements = ivalue.toTupleRef().elements();
auto ones = torch::ones({2, 2});
AT_ASSERT(ones.equal(elements.at(0).toTensor()));
// auto elements = ivalue.toTupleRef().elements();
// auto ones = torch::ones({2, 2});
// AT_ASSERT(ones.equal(elements.at(0).toTensor()));
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
auto twos = torch::ones({3, 5}) * 2;
AT_ASSERT(twos.equal(elements.at(1).toTensor()));
}
// // NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
// auto twos = torch::ones({3, 5}) * 2;
// AT_ASSERT(twos.equal(elements.at(1).toTensor()));
// }
void testTorchSaveError() {
if (isSandcastle()) {

4
test/cpp/tensorexpr/test_conv.cpp
View File

@ -12,14 +12,14 @@ namespace jit {
namespace te = torch::jit::tensorexpr;
namespace F = torch::nn::functional;
#ifdef TORCH_ENABLE_LLVM
// Generate test data with few bits of precision, to minimize error
// accumulation from floating-point reordering.
static at::Tensor genTestData(c10::IntArrayRef args) {
return at::trunc(at::randn(args) * 256.0f) / 256.0f;
}
#ifdef TORCH_ENABLE_LLVM
TEST(Conv, DepthwiseConv2D) {
constexpr int N = 1, C = 72, H = 56, W = 56;
constexpr int K = 72, R = 3, S = 3;

4
test/cpp/tensorexpr/tutorial.cpp
View File

@ -54,9 +54,13 @@
using namespace torch::jit::tensorexpr;
#ifdef TORCH_ENABLE_LLVM
// Helper function to print a snippet from a big multi-line string
static void printLinesToFrom(const std::string& input_str, int from, int to);
#endif
int main(int argc, char* argv[]) {
std::cout << "*** Structure of tensor expressions and statements ***"
<< std::endl;

16
torch/csrc/DynamicTypes.cpp
View File

@ -28,22 +28,6 @@ std::array<THPDtype*, static_cast<int>(at::ScalarType::NumOptions)> dtype_regist
std::array<THPLayout*, static_cast<int>(at::Layout::NumOptions)> layout_registry = {};
at::Backend get_backend(bool is_cuda, bool is_sparse) {
if (is_cuda) {
if (is_sparse){
return at::Backend::SparseCUDA;
} else {
return at::Backend::CUDA;
}
} else {
if (is_sparse){
return at::Backend::SparseCPU;
} else {
return at::Backend::CPU;
}
}
}
at::DeprecatedTypeProperties* get_type_properties(at::DeviceType device_type, at::ScalarType scalarType) {
at::Backend backend;
if (device_type == at::kCPU) {

14
torch/csrc/Storage.cpp
View File

@ -337,20 +337,6 @@ static PyObject * THPStorage_device(THPStorage* self, void *unused) {
END_HANDLE_TH_ERRORS
}
static PyObject * THPStorage_dtype(THPStorage *self, void *unused)
{
HANDLE_TH_ERRORS
return torch::autograd::utils::wrap(
torch::getTHPDtype(at::typeMetaToScalarType(
#ifdef THQUANTIZED
caffe2::TypeMeta::Make<quantized_t>()
#else
caffe2::TypeMeta::Make<uint8_t>()
#endif
)));
END_HANDLE_TH_ERRORS
}
typedef PyObject *(*getter)(PyObject *, void *);
// NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays,cppcoreguidelines-avoid-non-const-global-variables)

12
torch/csrc/autograd/init.cpp
View File

@ -480,18 +480,6 @@ static PyObject * set_autocast_cpu_dtype(PyObject* _unused, PyObject *arg) {
END_HANDLE_TH_ERRORS
}
static const char* scalarTypeName(const at::ScalarType type) {
switch (type) {
#define DEFINE_CASE(ctype, name) \
case at::ScalarType::name: \
return #ctype;
AT_FORAUTOCAST_SCALAR_TYPES(DEFINE_CASE)
#undef DEFINE_CASE
default:
throw std::runtime_error("unknown scalar type for autocast");
}
}
static PyObject * get_autocast_gpu_dtype(PyObject* _unused, PyObject *arg){
HANDLE_TH_ERRORS
at::ScalarType current_dtype = at::autocast::get_autocast_gpu_dtype();

6
torch/csrc/jit/codegen/cuda/codegen.cpp
View File

@ -27,12 +27,6 @@ std::string ptrType(DataType dt) {
return ss.str();
}
std::string refType(DataType dt) {
std::stringstream ss;
ss << dt << "&";
return ss.str();
}
//! Utility class to build an argument list
class ArgumentBuilder {
public:

13
torch/csrc/jit/codegen/cuda/index_compute.cpp
View File

@ -2407,19 +2407,6 @@ std::vector<PredicateDomainInfo> getPredicateContigIds(
return contig_id_infos;
}
IterDomain* getMappedReferenceDomain(
IterDomain* id,
const ReferenceTensor& reference) {
// Partially overlaps with getPredicateContigIds()
auto concrete_id = GpuLower::current()->caMap()->getConcreteMappedID(
id, IdMappingMode::EXACT);
auto it = reference.concrete_to_id.find(concrete_id);
if (it == reference.concrete_to_id.end()) {
return nullptr;
}
return it->second;
}
std::vector<PredicateDomainInfo> getNonDivisibleConsumerDomainsToPredicate(
TensorView* consumer_tv) {
const auto& non_divisible_split_info =

12
torch/csrc/jit/codegen/cuda/ir_nodes.cpp
View File

@ -1351,18 +1351,6 @@ TensorDomain::TensorDomain(const TensorDomain* src, IrCloner* ir_cloner)
contiguity_(src->contiguity()),
has_nontrivial_reduction_(src->has_nontrivial_reduction_) {}
namespace {
std::vector<IterDomain*> lowerIterDomains(
const std::vector<fuser::cuda::IterDomain*>& domains) {
std::vector<IterDomain*> lowered_domains;
lowered_domains.reserve(domains.size());
for (const auto iter_domain : domains) {
lowered_domains.push_back(iter_domain);
}
return lowered_domains;
};
} // namespace
bool TensorDomain::hasBlockBroadcast() const {
return std::any_of(domain_.begin(), domain_.end(), [](IterDomain* id) {
return id->isBroadcast() && id->isThreadDim();

5
torch/csrc/jit/codegen/cuda/kernel_cache.cpp
View File

@ -42,11 +42,6 @@ int getCommonDeviceCUDA(const at::ArrayRef<IValue>& inputs) {
return index;
}
// TODO: temporary hack to resolve my is_constructible issue;
std::vector<size_t> toVector(const at::DimVector& small_vec) {
return std::vector<size_t>(small_vec.begin(), small_vec.end());
}
void encodeBuffer(size_t value, std::string& buffer) {
const char* v = reinterpret_cast<char*>(&value);
for (const auto i : c10::irange(sizeof(size_t))) {

64
torch/csrc/jit/codegen/cuda/lower_expr_sort.cpp
View File

@ -555,39 +555,41 @@ ExprGroup* ExprSegmentationSorter::makeEmptyGroup(Expr* expr) {
}
// Debug function that prints the current state of the sorter.
std::string ExprSegmentationSorter::toString(int verbosity) const {
std::stringstream ss;
ss << "{\n";
for (auto& group : groups_) {
ss << " " << group.get() << "\n";
//
// Uncomment if needed.
// std::string ExprSegmentationSorter::toString(int verbosity) const {
// std::stringstream ss;
// ss << "{\n";
// for (auto& group : groups_) {
// ss << " " << group.get() << "\n";
if (verbosity > 1) {
if (group->producerEdges().size() > 0) {
ss << "Produced by groups with edges: { \n";
for (auto producer_edge : group->producerEdges()) {
ss << producer_edge->producer_val_ << " -> "
<< producer_edge->consumer_val_ << "\n";
}
ss << " }"
<< "\n";
}
}
// if (verbosity > 1) {
// if (group->producerEdges().size() > 0) {
// ss << "Produced by groups with edges: { \n";
// for (auto producer_edge : group->producerEdges()) {
// ss << producer_edge->producer_val_ << " -> "
// << producer_edge->consumer_val_ << "\n";
// }
// ss << " }"
// << "\n";
// }
// }
if (verbosity > 1) {
if (group->consumerEdges().size() > 0) {
ss << "Consumed by groups with edges: { \n";
for (auto consumer_edge : group->consumerEdges()) {
ss << consumer_edge->producer_val_ << " -> "
<< consumer_edge->consumer_val_ << "\n";
}
ss << " }"
<< "\n";
}
}
}
ss << "}\n";
return ss.str();
}
// if (verbosity > 1) {
// if (group->consumerEdges().size() > 0) {
// ss << "Consumed by groups with edges: { \n";
// for (auto consumer_edge : group->consumerEdges()) {
// ss << consumer_edge->producer_val_ << " -> "
// << consumer_edge->consumer_val_ << "\n";
// }
// ss << " }"
// << "\n";
// }
// }
// }
// ss << "}\n";
// return ss.str();
// }
namespace {

4
torch/csrc/jit/codegen/cuda/parser.cpp
View File

@ -386,10 +386,6 @@ struct MemoryCompare {
}
};
bool operator==(const MemoryFormat& a, const MemoryFormat& b) {
return a.permutation_ == b.permutation_;
};
typedef std::map<MemoryFormat, CgValue, MemoryCompare> MemoryFormatMap;
MemoryFormat operator+(const MemoryFormat& a, const MemoryFormat& b) {

15
torch/csrc/jit/mobile/compatibility/backport_manager.cpp
View File

@ -77,21 +77,6 @@ void selective_copy(
}
}
// Copy all content from reader to stringstream
void get_model_stream(PyTorchStreamReader& reader, std::stringstream& out) {
auto writer_func = [&](const void* buf, size_t nbytes) -> size_t {
out.write(static_cast<const char*>(buf), nbytes);
return !out ? 0 : nbytes;
};
PyTorchStreamWriter writer(writer_func);
selective_copy(
reader,
writer,
std::unordered_set<std::string>(),
std::unordered_set<std::string>());
}
// The write_archive_current function is used for bytecode from version v5 to
// v7 (the latest bytecode version). pre-v5 we serialized things differently.
// This write archive function may change in export_module.cpp, however we don't

3
torch/csrc/jit/mobile/module.cpp
View File

@ -107,6 +107,7 @@ void slot_named_params_recurse(
}
}
#if defined(SYMBOLICATE_MOBILE_DEBUG_HANDLE)
std::string getTopModuleTypeName(const Module& m) {
std::string name;
if (m._ivalue()->type() && m._ivalue()->type()->name()) {
@ -114,6 +115,8 @@ std::string getTopModuleTypeName(const Module& m) {
}
return name;
}
#endif
} // namespace
const std::vector<at::Tensor> Module::parameters() const {

21
torch/csrc/jit/passes/onnx/shape_type_inference.cpp
View File

@ -377,27 +377,6 @@ void ConvertGraphToONNXProto(
}
}
// this function checks wheather the blocks of If node have the same return
// type.
bool IsBlockReturnTypeSame(Node* n) {
TORCH_INTERNAL_ASSERT(n->kind() == ::c10::onnx::If);
auto then_block = n->blocks()[0];
auto else_block = n->blocks()[1];
for (const auto i : c10::irange(n->outputs().size())) {
// check the type
auto then_block_type = then_block->outputs()[i]->type();
auto else_block_type = else_block->outputs()[i]->type();
if (then_block_type->cast<TensorType>() &&
else_block_type->cast<TensorType>()) {
if (then_block_type->castRaw<TensorType>()->scalarType() !=
else_block_type->castRaw<TensorType>()->scalarType()) {
return false;
}
}
}
return true;
}
c10::optional<at::Tensor> ComputeConstantFolding(Node* n, int opset_version) {
if (n->inputs().size() == 0) {
return c10::nullopt;

6
torch/csrc/jit/runtime/static/ops.cpp
View File

@ -2642,12 +2642,6 @@ void signed_log1p_out(at::Tensor& out, const at::Tensor& input) {
});
}
at::Tensor signed_log1p(const at::Tensor& input) {
auto out = create_empty_from(input);
signed_log1p_out(out, input);
return out;
}
} // namespace
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)

33
torch/csrc/jit/serialization/export_module.cpp
View File

@ -345,17 +345,6 @@ void pushMobileFunctionsToIValues(
}
}
std::unordered_set<const FunctionSchema*> getInterfaceCalls(Graph& graph) {
std::unordered_set<const FunctionSchema*> ret;
auto nodes = findAllNodes(graph, c10::prim::CallMethod, true);
for (Node* node : nodes) {
if (auto iface = node->input(0)->type()->castRaw<InterfaceType>()) {
ret.insert(iface->getMethod(node->s(attr::name)));
}
}
return ret;
}
struct ModuleMethod {
ModuleMethod(const Module& m, const GraphFunction& f, c10::QualifiedName n)
: module(m), function(f), exportName(std::move(n)) {}
@ -364,28 +353,6 @@ struct ModuleMethod {
c10::QualifiedName exportName;
};
std::vector<ModuleMethod> getModuleInterfaceExports(
const Module& module,
const std::unordered_set<const FunctionSchema*>& schemas) {
if (schemas.size() == 0) {
return {};
}
std::unordered_set<std::string> names;
for (auto schema : schemas) {
names.insert(schema->name());
}
std::vector<ModuleMethod> ret;
for (const auto& submodule : module.modules()) {
for (const auto& method : submodule.get_methods()) {
const auto& f = toGraphFunction(method.function());
if (names.find(f.qualname().name()) != names.end()) {
ret.emplace_back(submodule, f, f.qualname());
}
}
}
return ret;
}
bool isLoweredModule(const Module& m) {
c10::QualifiedName type_name;
if (m.type()->name()) {

14
torch/csrc/utils/tensor_new.cpp
View File

@ -70,12 +70,6 @@ void maybe_initialize_cuda(const Device device) {
// options.
// TODO: Refactor this so we just pass everything in via options
Tensor dispatch_ones(c10::TensorOptions options, at::ScalarType scalar_type, const optional<Device>& device, IntArrayRef sizes) {
maybe_initialize_cuda(options.device());
pybind11::gil_scoped_release no_gil;
return torch::ones(sizes, build_options(options, scalar_type, device));
}
Tensor new_with_sizes(c10::TensorOptions options, at::ScalarType scalar_type, const optional<Device>& device, IntArrayRef sizes) {
maybe_initialize_cuda(options.device());
pybind11::gil_scoped_release no_gil;
@ -469,14 +463,6 @@ Tensor legacy_sparse_tensor_generic_ctor_new(c10::DispatchKey dispatch_key, at::
throw std::runtime_error("new(): invalid arguments");
}
Tensor legacy_sparse_tensor_ctor(c10::DispatchKey dispatch_key, at::ScalarType scalar_type, PyObject* args, PyObject* kwargs) {
return legacy_sparse_tensor_generic_ctor_new(dispatch_key, scalar_type, args, kwargs, CtorOrNew::CTOR);
}
Tensor legacy_sparse_tensor_new(c10::DispatchKey dispatch_key, at::ScalarType scalar_type, PyObject* args, PyObject* kwargs) {
return legacy_sparse_tensor_generic_ctor_new(dispatch_key, scalar_type, args, kwargs, CtorOrNew::NEW);
}
// NB: device_idx here is NOT a DeviceIndex, but index into PythonArgs
c10::TensorOptions typeIdWithDefault(PythonArgs& r, int64_t device_idx, c10::DispatchKey dispatch_key) {
auto options = dispatchKeyToTensorOptions(dispatch_key);