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

[1/N] Change #include <c10/util/Optional.h> to #include <optional> (#128301)

Browse Source 
Fixes #ISSUE_NUMBER

Pull Request resolved: https://github.com/pytorch/pytorch/pull/128301
Approved by: https://github.com/ezyang, https://github.com/r-barnes
This commit is contained in:
cyy
2024-07-08 07:03:53 +00:00
committed by PyTorch MergeBot
parent f053be2a97
commit f4dcf2ae93
328 changed files with 1204 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
torch/csrc/jit/python/python_sugared_value.cpp
View File

@ -28,7 +28,7 @@ std::optional<StrongFunctionPtr> as_function(const py::object& obj) {
if (py::isinstance<StrongFunctionPtr>(obj)) {
return py::cast<StrongFunctionPtr>(obj);
}
return c10::nullopt;
return std::nullopt;
}
FunctionSchema PythonValue::getSchema(
@ -66,8 +66,8 @@ FunctionSchema PythonValue::getSchema(
args.emplace_back(
/*name=*/*names_it,
/*type=*/TensorType::get(),
/*N=*/c10::nullopt,
/*default_value=*/c10::nullopt,
/*N=*/std::nullopt,
/*default_value=*/std::nullopt,
/*kwarg_only=*/false);
}
@ -95,8 +95,8 @@ FunctionSchema PythonValue::getSchema(
args.emplace_back(
/*name=*/*names_it,
/*type=*/std::move(*types_it),
/*N=*/c10::nullopt,
/*default_value=*/c10::nullopt,
/*N=*/std::nullopt,
/*default_value=*/std::nullopt,
/*kwarg_only=*/false);
}
rets.push_back(Argument("0", std::move(ret_type), {}, {}, false));
@ -240,10 +240,10 @@ std::shared_ptr<SugaredValue> CUDAPythonModuleValue::attr(
// these APIs.
if (field == "current_device" || field == "set_device") {
return std::make_shared<BuiltinFunction>(
Symbol::cuda("_" + field), c10::nullopt);
Symbol::cuda("_" + field), std::nullopt);
} else {
return std::make_shared<BuiltinFunction>(
Symbol::cuda(field), c10::nullopt);
Symbol::cuda(field), std::nullopt);
}
}
@ -673,7 +673,7 @@ std::shared_ptr<SugaredValue> ModuleValue::tryGetAttr(
if (const auto fnAttr = concreteType_->findFunctionAttribute(field)) {
return std::make_shared<FunctionValue>(*fnAttr);
} else if (const auto builtin = concreteType_->findBuiltinFunction(field)) {
return std::make_shared<BuiltinFunction>(*builtin, /*self=*/c10::nullopt);
return std::make_shared<BuiltinFunction>(*builtin, /*self=*/std::nullopt);
}
// 5. Check if it's an attribute of the original Python class that this
@ -1263,7 +1263,7 @@ std::shared_ptr<SugaredValue> toSugaredValue(
py::module::import("torch.jit._builtins").attr("_find_builtin")(obj);
if (!builtin_name.is_none()) {
return std::make_shared<BuiltinFunction>(
Symbol::fromQualString(py::str(builtin_name)), c10::nullopt);
Symbol::fromQualString(py::str(builtin_name)), std::nullopt);
}
if (py::cast<bool>(py::module::import("torch._jit_internal")