From 3d68a2d6de832f0b35d11ea4ad569366a89a0c8b Mon Sep 17 00:00:00 2001 From: Lu Fang Date: Mon, 25 Feb 2019 07:57:21 -0800 Subject: [PATCH] Add foxi submodule (ONNXIFI facebook extension) Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/17178 Reviewed By: yinghai Differential Revision: D14197987 Pulled By: houseroad fbshipit-source-id: c21d7235e40c2ca4925a10c467c2b4da2f1024ad --- caffe2/onnx/onnxifi_graph_info.h | 2 +- caffe2/onnx/onnxifi_init.h | 2 +- cmake/Dependencies.cmake | 4 +++- third_party/foxi | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/caffe2/onnx/onnxifi_graph_info.h b/caffe2/onnx/onnxifi_graph_info.h index 29fa4d0..00cc85f 100644 --- a/caffe2/onnx/onnxifi_graph_info.h +++ b/caffe2/onnx/onnxifi_graph_info.h @@ -6,7 +6,7 @@ #include #include "caffe2/core/logging.h" -#include "onnx/onnxifi_loader.h" +#include "foxi/onnxifi_loader.h" namespace caffe2 { namespace onnx { diff --git a/caffe2/onnx/onnxifi_init.h b/caffe2/onnx/onnxifi_init.h index 02fbe94..26ae914 100644 --- a/caffe2/onnx/onnxifi_init.h +++ b/caffe2/onnx/onnxifi_init.h @@ -1,6 +1,6 @@ #pragma once -#include "onnx/onnxifi_loader.h" +#include "foxi/onnxifi_loader.h" namespace caffe2 { namespace onnx { diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index d4fd02f..1f1054d 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -1046,8 +1046,10 @@ if (CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO) # Add op schemas in "ai.onnx.pytorch" domain add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../caffe2/onnx/torch_ops") add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx) + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi) include_directories(${ONNX_INCLUDE_DIRS}) + include_directories(${FOXI_INCLUDE_DIRS}) add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) # In mobile build we care about code size, and so we need drop # everything (e.g. checker, optimizer) in onnx but the pb definition. @@ -1057,7 +1059,7 @@ if (CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO) caffe2_interface_library(onnx onnx_library) endif() list(APPEND Caffe2_DEPENDENCY_WHOLE_LINK_LIBS onnx_library) - list(APPEND Caffe2_DEPENDENCY_LIBS onnxifi_loader) + list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader) # Recover the build shared libs option. set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS}) endif() diff --git a/third_party/foxi b/third_party/foxi index 58cbf0e..520e8e1 160000 --- a/third_party/foxi +++ b/third_party/foxi @@ -1 +1 @@ -Subproject commit 58cbf0ee1310fc42df6e8e244db023d4da052e4d +Subproject commit 520e8e135f1ad75959bf9b5bd15c361b8caeb8d6 -- 2.7.4