fix_test (#393)

Author: fangfangssj

graph_net/test/decomposer_validator_test.sh

@@ -13,18 +13,22 @@ cp -r "$GRAPH_NET_ROOT/../samples/$MODEL_PATH_IN_SAMPLES" "$OUTPUT_DIR/"
 
 extractor_config_json_str=$(cat <<EOF
 {
-    "custom_extractor_path": "$GRAPH_NET_ROOT/torch/naive_graph_decomposer.py",
-    "custom_extractor_config": {
-        "output_dir": "$OUTPUT_DIR/${MODEL_NAME}_decomposed",
-        "split_positions": [8, 16, 32],
-        "group_head_and_tail": true,
-        "chain_style": true
+    "decorator_path": "$GRAPH_NET_ROOT/torch/extractor.py",
+    "decorator_config": {
+        "name": "$MODEL_NAME",
+        "custom_extractor_path": "$GRAPH_NET_ROOT/torch/naive_graph_decomposer.py",
+        "custom_extractor_config": {
+            "output_dir": "$OUTPUT_DIR/${MODEL_NAME}_decomposed",
+            "split_positions": [8, 16, 32],
+            "group_head_and_tail": true,
+            "chain_style": true
+        }
     }
 }
 EOF
 )
 EXTRACTOR_CONFIG=$(echo $extractor_config_json_str | base64 -w 0)
-python3 -m graph_net.torch.single_device_runner --model-path $GRAPH_NET_ROOT/../samples/$MODEL_PATH_IN_SAMPLES --enable-extract True --extract-name $MODEL_NAME --dump-graph-hash-key --extractor-config=$EXTRACTOR_CONFIG
+python3 -m graph_net.torch.run_model --model-path $GRAPH_NET_ROOT/../samples/$MODEL_PATH_IN_SAMPLES --decorator-config=$EXTRACTOR_CONFIG
 
 FILE_PATH=$GRAPH_NET_DECOMPOSE_PATH/decomposer
 mkdir -p "$(dirname "$FILE_PATH/log.log")"
@@ -35,13 +39,9 @@ python -m graph_net.torch.test_compiler \
     --compiler range_decomposer_validator \
     --device cuda > "$FILE_PATH/log.log" 2>&1
 
-python -m graph_net.log2json \
-    --log-file "$FILE_PATH/log.log" \
-    --output-dir "$FILE_PATH/JSON_results/"
-
-python -m graph_net.plot_ESt \
-    --benchmark-path "$FILE_PATH/JSON_results/" \
-    --output-dir "$FILE_PATH"
+python3 -m graph_net.plot_ESt \
+  --benchmark-path $FILE_PATH/log.log \
+  --output-dir $FILE_PATH \
 
 echo "=================================================="
 echo "Results saved in: $FILE_PATH/ES_result.png"