support onnx export of 2GB models

microsoft · Mar 14, 2019 · 4765f69 · Jenn90 · Jul 9, 2023 · 4765f69
1 parent 22ded46
commit 4765f69
Show file tree

Hide file tree

Showing 27 changed files with 2,175 additions and 449 deletions.
diff --git a/Documentation/current_iteration.md b/Documentation/current_iteration.md
@@ -3,6 +3,7 @@
 ## Highlights of this release
 * Moved to CUDA 10 for both Windows and Linux.
 * Support advance RNN loop in ONNX export.
+* Export larger than 2GB models in ONNX format.
 
 ## CNTK support for CUDA 10
 

diff --git a/Makefile b/Makefile
@@ -99,6 +99,7 @@ ONNX_REPO_PATH:=$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnx_repo
 ONNX_REPO_PATH+=$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnx_repo/onnx
 ONNX_REPO_PATH+=$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime
 ONNX_REPO_PATH+=$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/include/onnxruntime
+ONNX_REPO_PATH+=$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/patch/onnxruntime/platform_specifics/linux
 INCLUDEPATH:= $(addprefix $(SOURCEDIR)/, Common/Include CNTKv2LibraryDll CNTKv2LibraryDll/API CNTKv2LibraryDll/API/Internals CNTKv2LibraryDll/Generated/Linux CNTKv2LibraryDll/proto ../Examples/Extensibility/CPP Math CNTK ActionsLib ComputationNetworkLib SGDLib SequenceTrainingLib CNTK/BrainScript Readers/ReaderLib PerformanceProfilerDll)
 INCLUDEPATH+=$(PROTOBUF_PATH)/include
 INCLUDEPATH+=$(GSL_PATH)/include
@@ -535,7 +536,20 @@ CNTKLIBRARY_COMMON_SRC =\
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/common/logging/logging.cc \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/common/profiler.cc \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/common/status.cc \
-	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/tensorutils.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/common/str_helper.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/allocator.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/data_types.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/environment.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/error_code.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/onnxruntime_typeinfo.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/tensor.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/tensorprotoutils.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/tensor_external_data_info.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/tensor_shape.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/framework/tensor_type_and_shape.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/graph/contrib_ops/attn_lstm_schema_defs.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/graph/contrib_ops/contrib_defs.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/graph/contrib_ops/range_schema_defs.cc \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/graph/function.cc \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/graph/graph.cc \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/graph/graph_viewer.cc \
@@ -548,6 +562,9 @@ CNTKLIBRARY_COMMON_SRC =\
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/platform/posix/env_time.cc \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/platform/posix/stacktrace.cc \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnxruntime/onnxruntime/core/platform/posix/ort_mutex.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/patch/onnxruntime/core/common/logging/ostream_sink.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/patch/onnxruntime/core/session/onnxruntime_c_api.cc \
+	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/patch/onnxruntime/core/framework/path_lib.cc \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnx_repo/onnx/checker.cpp \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnx_repo/onnx/common/assertions.cc \
 	$(SOURCEDIR)/CNTKv2LibraryDll/proto/onnx/onnx_repo/onnx/common/model_helpers.cc \

diff --git a/Source/CNTKv2LibraryDll/API/CNTKLibrary.h b/Source/CNTKv2LibraryDll/API/CNTKLibrary.h
@@ -3559,6 +3559,19 @@ namespace CNTK
             return foundFunction;
         }
 
+        //FunctionPtr FindByUid(const std::wstring& uid, bool nestedSearchInsideBlockFunction = false)
+        //{
+        //    FunctionPtr  foundFunction = nullptr;
+        //    PreorderTraverseFunctions(RootFunction(), [&foundFunction, &uid, this](const FunctionPtr& function) {
+        //        if (uid.compare(function->Uid()) == 0)
+        //        { 
+        //            foundFunction = function;
+        //        }
+        //    }, nestedSearchInsideBlockFunction);
+
+        //    return foundFunction;
+        //}
+
         ///
         /// Find a list of functions with the given name in the Function graph underlying 'this' Function.
         /// If nestedSearchInsideBlockFunction is true, all functions inside block functions are also searched for the given name.
