Fix the model path in graph_variable_renamer_validator_backend.py (#449)

Author: TelGome

graph_net/test/graph_variable_rename_test.sh

@@ -1,48 +1,46 @@
 #!/bin/bash
 
-GRAPH_NET_ROOT=$(python3 -c "import graph_net; import os; print(
-os.path.dirname(graph_net.__file__))")
-WORKSPACE=/tmp/graph_variable_rename_workspace
+GRAPH_NET_ROOT=$(python3 -c "import graph_net; import os; print(os.path.dirname(os.path.dirname(graph_net.__file__)))")
+RENAMED_PATH=/tmp/graph_variable_rename_workspace
 
-# input model path
-MODEL_NAME=resnet18
-MODEL_PATH_IN_SAMPLES=/timm/$MODEL_NAME
-config_json_str=$(cat <<EOF
+mkdir -p "$RENAMED_PATH"
+model_list="$GRAPH_NET_ROOT/graph_net/config/small100_torch_samples_list.txt"
+
+python3 -m graph_net.model_path_handler \
+    --model-path-list $model_list \
+    --handler-config=$(base64 -w 0 <<EOF
 {
-    "handler_path": "$GRAPH_NET_ROOT/torch/graph_variable_renamer.py",
+    "handler_path": "$GRAPH_NET_ROOT/graph_net/torch/graph_variable_renamer.py",
     "handler_class_name": "GraphVariableRenamer",
     "handler_config": {
-        "model_path_prefix": "$GRAPH_NET_ROOT/../",
-        "data_input_predicator_filepath": "$GRAPH_NET_ROOT/torch/constraint_util.py",
+        "device": "cuda",
+        "resume": true,
+        "model_path_prefix": "$GRAPH_NET_ROOT/",
+        "data_input_predicator_filepath": "$GRAPH_NET_ROOT/graph_net/torch/constraint_util.py",
         "data_input_predicator_class_name": "NaiveDataInputPredicator",
-        "model_runnable_predicator_filepath": "$GRAPH_NET_ROOT/torch/constraint_util.py",
+        "model_runnable_predicator_filepath": "$GRAPH_NET_ROOT/graph_net/torch/constraint_util.py",
         "model_runnable_predicator_class_name": "ModelRunnablePredicator",
-        "output_dir": "$WORKSPACE"
+        "output_dir": "$RENAMED_PATH"
     }
 }
 EOF
-)
-CONFIG=$(echo $config_json_str | base64 -w 0)
-
-python3 -m graph_net.model_path_handler --model-path samples/$MODEL_PATH_IN_SAMPLES --handler-config=$CONFIG
-# python3 -m graph_net.model_path_handler --model-path-list $GRAPH_NET_ROOT/config/decomposition_error_tmp_torch_samples_list.txt --handler-config=$CONFIG
+) \
+    2>&1 | tee "$RENAMED_PATH/graph_rename.log"
 
-test_compiler_config_json_str=$(cat <<EOF
+python3 -m graph_net.torch.test_compiler \
+    --model-path-prefix $GRAPH_NET_ROOT \
+    --allow-list $model_list \
+    --compiler graph_variable_renamer_validator \
+    --device cuda \
+    --config $(base64 -w 0 <<EOF
 {
     "model_path_prefix": "$GRAPH_NET_ROOT",
-    "renamed_root": "$WORKSPACE"
+    "renamed_root": "$RENAMED_PATH"
 }
 EOF
-)
-TEST_COMPILER_CONFIG=$(echo $test_compiler_config_json_str | base64 -w 0)
-
-python3 -m graph_net.torch.test_compiler \
-    --model-path $GRAPH_NET_ROOT/../samples/$MODEL_PATH_IN_SAMPLES \
-    --compiler graph_variable_renamer_validator \
-    --device cuda \
-    --config $TEST_COMPILER_CONFIG \
-    > "$WORKSPACE/validation.log" 2>&1
+) \
+    2>&1 | tee "$RENAMED_PATH/validation.log"
 
 python3 -m graph_net.plot_ESt \
-    --benchmark-path "$WORKSPACE/validation.log" \
-    --output-dir "$WORKSPACE"
+    --benchmark-path "$RENAMED_PATH/validation.log" \
+    --output-dir "$RENAMED_PATH"

graph_net/torch/backend/graph_variable_renamer_validator_backend.py

@@ -56,32 +56,38 @@ def _make_config(
         self,
         model_path_prefix: str,
         renamed_root: str,
-        renamed_dentry: str = "_renamed",
     ):
         return {
             "model_path_prefix": model_path_prefix,
             "renamed_root": renamed_root,
-            "renamed_dentry": renamed_dentry,
         }
 
+    def _get_rel_model_path(self, model_path) -> str:
+        model_path = os.path.realpath(model_path)
+        model_path_prefix = os.path.realpath(self.config["model_path_prefix"])
+        assert model_path.startswith(model_path_prefix)
+        rel_model_path = model_path[len(model_path_prefix) :]
+        if rel_model_path.startswith("/"):
+            rel_model_path = rel_model_path[1:]
+        assert not rel_model_path.startswith("/")
+        return rel_model_path
+
     def __call__(self, model: torch.nn.Module) -> torch.nn.Module:
         config = self._make_config(**self.config)
         model_path = os.path.dirname(model.__class__.__graph_net_file_path__)
         model_name = os.path.basename(model_path)
-        renamed_dir_name = f"{model_name}_renamed"
-        renamed_model_dir = os.path.join(config["renamed_root"], renamed_dir_name)
+        rel_model_path = self._get_rel_model_path(model_path)
+        renamed_parent_dir = os.path.join(config["renamed_root"], rel_model_path)
 
         print(f"[GraphVariableRenamerValidatorBackend] Processing: {model_name}")
         print(
-            f"[GraphVariableRenamerValidatorBackend] Loading from: {renamed_model_dir}"
+            f"[GraphVariableRenamerValidatorBackend] Loading from: {renamed_parent_dir}"
         )
 
         device = model.__class__.__graph_net_device__
-        renamed_model = self._load_model_instance(renamed_model_dir, device)
-        mapping = self._get_rename_mapping(Path(renamed_model_dir))
-        assert (
-            mapping
-        ), f"Mapping is empty for {renamed_dir_name} at {renamed_model_dir}"
+        renamed_model = self._load_model_instance(renamed_parent_dir, device)
+        mapping = self._get_rename_mapping(Path(renamed_parent_dir))
+        assert mapping, f"Mapping is empty for {model_name} at {renamed_parent_dir}"
         adapter = RenamedModelAdapter(renamed_model, mapping)
         return adapter.eval()