saymrwulf/pytorch
1
0
Fork 0
mirror of https://github.com/saymrwulf/pytorch.git synced 2026-05-14 20:57:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable c10::optional macros (#138912)

Browse source 
Test Plan: Sandcastle

Pull Request resolved: https://github.com/pytorch/pytorch/pull/138912
Approved by: https://github.com/Skylion007, https://github.com/malfet
This commit is contained in:
Richard Barnes 2024-12-17 09:22:47 +00:00 committed by PyTorch MergeBot
parent c3f3a6e4d2
commit e2d47a133b
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aten/src/ATen/native/mkldnn/xpu/detail/QConv.cpp
View file

@ -194,7 +194,7 @@ at::Tensor quantized_convolution(
Tensor scratchpad_tensor = at::empty(
{static_cast<int64_t>(scratchpad_size)},
act.options().dtype(at::kByte),
c10::nullopt);
std::nullopt);
auto scratchpad_m = make_onednn_memory(
conv_fwd_pd.scratchpad_desc(), engine, scratchpad_tensor.data_ptr());
args.insert({DNNL_ARG_SCRATCHPAD, scratchpad_m});

6
aten/src/ATen/native/mkldnn/xpu/qconv.cpp
View file

@ -94,12 +94,12 @@ class QConvoneDNNXPU final {
output,
inv_output_scale,
output_zero_point,
/*accum*/ c10::nullopt,
/*accum*/ std::nullopt,
/*accum_scale*/ 0.0,
/*accum_zero_point*/ 0,
/*output_dtype*/ output_dtype,
/*binary_attr*/ c10::nullopt,
/*binary_alpha*/ c10::nullopt,
/*binary_attr*/ std::nullopt,
/*binary_alpha*/ std::nullopt,
/*unary_attr*/ attr,
/*unary_scalars*/ scalars,
/*unary_algorithm*/ algorithm);

3
c10/util/Optional.h
View file

@ -9,6 +9,8 @@
// up builds.
namespace c10 {
#if !defined(FBCODE_CAFFE2) && !defined(C10_NODEPRECATED)
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::bad_optional_access;
// NOLINTNEXTLINE(misc-unused-using-decls)
@ -19,6 +21,7 @@ using std::nullopt;
using std::nullopt_t;
// NOLINTNEXTLINE(misc-unused-using-decls)
using std::optional;
#endif
#if !defined(FBCODE_CAFFE2) && !defined(C10_NODEPRECATED)

2
torch/csrc/api/include/torch/types.h
View file

@ -38,8 +38,10 @@ namespace torch {
// the `func()` function defined in `at::` namespace is always hidden.
using namespace at; // NOLINT
#if !defined(FBCODE_CAFFE2) && !defined(C10_NODEPRECATED)
using std::nullopt; // NOLINT
using std::optional; // NOLINT
#endif
using Dtype = at::ScalarType;