@@ -3595,7 +3608,8 @@ namespace CNTK
         ///
         /// Save this Function graph into a model file.
         ///
-        CNTK_API void Save(const std::wstring& filepath, ModelFormat format = ModelFormat::CNTKv2);
+        CNTK_API void Save(const std::wstring& filepath, ModelFormat format = ModelFormat::CNTKv2,
+            bool useExternalFilesToStoreParameters = false);
 
         ///
         /// Restore the models parameters (in-place) from a model file

diff --git a/Source/CNTKv2LibraryDll/CNTKv2LibraryDll.vcxproj b/Source/CNTKv2LibraryDll/CNTKv2LibraryDll.vcxproj
@@ -66,7 +66,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>.\proto\onnx;.\proto\onnx\onnxruntime\onnxruntime;.\proto\onnx\onnxruntime\include\onnxruntime;.\proto\onnx\onnx_repo;.\proto\onnx\onnx_repo\onnx;.\API;.\API\Internals;.\proto;$(BOOST_INCLUDE_PATH);$(SolutionDir)\Source\CNTKv2LibraryDll;$(SolutionDir)Source\SGDLib;$(SolutionDir)Source\Readers\ReaderLib;$(SolutionDir)Source\ComputationNetworkLib;$(SolutionDir)Source\SequenceTrainingLib;$(SolutionDir)Source\Math;$(SolutionDir)Source\Common\Include;$(SolutionDir)Source\CNTK\BrainScript;$(SolutionDir)Source\ActionsLib;$(MSMPI_INC);$(NvmlInclude);$(ProtobufInclude);$(SolutionDir)Source\PerformanceProfilerDll;..\..\external\gsl\include;$(ProjectDir)Generated\Windows</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\proto\onnx;.\proto\onnx\onnxruntime\onnxruntime;.\proto\onnx\patch\onnxruntime\platform_specifics\windows;.\proto\onnx\onnxruntime\include\onnxruntime;.\proto\onnx\onnx_repo;.\proto\onnx\onnx_repo\onnx;.\API;.\API\Internals;.\proto;$(BOOST_INCLUDE_PATH);$(SolutionDir)\Source\CNTKv2LibraryDll;$(SolutionDir)Source\SGDLib;$(SolutionDir)Source\Readers\ReaderLib;$(SolutionDir)Source\ComputationNetworkLib;$(SolutionDir)Source\SequenceTrainingLib;$(SolutionDir)Source\Math;$(SolutionDir)Source\Common\Include;$(SolutionDir)Source\CNTK\BrainScript;$(SolutionDir)Source\ActionsLib;$(MSMPI_INC);$(NvmlInclude);$(ProtobufInclude);$(SolutionDir)Source\PerformanceProfilerDll;..\..\external\gsl\include;$(ProjectDir)Generated\Windows</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'!$(IsUWP)'">$(SolutionDir)Source\1BitSGD;$(ProjectDir)Generated\Windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'!$(IsUWP)'">CNTK_PARALLEL_TRAINING_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <OpenMPSupport>true</OpenMPSupport>
@@ -84,7 +84,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>ONNX_NAMESPACE=onnx;ONNX_ML=1;ONNX_V1_OPSCHEMA_COMPAT;CNTKV2LIBRARYDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;PLATFORM_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ONNX_NAMESPACE=onnx;ONNX_ML=1;ONNX_V1_OPSCHEMA_COMPAT;CNTKV2LIBRARYDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;PLATFORM_WINDOWS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <TreatWarningAsError>true</TreatWarningAsError>
       <DisableSpecificWarnings>4800;4610;4512;4510;4267;4127;4125;4100;4456;4189;4996;4503;4146</DisableSpecificWarnings>
@@ -101,7 +101,7 @@
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>ONNX_NAMESPACE=onnx;ONNX_ML=1;ONNX_V1_OPSCHEMA_COMPAT;CNTKV2LIBRARYDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;PLATFORM_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ONNX_NAMESPACE=onnx;ONNX_ML=1;ONNX_V1_OPSCHEMA_COMPAT;CNTKV2LIBRARYDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;PLATFORM_WINDOWS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalOptions>/d2Zi+ /bigobj %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="$(CpuOnlyBuild)">
     <ClCompile>
