放弃支持pt

scarsty · Jul 7, 2022 · 8aedfc2 · 8aedfc2
1 parent 4ebce57
commit 8aedfc2
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 57 deletions.
diff --git a/nn-editor/nodeloader.cpp → nn-editor/FileLoader.cpp b/nn-editor/nodeloader.cpp → nn-editor/FileLoader.cpp
@@ -1,4 +1,4 @@
-#include "nodeloader.h"
+#include "FileLoader.h"
 
 #include <algorithm>
 
@@ -8,15 +8,14 @@
 #include "ccccloader.h"
 #include "yamlyololoader.h"
 #include "ncnnloader.h"
-#include "onnxloader.h"
-#include "ptLoader.h"
+#include "onnxLoader.h"
 
 #define M_PI 3.14159265358979323846
 extern "C"
 {
 #include "sfg.h"
 }
-NodeLoader* create_loader(const std::string& filename, int index)
+FileLoader* create_loader(const std::string& filename, int index)
 {
     if (index > 0)
     {
@@ -52,13 +51,9 @@ NodeLoader* create_loader(const std::string& filename, int index)
     }
     if (ext == "onnx")
     {
-        return new onnxloader();
+        return new onnxLoader();
     }
-    if (ext == "pt")
-    {
-        return new ptLoader();
-    }
-    return new ccccLoader();
+    return new FileLoader();
 }
 
 const char* file_filter()
@@ -70,7 +65,7 @@ const char* file_filter()
 }
 
 
-void NodeLoader::calPosition(std::deque<Node>& nodes)
+void FileLoader::calPosition(std::deque<Node>& nodes)
 {
     auto status = sfg_init();
 
@@ -204,7 +199,7 @@ void NodeLoader::calPosition(std::deque<Node>& nodes)
 }
 
 //最后一个参数为假，仅计算是否存在连接，为真则是严格计算传导顺序
-void NodeLoader::push_cal_stack(Node* layer, int direct, std::vector<Node*>& stack, bool turn)
+void FileLoader::push_cal_stack(Node* layer, int direct, std::vector<Node*>& stack, bool turn)
 {
     //lambda函数：层是否已经在向量中
     auto contains = [](std::vector<Node*>& v, Node* l) -> bool

diff --git a/nn-editor/nodeloader.h → nn-editor/FileLoader.h b/nn-editor/nodeloader.h → nn-editor/FileLoader.h
@@ -3,10 +3,10 @@
 
 //实现此接口即可支持不同格式
 //还没设计完
-class NodeLoader
+class FileLoader
 {
 public:
-    virtual ~NodeLoader() = default;
+    virtual ~FileLoader() = default;
     virtual void fileToNodes(const std::string& filename, std::deque<Node>& nodes) {}
     virtual void nodesToFile(const std::deque<Node>& nodes, const std::string& filename) {}
     //virtual std::vector<std::string> efftiveKeys(const std::string& type) { return { "" }; }
@@ -21,5 +21,5 @@ class NodeLoader
     }
 };
 
-NodeLoader* create_loader(const std::string& filename, int filter_index = -1);
+FileLoader* create_loader(const std::string& filename, int filter_index = -1);
 const char* file_filter();
diff --git a/nn-editor/ccccloader.h b/nn-editor/ccccloader.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "nodeloader.h"
+#include "FileLoader.h"
 
-class ccccLoader : public NodeLoader
+class ccccLoader : public FileLoader
 {
 public:
     virtual void fileToNodes(const std::string& filename, std::deque<Node>& nodes) override;

diff --git a/nn-editor/ncnnloader.h b/nn-editor/ncnnloader.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "nodeloader.h"
+#include "FileLoader.h"
 
-class ncnnLoader : public NodeLoader
+class ncnnLoader : public FileLoader
 {
 public:
     ncnnLoader();

diff --git a/nn-editor/nn-editor.vcxproj b/nn-editor/nn-editor.vcxproj
@@ -33,20 +33,18 @@
     <ClCompile Include="..\imnodes2\imnodes.cpp" />
     <ClCompile Include="ccccloader.cpp" />
     <ClCompile Include="nn_editor.cpp" />
-    <ClCompile Include="nodeloader.cpp" />
+    <ClCompile Include="FileLoader.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="ncnnloader.cpp" />
-    <ClCompile Include="onnxloader.cpp" />
-    <ClCompile Include="ptLoader.cpp" />
+    <ClCompile Include="onnxLoader.cpp" />
     <ClCompile Include="yamlyololoader.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ccccloader.h" />
-    <ClInclude Include="nodeloader.h" />
+    <ClInclude Include="FileLoader.h" />
     <ClInclude Include="ncnnloader.h" />
     <ClInclude Include="node.h" />
-    <ClInclude Include="onnxloader.h" />
-    <ClInclude Include="ptLoader.h" />
+    <ClInclude Include="onnxLoader.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="yamlyololoader.h" />
   </ItemGroup>
@@ -181,7 +179,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>D:\project\microsoft\vcpkg\installed\x64-windows\lib\manual-link;D:\project\nn-editor\3rdparty\libtorch\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>sdl2main.lib;OpenGL32.lib;torch.lib;c10.lib;torch_cpu.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sdl2main.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <Profile>true</Profile>
     </Link>
   </ItemDefinitionGroup>

diff --git a/nn-editor/nn-editor.vcxproj.filters b/nn-editor/nn-editor.vcxproj.filters
@@ -54,7 +54,7 @@
     <ClCompile Include="..\3rdparty\imgui\backends\imgui_impl_opengl3.cpp">
       <Filter>imgui</Filter>
     </ClCompile>
-    <ClCompile Include="nodeloader.cpp">
+    <ClCompile Include="FileLoader.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
     <ClCompile Include="ncnnloader.cpp">
@@ -72,15 +72,12 @@
     <ClCompile Include="..\3rdparty\singlefilegraph\sfg.c">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="ptLoader.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="onnxloader.cpp">
+    <ClCompile Include="onnxLoader.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="nodeloader.h">
+    <ClInclude Include="FileLoader.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="yamlyololoader.h">
@@ -98,10 +95,7 @@
     <ClInclude Include="resource.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="ptLoader.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="onnxloader.h">
+    <ClInclude Include="onnxLoader.h">
       <Filter>头文件</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/nn-editor/nn_editor.cpp b/nn-editor/nn_editor.cpp
@@ -18,7 +18,7 @@
 #include "convert.h"
 #include "File.h"
 
-#include "nodeloader.h"
+#include "FileLoader.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -46,7 +46,7 @@ class ColorNodeEditor
         Link(int f, int t) { from = f; to = t; }
     };
 
-    NodeLoader* loader_ = nullptr;
+    FileLoader* loader_ = nullptr;
     std::deque<Node> nodes_;    //在一次编辑期间,只可增不可减
     std::vector<Link> links_;
     int root_node_id_;
@@ -278,7 +278,7 @@ class ColorNodeEditor
         }
     }
 
