Skip to content

Commit 01c6bb2

Browse files
smessmersmessmer
committed
[wip] Fix Windows build
Broken due to #12117. Try fixing it. Differential Revision: [D17387317](https://our.internmc.facebook.com/intern/diff/D17387317/) ghstack-source-id: 90131294 Pull Request resolved: #26246
1 parent b4b8f53 commit 01c6bb2

File tree

8 files changed

+41
-35
lines changed

8 files changed

+41
-35
lines changed

‎aten/src/ATen/core/op_registration/kernel_function_legacy_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -803,9 +803,9 @@ TEST(OperatorRegistrationTest_LegacyFunctionBasedKernel, givenFallbackKernelWith
803803
EXPECT_EQ(4, outputs[0].toInt());
804804
}
805805

806-
c10::optional<Tensor> called_arg2;
807-
c10::optional<int64_t> called_arg3;
808-
c10::optional<std::string> called_arg4;
806+
c10::optional<Tensor> called_arg2 = c10::nullopt;
807+
c10::optional<int64_t> called_arg3 = c10::nullopt;
808+
c10::optional<std::string> called_arg4 = c10::nullopt;
809809

810810
void kernelWithOptInputWithoutOutput(Tensor arg1, const c10::optional<Tensor>& arg2, c10::optional<int64_t> arg3, c10::optional<std::string> arg4) {
811811
called = true;

‎aten/src/ATen/core/op_registration/kernel_function_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,9 +526,9 @@ TEST(OperatorRegistrationTest_FunctionBasedKernel, givenFallbackKernelWithoutTen
526526
EXPECT_EQ(4, outputs[0].toInt());
527527
}
528528

529-
c10::optional<Tensor> called_arg2;
530-
c10::optional<int64_t> called_arg3;
531-
c10::optional<std::string> called_arg4;
529+
c10::optional<Tensor> called_arg2 = c10::nullopt;
530+
c10::optional<int64_t> called_arg3 = c10::nullopt;
531+
c10::optional<std::string> called_arg4 = c10::nullopt;
532532

533533
void kernelWithOptInputWithoutOutput(Tensor arg1, const c10::optional<Tensor>& arg2, c10::optional<int64_t> arg3, c10::optional<std::string> arg4) {
534534
called = true;

‎aten/src/ATen/core/op_registration/kernel_functor_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -675,9 +675,9 @@ TEST(OperatorRegistrationTest_FunctorBasedKernel, givenFallbackKernelWithoutTens
675675
EXPECT_EQ(4, outputs[0].toInt());
676676
}
677677

678-
c10::optional<Tensor> called_arg2;
679-
c10::optional<int64_t> called_arg3;
680-
c10::optional<std::string> called_arg4;
678+
c10::optional<Tensor> called_arg2 = c10::nullopt;
679+
c10::optional<int64_t> called_arg3 = c10::nullopt;
680+
c10::optional<std::string> called_arg4 = c10::nullopt;
681681

682682
struct KernelWithOptInputWithoutOutput final : OperatorKernel {
683683
void operator()(Tensor arg1, const c10::optional<Tensor>& arg2, c10::optional<int64_t> arg3, c10::optional<std::string> arg4) {

‎aten/src/ATen/core/op_registration/kernel_lambda_legacy_test.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -729,9 +729,9 @@ TEST(OperatorRegistrationTest_LegacyLambdaBasedKernel, givenFallbackKernelWithou
729729

730730
TEST(OperatorRegistrationTest_LegacyLambdaBasedKernel, givenKernelWithOptionalInputs_withoutOutput_whenRegistered_thenCanBeCalled) {
731731
bool called;
732-
c10::optional<Tensor> called_arg2;
733-
c10::optional<int64_t> called_arg3;
734-
c10::optional<std::string> called_arg4;
732+
c10::optional<Tensor> called_arg2 = c10::nullopt;
733+
c10::optional<int64_t> called_arg3 = c10::nullopt;
734+
c10::optional<std::string> called_arg4 = c10::nullopt;
735735

736736
auto registrar = RegisterOperators().op(
737737
"_test::opt_input(Tensor arg1, Tensor? arg2, int? arg3, str? arg4) -> ()",
@@ -768,9 +768,9 @@ TEST(OperatorRegistrationTest_LegacyLambdaBasedKernel, givenKernelWithOptionalIn
768768

769769
TEST(OperatorRegistrationTest_LegacyLambdaBasedKernel, givenKernelWithOptionalInputs_withOutput_whenRegistered_thenCanBeCalled) {
770770
bool called;
771-
c10::optional<Tensor> called_arg2;
772-
c10::optional<int64_t> called_arg3;
773-
c10::optional<std::string> called_arg4;
771+
c10::optional<Tensor> called_arg2 = c10::nullopt;
772+
c10::optional<int64_t> called_arg3 = c10::nullopt;
773+
c10::optional<std::string> called_arg4 = c10::nullopt;
774774

775775
auto registrar = RegisterOperators().op(
776776
"_test::opt_input(Tensor arg1, Tensor? arg2, int? arg3, str? arg4) -> Tensor?",
@@ -810,9 +810,9 @@ TEST(OperatorRegistrationTest_LegacyLambdaBasedKernel, givenKernelWithOptionalIn
810810

811811
TEST(OperatorRegistrationTest_LegacyLambdaBasedKernel, givenKernelWithOptionalInputs_withMultipleOutputs_whenRegistered_thenCanBeCalled) {
812812
bool called;
813-
c10::optional<Tensor> called_arg2;
814-
c10::optional<int64_t> called_arg3;
815-
c10::optional<std::string> called_arg4;
813+
c10::optional<Tensor> called_arg2 = c10::nullopt;
814+
c10::optional<int64_t> called_arg3 = c10::nullopt;
815+
c10::optional<std::string> called_arg4 = c10::nullopt;
816816

817817
auto registrar = RegisterOperators().op(
818818
"_test::opt_input(Tensor arg1, Tensor? arg2, int? arg3, str? arg4) -> (Tensor?, int?, str?)",

‎aten/src/ATen/core/op_registration/kernel_lambda_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,9 @@ TEST(OperatorRegistrationTest_LambdaBasedKernel, givenFallbackKernelWithoutTenso
461461
EXPECT_EQ(4, outputs[0].toInt());
462462
}
463463

464-
c10::optional<Tensor> called_arg2;
465-
c10::optional<int64_t> called_arg3;
466-
c10::optional<std::string> called_arg4;
464+
c10::optional<Tensor> called_arg2 = c10::nullopt;
465+
c10::optional<int64_t> called_arg3 = c10::nullopt;
466+
c10::optional<std::string> called_arg4 = c10::nullopt;
467467

468468
TEST(OperatorRegistrationTest_LambdaBasedKernel, givenKernelWithOptionalInputs_withoutOutput_whenRegistered_thenCanBeCalled) {
469469
auto registrar = RegisterOperators().op(

‎aten/src/ATen/core/op_registration/op_registration.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ static_assert(std::is_nothrow_move_assignable<c10::optional<RegistrationHandleRA
1313
class RegisterOperators::OperatorRegistrar final {
1414
public:
1515
explicit OperatorRegistrar(FunctionSchema&& schema, OperatorOptions&& operatorOptions, c10::optional<TensorTypeId> dispatch_key, KernelFunction* kernel, KernelCacheCreatorFunction&& cache_creator, void* unboxed_kernel, void* unboxed_autograd_kernel)
16-
: op_(Dispatcher::singleton().registerSchema(std::move(schema), std::move(operatorOptions))), kernel_registration_handle_(c10::nullopt) {
16+
: op_(Dispatcher::singleton().registerSchema(std::move(schema), std::move(operatorOptions))), kernel_registration_handle_(c10::nullopt), unboxed_autograd_kernel_registration_handle_(c10::nullopt) {
1717
// cache creator can only be set if the kernel is also set
1818
TORCH_INTERNAL_ASSERT((kernel != nullptr || unboxed_kernel != nullptr) || !static_cast<bool>(cache_creator));
1919

‎aten/src/ATen/core/op_registration/op_registration.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,13 @@ class CAFFE2_API RegisterOperators final {
444444
);
445445
}
446446

447-
Options() = default;
447+
Options()
448+
: schemaOrName_(c10::nullopt)
449+
, legacyATenSchema_(c10::nullopt)
450+
, kernels()
451+
, aliasAnalysisKind_(c10::nullopt)
452+
, unboxedAutogradKernel_(nullptr)
453+
{}
448454

449455
// KernelRegistrationConfig accumulates all information from the config
450456
// parameters passed to a RegisterOperators::op() call into one object.

‎aten/src/ATen/core/op_registration/op_registration_test.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -810,28 +810,28 @@ TEST(OperatorRegistrationTest, testAvailableArgTypes) {
810810

811811
// optional types (with has_value() == false)
812812
testArgTypes<c10::optional<double>>::test(
813-
c10::optional<double>(), [] (const c10::optional<double>& v) {EXPECT_FALSE(v.has_value());},
814-
c10::optional<double>(), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
813+
c10::optional<double>(c10::nullopt), [] (const c10::optional<double>& v) {EXPECT_FALSE(v.has_value());},
814+
c10::optional<double>(c10::nullopt), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
815815
"(float? a) -> float?");
816816
testArgTypes<c10::optional<int64_t>>::test(
817-
c10::optional<int64_t>(), [] (const c10::optional<int64_t>& v) {EXPECT_FALSE(v.has_value());},
818-
c10::optional<int64_t>(), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
817+
c10::optional<int64_t>(c10::nullopt), [] (const c10::optional<int64_t>& v) {EXPECT_FALSE(v.has_value());},
818+
c10::optional<int64_t>(c10::nullopt), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
819819
"(int? a) -> int?");
820820
testArgTypes<c10::optional<bool>>::test(
821-
c10::optional<bool>(), [] (const c10::optional<bool>& v) {EXPECT_FALSE(v.has_value());},
822-
c10::optional<bool>(), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
821+
c10::optional<bool>(c10::nullopt), [] (const c10::optional<bool>& v) {EXPECT_FALSE(v.has_value());},
822+
c10::optional<bool>(c10::nullopt), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
823823
"(bool? a) -> bool?");
824824
testArgTypes<c10::optional<bool>>::test(
825-
c10::optional<bool>(), [] (const c10::optional<bool>& v) {EXPECT_FALSE(v.has_value());},
826-
c10::optional<bool>(), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
825+
c10::optional<bool>(c10::nullopt), [] (const c10::optional<bool>& v) {EXPECT_FALSE(v.has_value());},
826+
c10::optional<bool>(c10::nullopt), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
827827
"(bool? a) -> bool?");
828828
testArgTypes<c10::optional<std::string>>::test(
829-
c10::optional<std::string>(), [] (const c10::optional<std::string>& v) {EXPECT_FALSE(v.has_value());},
830-
c10::optional<std::string>(), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
829+
c10::optional<std::string>(c10::nullopt), [] (const c10::optional<std::string>& v) {EXPECT_FALSE(v.has_value());},
830+
c10::optional<std::string>(c10::nullopt), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
831831
"(str? a) -> str?");
832832
testArgTypes<c10::optional<Tensor>>::test(
833-
c10::optional<Tensor>(), [] (const c10::optional<Tensor>& v) {EXPECT_FALSE(v.has_value());},
834-
c10::optional<Tensor>(), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
833+
c10::optional<Tensor>(c10::nullopt), [] (const c10::optional<Tensor>& v) {EXPECT_FALSE(v.has_value());},
834+
c10::optional<Tensor>(c10::nullopt), [] (const IValue& v) {EXPECT_TRUE(v.isNone());},
835835
"(Tensor? a) -> Tensor?");
836836

837837

0 commit comments

Comments
 (0)