-      <PreprocessorDefinitions>ONNX_NAMESPACE=onnx;ONNX_ML=1;ONNX_V1_OPSCHEMA_COMPAT;CPUONLY;PLATFORM_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ONNX_NAMESPACE=onnx;ONNX_ML=1;ONNX_V1_OPSCHEMA_COMPAT;CPUONLY;PLATFORM_WINDOWS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release_CpuOnly|x64'">$(IntDir)\$(ProjectName)\$(ConfigurationName)\%(RelativeDir)</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_CpuOnly|x64'">$(IntDir)\$(ProjectName)\$(ConfigurationName)\%(RelativeDir)</ObjectFileName>
     </ClCompile>
@@ -183,7 +183,6 @@
     <ClInclude Include="proto\onnx\onnx-operators-ml.pb.h" />
     <ClInclude Include="proto\onnx\onnxruntime\onnxruntime\core\common\profiler.h" />
     <ClInclude Include="proto\onnx\onnxruntime\onnxruntime\core\common\task_thread_pool.h" />
-    <ClInclude Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensorutils.h" />
     <ClInclude Include="proto\onnx\onnxruntime\onnxruntime\core\graph\function.h" />
     <ClInclude Include="proto\onnx\onnxruntime\onnxruntime\core\graph\function_container.h" />
     <ClInclude Include="proto\onnx\onnxruntime\onnxruntime\core\graph\function_impl.h" />
@@ -275,7 +274,20 @@
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\common\logging\logging.cc" />
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\common\profiler.cc" />
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\common\status.cc" />
-    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensorutils.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\common\str_helper.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\allocator.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\data_types.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\environment.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\error_code.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\onnxruntime_typeinfo.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensor.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensorprotoutils.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensor_external_data_info.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensor_shape.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensor_type_and_shape.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\contrib_ops\attn_lstm_schema_defs.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\contrib_ops\contrib_defs.cc" />
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\contrib_ops\range_schema_defs.cc" />
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\function.cc" />
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\graph.cc" />
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\graph_viewer.cc" />
@@ -284,6 +296,8 @@
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\schema_registry.cc" />
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\platform\env.cc" />
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\platform\env_time.cc" />
+    <ClCompile Include="proto\onnx\patch\onnxruntime\core\common\logging\ostream_sink.cc" />
+    <ClCompile Include="proto\onnx\patch\onnxruntime\core\framework\path_lib.cc" />
     <ClCompile Include="proto\onnx\patch\onnxruntime\core\platform\windows\env.cc" />
     <ClCompile Include="proto\onnx\patch\onnxruntime\core\platform\windows\env_time.cc" />
     <ClCompile Include="proto\onnx\patch\onnxruntime\core\platform\windows\stacktrace.cc" />
@@ -319,6 +333,7 @@
     <ClCompile Include="proto\onnx\onnx_repo\onnx\defs\traditionalml\old.cc" />
     <ClCompile Include="proto\onnx\onnx_repo\onnx\shape_inference\implementation.cc" />
     <ClCompile Include="proto\onnx\Operators.cpp" />
+    <ClCompile Include="proto\onnx\patch\onnxruntime\core\session\onnxruntime_c_api.cc" />
     <ClCompile Include="proto\onnx\RNNHelper.cpp" />
     <ClCompile Include="Serialization.cpp" />
     <ClCompile Include="stdafx.cpp">

diff --git a/Source/CNTKv2LibraryDll/CNTKv2LibraryDll.vcxproj.filters b/Source/CNTKv2LibraryDll/CNTKv2LibraryDll.vcxproj.filters
@@ -130,9 +130,6 @@
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\graph.cc">
       <Filter>proto\onnx\onnxruntime\graph</Filter>
     </ClCompile>
-    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\graph_transformer_mgr.cc">
-      <Filter>proto\onnx\onnxruntime\graph</Filter>
-    </ClCompile>
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\graph_viewer.cc">
       <Filter>proto\onnx\onnxruntime\graph</Filter>
     </ClCompile>