-    std::string openfile(const char* filter, NodeLoader** loader_ptr = nullptr)
+    std::string openfile(const char* filter, FileLoader** loader_ptr = nullptr)
     {
 #ifdef _WIN32
         need_dialog_ = 0;
@@ -963,7 +963,7 @@ void NodeEditorInitialize(int argc, char* argv[])
     {
         ex1::color_editor.setBeginFile(argv[1]);
     }
-    NodeLoader::mainPath() = File::getFilePath(argv[0]);
+    FileLoader::mainPath() = File::getFilePath(argv[0]);
 }
 
 void NodeEditorShow() { ex1::color_editor.show(); }

diff --git a/nn-editor/onnxloader.cpp b/nn-editor/onnxloader.cpp
@@ -1,4 +1,4 @@
-#include "onnxloader.h"
+#include "onnxLoader.h"
 
 
 #include <iostream>
@@ -553,7 +553,7 @@ int getLayerParams(const onnx::NodeProto& node_proto, std::string& params)
 }
 
 
-onnxloader::onnxloader()
+onnxLoader::onnxLoader()
 {
 //    YAML::Node node;
 //#ifdef __APPLE__
@@ -575,7 +575,7 @@ onnxloader::onnxloader()
 //    }
 }
 
-void onnxloader::fileToNodes(const std::string& filename, std::deque<Node>& nodes)
+void onnxLoader::fileToNodes(const std::string& filename, std::deque<Node>& nodes)
 {
 
     onnx::ModelProto model_proto;
@@ -745,12 +745,12 @@ void onnxloader::fileToNodes(const std::string& filename, std::deque<Node>& node
     calPosition(nodes);
 }
 
-void onnxloader::nodesToFile(const std::deque<Node>& nodes, const std::string& filename)
+void onnxLoader::nodesToFile(const std::deque<Node>& nodes, const std::string& filename)
 {
 
 }
 
-void onnxloader::refreshNodeValues(Node& node)
+void onnxLoader::refreshNodeValues(Node& node)
 {
 }
 
diff --git a/nn-editor/onnxloader.h b/nn-editor/onnxloader.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "nodeloader.h"
+#include "FileLoader.h"
 
-class onnxloader : public NodeLoader
+class onnxLoader : public FileLoader
 {
 public:
-    onnxloader();
+    onnxLoader();
     virtual void fileToNodes(const std::string& filename, std::deque<Node>& nodes) override;
     virtual void nodesToFile(const std::deque<Node>& nodes, const std::string& filename) override;
     //virtual std::vector<std::string> efftiveKeys(const std::string& type) override;

diff --git a/nn-editor/ptLoader.cpp b/nn-editor/ptLoader.cpp
@@ -8,14 +8,25 @@ ptLoader::ptLoader()
 
 void ptLoader::fileToNodes(const std::string& filename, std::deque<Node>& nodes)
 {
-    fmt1::print("{}", filename);
+    fmt1::print("{}\n", filename);
     torch::jit::Module mod = torch::jit::load(filename);
     mod.eval();
-
-    //     mod.dump(true, false, false);
-    //     mod.dump(true, true, true);
-
     auto g = mod.get_method("forward").graph();
+    int i = 0;
+    g->print(std::cout);
+    for (auto n:g->nodes())
+    {
+        //for (const auto& v : n->outputs())
+        //{
+        //    auto tensor_type = v->type()->cast<torch::jit::TensorType>();
+        //    if (!tensor_type)
+        //        continue;
+
+        //   fmt1::print("{}\n", v->debugName().c_str());
+
+        //}
+        //fmt1::print("{}{}\n",i++, );
+    }
 }
 
 void ptLoader::nodesToFile(const std::deque<Node>& nodes, const std::string& filename)

diff --git a/nn-editor/ptLoader.h b/nn-editor/ptLoader.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "nodeloader.h"
+#include "FileLoader.h"
 class ptLoader :
-    public NodeLoader
+    public FileLoader
 {
 public:
     ptLoader();

diff --git a/nn-editor/yamlyololoader.h b/nn-editor/yamlyololoader.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "nodeloader.h"
+#include "FileLoader.h"
 #include "yaml-cpp/yaml.h"
 #include <fstream>
 
 
-class yamlyoloLoader : public NodeLoader
+class yamlyoloLoader : public FileLoader
 {
     //YAML::Node config_;
 public: