regen: fix params (#28375)

Fix environment setup for regen
old-commit-hash: 1a0f482d4d
beeps
Kacper Rączy 2 years ago committed by GitHub
parent 0378e7ed81
commit 64e8f332dc
  1. 8
      selfdrive/test/process_replay/process_replay.py
  2. 7
      selfdrive/test/process_replay/regen.py

@ -2,6 +2,7 @@
import os import os
import time import time
import signal import signal
import platform
from collections import OrderedDict from collections import OrderedDict
from dataclasses import dataclass, field from dataclasses import dataclass, field
from typing import Dict, List, Optional, Callable from typing import Dict, List, Optional, Callable
@ -417,8 +418,11 @@ def replay_process(cfg, lr, fingerprint=None):
return log_msgs return log_msgs
def setup_env(CP=None, cfg=None, controlsState=None, lr=None, fingerprint=None): def setup_env(CP=None, cfg=None, controlsState=None, lr=None, fingerprint=None, log_dir=None):
os.environ["PARAMS_ROOT"] = "/dev/shm/params" if platform.system() != "Darwin":
os.environ["PARAMS_ROOT"] = "/dev/shm/params"
if log_dir is not None:
os.environ["LOG_ROOT"] = log_dir
params = Params() params = Params()
params.clear_all() params.clear_all()

@ -243,15 +243,14 @@ def regen_segment(lr, frs=None, daemons="all", outdir=FAKEDATA, disable_tqdm=Fal
if frs is None: if frs is None:
frs = dict() frs = dict()
params = Params()
os.environ["LOG_ROOT"] = outdir
# Get and setup initial state # Get and setup initial state
CP = [m for m in lr if m.which() == 'carParams'][0].carParams CP = [m for m in lr if m.which() == 'carParams'][0].carParams
controlsState = [m for m in lr if m.which() == 'controlsState'][0].controlsState controlsState = [m for m in lr if m.which() == 'controlsState'][0].controlsState
liveCalibration = [m for m in lr if m.which() == 'liveCalibration'][0] liveCalibration = [m for m in lr if m.which() == 'liveCalibration'][0]
setup_env(CP=CP, controlsState=controlsState) setup_env(CP=CP, controlsState=controlsState, log_dir=outdir)
params = Params()
params.put("CalibrationParams", liveCalibration.as_builder().to_bytes()) params.put("CalibrationParams", liveCalibration.as_builder().to_bytes())
vs, cam_procs = replay_cameras(lr, frs, disable_tqdm=disable_tqdm) vs, cam_procs = replay_cameras(lr, frs, disable_tqdm=disable_tqdm)

Loading…
Cancel
Save