Merge pull request #2 from yangxinyu7427/ddding-z-ReTree

Ddding z re tree

Author: yangxinyu7427

Diff for: .gitignore

@@ -82,3 +82,7 @@ compile_commands.json
 .mypy_cache
 virtualenv
 venv
+
+examples/model4test
+build.sh
+run.sh

Diff for: CMakeLists.txt

@@ -85,6 +85,9 @@ target_link_libraries(predicate_example optimize_c_api)
 onnxopt_add_executable(redundant_example examples/optimizer_c_example/redundant.cpp)
 target_link_libraries(redundant_example optimize_c_api)
 
+onnxopt_add_executable(optimize_dt_example examples/optimizer_c_example/optimize_dt_example.cpp)
+target_link_libraries(optimize_dt_example optimize_c_api)
+
 #configure_file(onnxoptimizer/value_info/int_value_info.onnx
 #        ${CMAKE_BINARY_DIR}/int_value_info.onnx COPYONLY)
 #if(BUILD_ONNX_PYTHON)

Diff for: build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# 删除旧的 build 目录
+rm -rf build
+
+# 创建新的 build 目录并配置 Debug 构建
+cmake -B build -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+
+# 构建项目，Debug 模式，先清理再并行编译
+cmake --build build --config Debug --clean-first --parallel 10

Diff for: examples/model4test/clf2regtest.onnx

@@ -0,0 +1,29 @@
+//
+// Created by xyyang on 23-11-14.
+//
+//#include <onnxoptimizer/model_util.h>
+
+#include <string>
+#include <vector>
+#include <iostream>
+#include "onnxoptimizer/optimize_c_api/optimize_c_api.h"
+
+// 1: ==, 2: <, 3: <=, 4: >, 5: >= 
+int main(int argc, char* argv[]) {
+  std::string path1 = "../examples/onnx_input_model/titanic_pipeline.onnx";
+  std::string path2 = "../examples/onnx_input_model/iris_dataset_pipeline.onnx";
+  std::string path3 = "/home/ding/duckdb_project/onnx_optimizer_C/examples/onnx_input_model/house_16H_d10_l281_n561_20240922063836.onnx";
+  std::string testmodelpath = "/home/ding/duckdb_project/onnx_optimizer_C/examples/model4test/convert_test.onnx";
+  std::string testmodelpath1 = "/home/ding/duckdb_project/onnx_optimizer_C/examples/model4test/clf2regtest.onnx";
+  std::string testmodelpath2 = "/home/ding/duckdb_project/onnx_optimizer_C/examples/model4test/wine_quality_d11_l280_n559_20241209164224_with_zipmap.onnx";
+  std::string testmodelpath3 = "/home/ding/duckdb_project/onnx_optimizer_C/examples/model4test/wine_quality_d11_l280_n559_20241209164224.onnx";
+  // ?
+  // std::vector<std::string> features = {};
+  // std::string path3 = "../examples/onnx_input_model/house_16H_d10_l281_n561_20240922063836.onnx";
+  // optimize_on_decision_tree_predicate(path1, 2, 10);
+  // optimize_on_decision_tree_predicate(path2, 2, 10);
+  // std::cout << optimize_on_decision_tree_predicate(path3, 4, 10, &features) << std::endl;
+  std::cout << optimize_on_decision_tree_predicate(testmodelpath3, 1, 1) << std::endl;
+  // std::cout << optimize_on_decision_tree_predicate(testmodelpath, 1, 1) << std::endl;
+  return 0;
+}

Diff for: examples/model4test/convert_test.onnx

@@ -6,6 +6,7 @@
 
 #include "optimize_c_api.h"
 //#include "onnxoptimizer/query_c_api/model_merge.cpp"
+#include "onnxoptimizer/query_c_api/decision_tree_predicate.cpp"
 #include "onnxoptimizer/query_c_api/predicate_push_down.cpp"
 #include "onnxoptimizer/query_c_api/redundant_calculation_detection.cpp"
 
@@ -52,3 +53,26 @@ void change_models(std::string& changed_model_path,std::string& output_model_pat
 void add_prefix_on_model(std::string& changed_model_path, std::string& output_model_path, std::string& prefix){
     onnx::optimization::add_prefix_on_model(changed_model_path, output_model_path, prefix);
 }
+
+/// @brief 
+/// @param input_model_path 
+/// @param comparison_operator 1: ==, 2: <, 3: <=, 4: >, 5: >= 
+/// @param threshold 
+/// @param features
+/// @return optimized-model path
+std::string optimize_on_decision_tree_predicate(std::string& input_model_path, uint8_t comparison_operator,
+                float threshold) {
+    std::string mp1 = onnx::optimization::DTConvertRule::match(input_model_path);
+	std::string mp2 = onnx::optimization::DTPruneRule::match(mp1, comparison_operator, threshold);
+	return onnx::optimization::DTMergeRule::match(mp2);
+
+	// std::string mp1 = onnx::optimization::DTPruneRule::match(input_model_path, comparison_operator, threshold);
+	// return onnx::optimization::DTMergeRule::match(mp1);
+	// return onnx::optimization::DTMergeRule::match(mp3);
+    // return onnx::optimization::DTConvertRule::match(input_model_path);
+    // return onnx::optimization::DTPruneRule::match(input_model_path, comparison_operator, threshold);
+
+    // return onnx::optimization::DTConvertRule::match(input_model_path);
+}
+
+// -----------------------

Diff for: examples/model4test/convert_test_reg.onnx

@@ -33,5 +33,9 @@ void change_models(std::string& changed_model_path,std::string& output_model_pat
                 std::string& changed_input_model_path,
                 const std::vector<std::string>& output_name);
 void add_prefix_on_model(std::string& changed_model_path, std::string& output_model_path, std::string& prefix);
+
+//--------------------------
+std::string optimize_on_decision_tree_predicate(std::string& input_model_path, uint8_t comparison_operator, float threshold);
+
 #endif  // ONNX_OPTIMIZER_OPTIMIZE_C_API_H