From 7229f369a5b147378eeb70b76262432190e13ffa Mon Sep 17 00:00:00 2001 From: Taekyung Heo <7621438+TaekyungHeo@users.noreply.github.com> Date: Mon, 1 Jul 2024 08:29:57 -0400 Subject: [PATCH] Update USER_GUIDE.md and Python imports to use the latest PARAM branch --- .github/workflows/end_to_end_tests.yml | 5 +++-- .github/workflows/python_tests.yml | 5 +++-- USER_GUIDE.md | 5 +++-- src/trace_link/kineto_operator.py | 2 +- src/trace_link/trace_linker.py | 6 ++---- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/end_to_end_tests.yml b/.github/workflows/end_to_end_tests.yml index 8d4b869d..51b58092 100644 --- a/.github/workflows/end_to_end_tests.yml +++ b/.github/workflows/end_to_end_tests.yml @@ -22,8 +22,9 @@ jobs: - name: Install PARAM run: | git clone https://github.com/facebookresearch/param.git - cd param/train/compute/python/ - git checkout c83ce8429110a86549c40fec5a01acbd9fbd54a4 + git checkout 884a1f0154a16e2c170e456f8027f2646c9108ae + cd param/et_replay + sed -i '/param_bench/d' pyproject.toml pip install . - name: Test chakra_trace_link Without Arguments diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml index d20e4722..27619e3f 100644 --- a/.github/workflows/python_tests.yml +++ b/.github/workflows/python_tests.yml @@ -22,8 +22,9 @@ jobs: - name: Install PARAM run: | git clone https://github.com/facebookresearch/param.git - cd param/train/compute/python/ - git checkout c83ce8429110a86549c40fec5a01acbd9fbd54a4 + git checkout 884a1f0154a16e2c170e456f8027f2646c9108ae + cd param/et_replay + sed -i '/param_bench/d' pyproject.toml pip install . - name: Install Dependencies diff --git a/USER_GUIDE.md b/USER_GUIDE.md index 2a1b95fb..720732e1 100644 --- a/USER_GUIDE.md +++ b/USER_GUIDE.md @@ -30,8 +30,9 @@ Installing PARAM is necessary for Chakra to function properly as it imports esse ```bash $ git clone git@github.com:facebookresearch/param.git -$ cd param/train/compute/python/ -$ git checkout c83ce8429110a86549c40fec5a01acbd9fbd54a4 +$ git checkout 884a1f0154a16e2c170e456f8027f2646c9108ae +$ cd param/et_replay +$ sed -i '' '13d' pyproject.toml $ pip install . ``` diff --git a/src/trace_link/kineto_operator.py b/src/trace_link/kineto_operator.py index 12c7228a..fb448333 100644 --- a/src/trace_link/kineto_operator.py +++ b/src/trace_link/kineto_operator.py @@ -1,6 +1,6 @@ from typing import Any, Dict, Optional -from param_bench.train.compute.python.tools.execution_trace import Node as PyTorchOperator +from et_replay.lib.execution_trace import Node as PyTorchOperator class KinetoOperator: diff --git a/src/trace_link/trace_linker.py b/src/trace_link/trace_linker.py index d26f3518..41f399f1 100644 --- a/src/trace_link/trace_linker.py +++ b/src/trace_link/trace_linker.py @@ -6,14 +6,12 @@ from concurrent.futures import ThreadPoolExecutor, as_completed from typing import Dict, List, Optional, Tuple -from param_bench.train.compute.python.tools.execution_trace import ( +from et_replay.lib.execution_trace import ( EXECUTION_TRACE_PROCESS_ANNOTATION, EXECUTION_TRACE_THREAD_ANNOTATION, -) -from param_bench.train.compute.python.tools.execution_trace import ( Node as PyTorchOperator, ) -from param_bench.train.compute.python.tools.utility import ( +from et_replay.lib.utils import ( load_execution_trace_file, read_dictionary_from_json_file, )