Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc42431b

Browse files
zdevitofacebook-github-bot
authored andcommitted
Revert D13740752: [c10] plug caffe2 into jit
Differential Revision:D13740752Original commit changeset: 2d9383574d42fbshipit-source-id: e9ff217a438720423340a10af7fa263b33f2ae24
1 parent0e6791b commitc42431b

File tree

5 files changed

+2
-75
lines changed

5 files changed

+2
-75
lines changed

‎caffe2/core/operator.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ void RunOperator(
332332
CAFFE_ENFORCE(
333333
fn_wrap,
334334
"Operator not registered with FunctionSchema constructor.",
335-
name.toUnqualString());
335+
name);
336336
auto fn = fn_wrap->getSchema();
337337
auto op =caffe2::FunctionSchemaOperatorRegistry()->Create(
338338
name.toUnqualString(), fn, inputs, outputs);

‎caffe2/core/operator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ C10_DECLARE_REGISTRY(FunctionSchemaRegistry, FunctionSchemaStorageBase);
10981098
C10_REGISTER_CLASS(FunctionSchemaOperatorRegistry, name, impl) \
10991099
structFunctionSchemaStorageBase##name : public FunctionSchemaStorageBase { \
11001100
c10::FunctionSchemagetSchema()override { \
1101-
returnc10::FunctionSchema("caffe2::"#name, inputs, outputs); \
1101+
returnc10::FunctionSchema(#name, inputs, outputs); \
11021102
} \
11031103
}; \
11041104
C10_REGISTER_CLASS( \

‎torch/csrc/jit/custom_operator.cpp‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎torch/csrc/jit/custom_operator.h‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#include<torch/csrc/utils/variadic.h>
77

88
#include<ATen/core/function_schema.h>
9-
#include<caffe2/core/operator.h>
10-
119
#include<c10/util/Metaprogramming.h>
1210
#include<c10/util/TypeList.h>
1311

@@ -260,8 +258,6 @@ Operator createOperator(
260258
});
261259
}
262260

263-
OperatorcreateOperatorFromC2(const std::string& name);
264-
265261
/// Registration class for new operators. Effectively calls
266262
/// `torch::jit::registerOperator` for every supplied operator, but allows doing
267263
/// so in the global scope when a `RegisterOperators` object is assigned to a
@@ -283,14 +279,6 @@ struct TORCH_API RegisterOperators {
283279
op(name, std::forward<Implementation>(implementation));
284280
}
285281

286-
/// Requires declaration of the FunctionSchema with
287-
/// REGISTER_FUNCTION_SCHEMA_OPERATOR(name, ...)
288-
static RegisterOperators&& Caffe2Operator(const std::string& name) {
289-
auto r =RegisterOperators();
290-
registerOperator(createOperatorFromC2(name));
291-
returnstd::move(r);
292-
}
293-
294282
/// Creates a new operator from a name and implementation function (function
295283
/// pointer or function object/lambda) using `torch::jit::createOperator`, and
296284
/// then registers the operator.

‎torch/csrc/jit/interpreter.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#include<torch/csrc/jit/script/jit_exception.h>
1616
#include<ATen/core/thread_pool.h>
1717

18-
#include<caffe2/core/operator.h>
19-
2018
#include<exception>
2119
#include<iostream>
2220
#include<memory>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp