Update PARAM import paths to reflect the latest main branch structure

.github/workflows/end_to_end_tests.yml

@@ -23,8 +23,7 @@ jobs:
       run: |
         git clone https://github.com/facebookresearch/param.git
         cd param/et_replay
-        git checkout 884a1f0154a16e2c170e456f8027f2646c9108ae
-        sed -i '/param_bench/d' pyproject.toml
+        git checkout 7b19f586dd8b267333114992833a0d7e0d601630
         pip install .
 
     - name: Test chakra_trace_link Without Arguments

.github/workflows/python_tests.yml

@@ -23,8 +23,7 @@ jobs:
       run: |
         git clone https://github.com/facebookresearch/param.git
         cd param/et_replay
-        git checkout 884a1f0154a16e2c170e456f8027f2646c9108ae
-        sed -i '/param_bench/d' pyproject.toml
+        git checkout 7b19f586dd8b267333114992833a0d7e0d601630
         pip install .
 
     - name: Install Dependencies

USER_GUIDE.md

@@ -31,7 +31,7 @@ Installing PARAM is necessary for Chakra to function properly as it imports esse
 ```bash
 $ git clone git@github.com:facebookresearch/param.git
 $ cd param/et_replay
-$ git checkout ea12ab702712e9986db85cd5773eb5902f28af2a
+$ git checkout 7b19f586dd8b267333114992833a0d7e0d601630
 $ pip install .
 ```
 

src/trace_link/chakra_device_trace_loader.py

@@ -3,7 +3,7 @@
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from typing import Dict, List, Tuple
 
-from et_replay.lib.utils import read_dictionary_from_json_file
+from et_replay.utils import read_dictionary_from_json_file
 
 from .kineto_operator import KinetoOperator
 

src/trace_link/chakra_host_trace_loader.py

@@ -2,8 +2,8 @@
 import sys
 from typing import List
 
-from et_replay.lib.execution_trace import Node as PyTorchOperator
-from et_replay.lib.utils import load_execution_trace_file
+from et_replay.execution_trace import Node as PyTorchOperator
+from et_replay.utils import load_execution_trace_file
 
 # Increase the recursion limit for deep Chakra host execution traces.
 sys.setrecursionlimit(10**6)

src/trace_link/kineto_operator.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, Optional
 
-from et_replay.lib.execution_trace import Node as PyTorchOperator
+from et_replay.execution_trace import Node as PyTorchOperator
 
 
 class KinetoOperator:

src/trace_link/trace_linker.py

@@ -5,11 +5,11 @@
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from typing import Dict, List, Optional, Tuple
 
-from et_replay.lib.execution_trace import (
+from et_replay.execution_trace import (
     EXECUTION_TRACE_PROCESS_ANNOTATION,
     EXECUTION_TRACE_THREAD_ANNOTATION,
 )
-from et_replay.lib.execution_trace import Node as PyTorchOperator
+from et_replay.execution_trace import Node as PyTorchOperator
 
 from .chakra_device_trace_loader import ChakraDeviceTraceLoader
 from .chakra_host_trace_loader import ChakraHostTraceLoader

tests/trace_link/test_chakra_host_trace_loader.py

@@ -2,7 +2,7 @@
 
 import pytest
 from chakra.src.trace_link.chakra_host_trace_loader import ChakraHostTraceLoader
-from et_replay.lib.execution_trace import Node as PyTorchOperator
+from et_replay.execution_trace import Node as PyTorchOperator
 
 
 @pytest.fixture

tests/trace_link/test_trace_linker.py

@@ -4,11 +4,11 @@
 from chakra.src.trace_link.kineto_operator import KinetoOperator
 from chakra.src.trace_link.trace_linker import TraceLinker
 from chakra.src.trace_link.unique_id_assigner import UniqueIdAssigner
-from et_replay.lib.execution_trace import (
+from et_replay.execution_trace import (
     EXECUTION_TRACE_PROCESS_ANNOTATION,
     EXECUTION_TRACE_THREAD_ANNOTATION,
 )
-from et_replay.lib.execution_trace import Node as PyTorchOperator
+from et_replay.execution_trace import Node as PyTorchOperator
 
 
 @pytest.fixture