@@ -145,9 +142,6 @@
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\schema_registry.cc">
       <Filter>proto\onnx\onnxruntime\graph</Filter>
     </ClCompile>
-    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensorutils.cc">
-      <Filter>proto\onnx\onnxruntime\framework</Filter>
-    </ClCompile>
     <ClCompile Include="proto\onnx\CNTKToONNX.cpp">
       <Filter>proto\onnx</Filter>
     </ClCompile>
@@ -178,15 +172,70 @@
     <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\platform\env_time.cc">
       <Filter>proto\onnx\onnxruntime\platform</Filter>
     </ClCompile>
-    <ClCompile Include="proto\onnx\patch\onnxruntime\core\platform\windows\env.cc" />
-    <ClCompile Include="proto\onnx\patch\onnxruntime\core\platform\windows\env_time.cc" />
     <ClCompile Include="proto\onnx\patch\onnxruntime\core\platform\windows\stacktrace.cc" />
     <ClCompile Include="proto\onnx\onnx_repo\onnx\defs\controlflow\old.cc">
       <Filter>proto\onnx\onnx_repo\onnx\defs\controlflow</Filter>
     </ClCompile>
     <ClCompile Include="proto\onnx\onnx_repo\onnx\defs\traditionalml\old.cc">
       <Filter>proto\onnx\onnx_repo\onnx\defs\traditionalml</Filter>
     </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensorprotoutils.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\common\str_helper.cc">
+      <Filter>proto\onnx\onnxruntime\common</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\error_code.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensor_shape.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensor.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\data_types.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\allocator.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensor_type_and_shape.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\onnxruntime_typeinfo.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\patch\onnxruntime\core\platform\windows\env_time.cc">
+      <Filter>proto\onnx\patch</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\patch\onnxruntime\core\platform\windows\env.cc">
+      <Filter>proto\onnx\patch</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\patch\onnxruntime\core\common\logging\ostream_sink.cc">
+      <Filter>proto\onnx\patch</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\environment.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\contrib_ops\contrib_defs.cc">
+      <Filter>proto\onnx\onnxruntime\graph\contrib_ops</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\contrib_ops\attn_lstm_schema_defs.cc">
+      <Filter>proto\onnx\onnxruntime\graph\contrib_ops</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\graph\contrib_ops\range_schema_defs.cc">
+      <Filter>proto\onnx\onnxruntime\graph\contrib_ops</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\patch\onnxruntime\core\session\onnxruntime_c_api.cc">
+      <Filter>proto\onnx\patch</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensor_external_data_info.cc">
+      <Filter>proto\onnx\onnxruntime\framework</Filter>
+    </ClCompile>
+    <ClCompile Include="proto\onnx\patch\onnxruntime\core\framework\path_lib.cc">
+      <Filter>proto\onnx\patch</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
@@ -379,9 +428,6 @@
     <ClInclude Include="proto\onnx\onnxruntime\onnxruntime\core\common\profiler.h">
       <Filter>proto\onnx\onnxruntime\common</Filter>
     </ClInclude>
-    <ClInclude Include="proto\onnx\onnxruntime\onnxruntime\core\framework\tensorutils.h">
-      <Filter>proto\onnx\onnxruntime\framework</Filter>
-    </ClInclude>
     <ClInclude Include="proto\onnx\onnxruntime\onnxruntime\core\inc\op_kernel_author_helper.h">
       <Filter>proto\onnx\onnxruntime\inc</Filter>
     </ClInclude>
@@ -516,6 +562,15 @@
     <Filter Include="proto\onnx\onnxruntime\platform\windows">
       <UniqueIdentifier>{681310a9-13d1-4e99-87ea-4b342d35901e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="proto\onnx\onnxruntime\session">
+      <UniqueIdentifier>{d0a338b2-3b7a-49ef-a6ca-35c54ed27721}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="proto\onnx\patch">
+      <UniqueIdentifier>{8e0079c2-b575-45af-8694-4f4bf25b4ab4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="proto\onnx\onnxruntime\graph\contrib_ops">
+      <UniqueIdentifier>{542e5292-b201-4f16-a397-6bf97b5e6c71}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Proto Include="tensorboard\tensorboard.proto">