Skip to content

Commit 590f4d6

Browse files
authored
[misc] refactor: remove sys.path hacks; rely on installed package layout (#64)
- Drop manual `sys.path.append` to the repo root in tests, recipe demo, and scripts. - Imports from transfer_queue now assume the package is installed (e.g. pip install -e .) or the interpreter path is set correctly. - Clean up noqa: E402 on affected imports where applicable. --------- Signed-off-by: ji-huazhong <hzji210@gmail.com>
1 parent 0c3ac24 commit 590f4d6

18 files changed

Lines changed: 33 additions & 133 deletions

recipe/simple_use_case/single_controller_demo.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
import logging
1919
import os
2020
import random
21-
import sys
2221
import time
2322
import uuid
2423
from dataclasses import dataclass, field
2524
from importlib import resources
26-
from pathlib import Path
2725

2826
import ray
2927
import torch
@@ -35,9 +33,6 @@
3533
import transfer_queue as tq
3634
from transfer_queue import KVBatchMeta
3735

38-
parent_dir = Path(__file__).resolve().parent.parent.parent
39-
sys.path.append(str(parent_dir))
40-
4136
logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
4237
logger = logging.getLogger(__name__)
4338

scripts/performance_test/perftest.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,15 @@
1818
import csv
1919
import logging
2020
import os
21-
import sys
2221
import time
23-
from pathlib import Path
2422
from typing import Any
2523

2624
import ray
2725
import torch
2826
from omegaconf import OmegaConf
2927
from tensordict import NonTensorStack, TensorDict
3028

31-
parent_dir = Path(__file__).resolve().parent.parent.parent
32-
sys.path.append(str(parent_dir))
33-
34-
import transfer_queue as tq # noqa: E402
29+
import transfer_queue as tq
3530

3631
logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
3732
logger = logging.getLogger(__name__)

scripts/performance_test/ray_perftest_baseline.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,13 @@
1818
import csv
1919
import logging
2020
import os
21-
import sys
2221
import time
23-
from pathlib import Path
2422
from typing import Any
2523

2624
import ray
2725
import torch
2826
from tensordict import NonTensorStack, TensorDict
2927

30-
parent_dir = Path(__file__).resolve().parent.parent.parent
31-
sys.path.append(str(parent_dir))
32-
3328
logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
3429
logger = logging.getLogger(__name__)
3530

scripts/put_benchmark.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import logging
2020
import math
2121
import os
22-
import sys
2322
import time
24-
from pathlib import Path
2523

2624
import numpy as np
2725
import ray
@@ -30,14 +28,11 @@
3028
from tensordict import TensorDict
3129
from tensordict.utils import LinkedList
3230

33-
parent_dir = Path(__file__).resolve().parent.parent.parent
34-
sys.path.append(str(parent_dir))
35-
36-
from transfer_queue import TransferQueueClient # noqa: E402
37-
from transfer_queue.controller import TransferQueueController # noqa: E402
38-
from transfer_queue.storage.simple_backend import SimpleStorageUnit # noqa: E402
39-
from transfer_queue.utils.common import get_placement_group # noqa: E402
40-
from transfer_queue.utils.zmq_utils import process_zmq_server_info # noqa: E402
31+
from transfer_queue import TransferQueueClient
32+
from transfer_queue.controller import TransferQueueController
33+
from transfer_queue.storage.simple_backend import SimpleStorageUnit
34+
from transfer_queue.utils.common import get_placement_group
35+
from transfer_queue.utils.zmq_utils import process_zmq_server_info
4136

4237
logging.basicConfig(level=logging.INFO)
4338
logger = logging.getLogger(__name__)

tests/e2e/test_e2e_lifecycle_consistency.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import os
1717
import sys
1818
import time
19-
from pathlib import Path
2019

2120
import numpy as np
2221
import pytest
@@ -26,10 +25,6 @@
2625
from tensordict import TensorDict
2726
from tensordict.tensorclass import NonTensorData
2827

29-
# Setup paths (transfer_queue is not pip-installed)
30-
parent_dir = Path(__file__).resolve().parent.parent.parent
31-
sys.path.append(str(parent_dir))
32-
3328
# Module-level default fields to avoid repeated generation
3429
DEFAULT_FIELDS = [
3530
"tensor_f32",

tests/e2e/test_kv_interface_e2e.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,14 @@
2222

2323
import asyncio
2424
import os
25-
import sys
26-
from pathlib import Path
2725

2826
import pytest
2927
import ray
3028
import torch
3129
from omegaconf import OmegaConf
3230
from tensordict import TensorDict
3331

34-
# Add parent directory to path
35-
parent_dir = Path(__file__).resolve().parent.parent.parent
36-
sys.path.append(str(parent_dir))
37-
38-
import transfer_queue as tq # noqa: E402
32+
import transfer_queue as tq
3933

4034

4135
class TQAPIWrapper:

tests/test_async_simple_storage_manager.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
import sys
17-
from pathlib import Path
1816
from unittest.mock import AsyncMock, Mock, patch
1917

2018
import numpy as np
@@ -24,14 +22,10 @@
2422
import zmq
2523
from tensordict import NonTensorStack, TensorDict
2624

27-
# Setup path
28-
parent_dir = Path(__file__).resolve().parent.parent
29-
sys.path.append(str(parent_dir))
30-
31-
from transfer_queue.metadata import BatchMeta # noqa: E402
32-
from transfer_queue.storage import AsyncSimpleStorageManager # noqa: E402
33-
from transfer_queue.utils.enum_utils import TransferQueueRole # noqa: E402
34-
from transfer_queue.utils.zmq_utils import ZMQMessage, ZMQRequestType, ZMQServerInfo # noqa: E402
25+
from transfer_queue.metadata import BatchMeta
26+
from transfer_queue.storage import AsyncSimpleStorageManager
27+
from transfer_queue.utils.enum_utils import TransferQueueRole
28+
from transfer_queue.utils.zmq_utils import ZMQMessage, ZMQRequestType, ZMQServerInfo
3529

3630

3731
@pytest_asyncio.fixture

tests/test_client.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
import sys
1716
import time
18-
from pathlib import Path
1917
from threading import Thread
2018
from unittest.mock import patch
2119

@@ -24,16 +22,10 @@
2422
import zmq
2523
from tensordict import NonTensorStack, TensorDict
2624

27-
# Import your classes here
28-
parent_dir = Path(__file__).resolve().parent.parent
29-
sys.path.append(str(parent_dir))
30-
31-
from transfer_queue import TransferQueueClient # noqa: E402
32-
from transfer_queue.metadata import ( # noqa: E402
33-
BatchMeta,
34-
)
35-
from transfer_queue.utils.enum_utils import TransferQueueRole # noqa: E402
36-
from transfer_queue.utils.zmq_utils import ( # noqa: E402
25+
from transfer_queue import TransferQueueClient
26+
from transfer_queue.metadata import BatchMeta
27+
from transfer_queue.utils.enum_utils import TransferQueueRole
28+
from transfer_queue.utils.zmq_utils import (
3729
ZMQMessage,
3830
ZMQRequestType,
3931
ZMQServerInfo,

tests/test_controller.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,17 @@
1414
# limitations under the License.
1515

1616
import logging
17-
import sys
18-
from pathlib import Path
1917

2018
import pytest
2119
import ray
2220
import torch
2321

24-
parent_dir = Path(__file__).resolve().parent.parent
25-
sys.path.append(str(parent_dir))
22+
from transfer_queue.controller import TransferQueueController
2623

2724
# Set up logging
2825
logging.basicConfig(level=logging.INFO)
2926
logger = logging.getLogger(__name__)
3027

31-
from transfer_queue.controller import TransferQueueController # noqa: E402
32-
3328

3429
@pytest.fixture(scope="function")
3530
def ray_setup():

tests/test_controller_data_partitions.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515

1616
import logging
1717
import os
18-
import sys
1918
import time
20-
from pathlib import Path
21-
22-
parent_dir = Path(__file__).resolve().parent.parent
23-
sys.path.append(str(parent_dir))
24-
2519

2620
# Set up logging
2721
logging.basicConfig(level=logging.INFO)

0 commit comments

Comments
 (0)