mirror of
https://github.com/zebrajr/pytorch.git
synced 2025-12-06 12:20:52 +01:00
[Pytorch Edge] Refactor Compatibility Stuff into own directory (#71432)
Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/71432
Organizing jit/mobile a little more
ghstack-source-id: 147184536
Test Plan: ci.
Reviewed By: iseeyuan
Differential Revision: D33640527
fbshipit-source-id: f3a7884fe0d06d80bb8d9cf141ecaee34b6f88ff
(cherry picked from commit 4c3d1e5435)
This commit is contained in:
Jacob Szwejbka
PyTorch MergeBot
parent
1c61d8c43f
commit
e926360cb8
|
|
@ -558,7 +558,7 @@ if(NOT INTERN_BUILD_MOBILE OR NOT BUILD_CAFFE2_MOBILE)
|
|||
${TORCH_SRC_DIR}/csrc/jit/mobile/import.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/import_data.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/interpreter.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/model_compatibility.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/compatibility/model_compatibility.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/module.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/flatbuffer_loader.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/observer.cpp
|
||||
|
|
@ -590,8 +590,8 @@ if(NOT INTERN_BUILD_MOBILE OR NOT BUILD_CAFFE2_MOBILE)
|
|||
if(NOT INTERN_BUILD_MOBILE AND NOT BUILD_LITE_INTERPRETER)
|
||||
list(APPEND TORCH_SRCS
|
||||
${TORCH_SRC_DIR}/csrc/api/src/jit.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/backport.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/backport_manager.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/compatibility/backport.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/mobile/compatibility/backport_manager.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/serialization/onnx.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/serialization/export.cpp
|
||||
${TORCH_SRC_DIR}/csrc/jit/serialization/export_bytecode.cpp
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
#include <torch/csrc/autograd/generated/variable_factories.h>
|
||||
#include <torch/csrc/jit/api/module.h>
|
||||
#include <torch/csrc/jit/frontend/resolver.h>
|
||||
#include <torch/csrc/jit/mobile/backport.h>
|
||||
#include <torch/csrc/jit/mobile/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/flatbuffer_loader.h>
|
||||
#include <torch/csrc/jit/mobile/import.h>
|
||||
#include <torch/csrc/jit/mobile/interpreter.h>
|
||||
#include <torch/csrc/jit/mobile/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/module.h>
|
||||
#include <torch/csrc/jit/mobile/parse_bytecode.h>
|
||||
#include <torch/csrc/jit/mobile/parse_operators.h>
|
||||
#include <torch/csrc/jit/mobile/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/serialization/export.h>
|
||||
#include <torch/csrc/jit/serialization/export_bytecode.h>
|
||||
#include <torch/csrc/jit/serialization/flatbuffer_serializer.h>
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
#include <torch/csrc/autograd/generated/variable_factories.h>
|
||||
#include <torch/csrc/jit/api/module.h>
|
||||
#include <torch/csrc/jit/frontend/resolver.h>
|
||||
#include <torch/csrc/jit/mobile/backport.h>
|
||||
#include <torch/csrc/jit/mobile/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/import.h>
|
||||
#include <torch/csrc/jit/mobile/interpreter.h>
|
||||
#include <torch/csrc/jit/mobile/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/module.h>
|
||||
#include <torch/csrc/jit/mobile/parse_bytecode.h>
|
||||
#include <torch/csrc/jit/mobile/parse_operators.h>
|
||||
#include <torch/csrc/jit/mobile/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/upgrader_mobile.h>
|
||||
#include <torch/csrc/jit/serialization/export.h>
|
||||
#include <torch/csrc/jit/serialization/import.h>
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
#include <torch/csrc/autograd/generated/variable_factories.h>
|
||||
#include <torch/csrc/jit/api/module.h>
|
||||
#include <torch/csrc/jit/frontend/resolver.h>
|
||||
#include <torch/csrc/jit/mobile/backport.h>
|
||||
#include <torch/csrc/jit/mobile/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/import.h>
|
||||
#include <torch/csrc/jit/mobile/interpreter.h>
|
||||
#include <torch/csrc/jit/mobile/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/module.h>
|
||||
#include <torch/csrc/jit/mobile/parse_bytecode.h>
|
||||
#include <torch/csrc/jit/mobile/parse_operators.h>
|
||||
#include <torch/csrc/jit/mobile/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/serialization/export.h>
|
||||
#include <torch/csrc/jit/serialization/export_bytecode.h>
|
||||
#include <torch/csrc/jit/serialization/import.h>
|
||||
|
|
|
|||
|
|
@ -108,8 +108,8 @@ core_sources_common = [
|
|||
"torch/csrc/autograd/autograd_meta.cpp",
|
||||
"torch/csrc/autograd/forward_grad.cpp",
|
||||
"torch/csrc/jit/frontend/edit_distance.cpp",
|
||||
"torch/csrc/jit/mobile/compatibility/runtime_compatibility.cpp",
|
||||
"torch/csrc/jit/mobile/type_parser.cpp",
|
||||
"torch/csrc/jit/mobile/runtime_compatibility.cpp",
|
||||
"torch/csrc/jit/operator_upgraders/version_map.cpp",
|
||||
"torch/csrc/jit/operator_upgraders/upgraders_guard.cpp",
|
||||
"torch/csrc/jit/runtime/instruction.cpp",
|
||||
|
|
@ -529,10 +529,10 @@ torch_mobile_core = [
|
|||
# This should not be needed eventually.
|
||||
# TODO: Remove this dependency
|
||||
"torch/csrc/jit/backends/backend_debug_info.cpp",
|
||||
"torch/csrc/jit/mobile/compatibility/model_compatibility.cpp",
|
||||
"torch/csrc/jit/mobile/function.cpp",
|
||||
"torch/csrc/jit/mobile/import.cpp",
|
||||
"torch/csrc/jit/mobile/interpreter.cpp",
|
||||
"torch/csrc/jit/mobile/model_compatibility.cpp",
|
||||
"torch/csrc/jit/mobile/module.cpp",
|
||||
"torch/csrc/jit/mobile/observer.cpp",
|
||||
"torch/csrc/jit/mobile/parse_bytecode.cpp",
|
||||
|
|
@ -571,8 +571,9 @@ libtorch_extra_sources = libtorch_core_jit_sources + [
|
|||
"torch/csrc/autograd/FunctionsManual.cpp",
|
||||
"torch/csrc/jit/api/module_save.cpp",
|
||||
"torch/csrc/jit/codegen/fuser/cpu/fused_kernel.cpp",
|
||||
"torch/csrc/jit/mobile/backport.cpp",
|
||||
"torch/csrc/jit/mobile/backport_manager.cpp",
|
||||
"torch/csrc/jit/mobile/compatibility/backport.cpp",
|
||||
"torch/csrc/jit/mobile/compatibility/backport_manager.cpp",
|
||||
"torch/csrc/jit/mobile/compatibility/model_compatibility.cpp",
|
||||
# To be included for eager symbolication in lite interpreter
|
||||
# when it is built in libtorch
|
||||
"torch/csrc/jit/mobile/debug_info.cpp",
|
||||
|
|
@ -580,7 +581,6 @@ libtorch_extra_sources = libtorch_core_jit_sources + [
|
|||
"torch/csrc/jit/mobile/import.cpp",
|
||||
"torch/csrc/jit/mobile/import_data.cpp",
|
||||
"torch/csrc/jit/mobile/interpreter.cpp",
|
||||
"torch/csrc/jit/mobile/model_compatibility.cpp",
|
||||
"torch/csrc/jit/mobile/module.cpp",
|
||||
"torch/csrc/jit/mobile/observer.cpp",
|
||||
"torch/csrc/jit/mobile/parse_bytecode.cpp",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#include <ATen/core/ivalue.h>
|
||||
#include <caffe2/serialize/file_adapter.h>
|
||||
#include <caffe2/serialize/inline_container.h>
|
||||
#include <torch/csrc/jit/mobile/backport.h>
|
||||
#include <torch/csrc/jit/mobile/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/model_compatibility.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
|
@ -2,9 +2,9 @@
|
|||
#include <c10/util/Exception.h>
|
||||
#include <caffe2/serialize/file_adapter.h>
|
||||
#include <caffe2/serialize/inline_container.h>
|
||||
#include <torch/csrc/jit/mobile/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport_manager.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/import.h>
|
||||
#include <torch/csrc/jit/mobile/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/module.h>
|
||||
#include <torch/csrc/jit/serialization/export.h>
|
||||
#include <torch/csrc/jit/serialization/import.h>
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
#include <caffe2/serialize/file_adapter.h>
|
||||
#include <caffe2/serialize/inline_container.h>
|
||||
#include <torch/csrc/jit/api/compilation_unit.h> // removed after using simple type_resolver/obj_loader
|
||||
#include <torch/csrc/jit/mobile/compatibility/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/import.h> // removed after using simple type_resolver/obj_loader
|
||||
#include <torch/csrc/jit/mobile/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/type_parser.h>
|
||||
#include <torch/csrc/jit/serialization/import_export_constants.h>
|
||||
#include <torch/csrc/jit/serialization/import_read.h>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <c10/macros/Export.h>
|
||||
#include <torch/csrc/jit/mobile/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/runtime_compatibility.h>
|
||||
|
||||
#include <istream>
|
||||
#include <memory>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#include <ATen/core/dispatch/Dispatcher.h>
|
||||
#include <ATen/core/type_factory.h>
|
||||
#include <caffe2/serialize/inline_container.h>
|
||||
#include <torch/csrc/jit/mobile/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/type_parser.h>
|
||||
#include <torch/csrc/jit/runtime/operator.h>
|
||||
#include <torch/custom_class.h>
|
||||
|
|
@ -4,13 +4,13 @@
|
|||
#include <c10/core/ScalarType.h>
|
||||
#include <c10/util/Exception.h>
|
||||
#include <torch/csrc/autograd/grad_mode.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/model_tracer/KernelDTypeTracer.h>
|
||||
#include <torch/csrc/jit/mobile/model_tracer/MobileModelRunner.h>
|
||||
#include <torch/csrc/jit/mobile/model_tracer/OperatorCallTracer.h>
|
||||
#include <torch/csrc/jit/mobile/model_tracer/TensorUtils.h>
|
||||
#include <torch/csrc/jit/mobile/model_tracer/TracerRunner.h>
|
||||
#include <torch/csrc/jit/mobile/parse_operators.h>
|
||||
#include <torch/csrc/jit/mobile/runtime_compatibility.h>
|
||||
#include <torch/csrc/jit/runtime/operator.h>
|
||||
#include <torch/script.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
#include <ATen/core/type_factory.h>
|
||||
#include <c10/util/string_view.h>
|
||||
#include <torch/csrc/jit/frontend/parser_constants.h>
|
||||
#include <torch/csrc/jit/mobile/runtime_compatibility.h>
|
||||
#include <torch/custom_class.h>
|
||||
|
||||
using torch::jit::valid_single_char_tokens;
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@
|
|||
#include <torch/csrc/jit/api/module.h>
|
||||
#include <torch/csrc/jit/frontend/ir_emitter.h>
|
||||
#include <torch/csrc/jit/frontend/sugared_value.h>
|
||||
#include <torch/csrc/jit/mobile/backport.h>
|
||||
#include <torch/csrc/jit/mobile/code.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/backport.h>
|
||||
#include <torch/csrc/jit/mobile/compatibility/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/import.h>
|
||||
#include <torch/csrc/jit/mobile/model_compatibility.h>
|
||||
#include <torch/csrc/jit/mobile/module.h>
|
||||
#include <torch/csrc/jit/operator_upgraders/upgraders.h>
|
||||
#include <torch/csrc/jit/operator_upgraders/upgraders_guard.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user