From d70bd55a160169adb1c29533b70b9609d6aba694 Mon Sep 17 00:00:00 2001 From: "joonho.whangbo" Date: Mon, 22 Jan 2024 21:33:31 -0800 Subject: [PATCH 1/2] Remove useless conda env sourcing --- scripts/build-setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh index 28ec4f3dd7..2dbf1f2277 100755 --- a/scripts/build-setup.sh +++ b/scripts/build-setup.sh @@ -181,7 +181,6 @@ if run_step "1"; then # use conda-lock to create env conda-lock install --conda $(which conda) -p $CYDIR/.conda-env $LOCKFILE && - source $CYDIR/.conda-env/etc/profile.d/conda.sh && conda activate $CYDIR/.conda-env exit_if_last_command_failed From 4aaffd53aed217d23ed6e7df01431e069fc9a252 Mon Sep 17 00:00:00 2001 From: Vighnesh Iyer Date: Mon, 22 Jan 2024 23:40:18 -0800 Subject: [PATCH 2/2] source conda.sh from conda base environment rather than the chipyard conda env (which does not have conda in lean lockfile) --- scripts/build-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh index 2dbf1f2277..0ba8eb1c48 100755 --- a/scripts/build-setup.sh +++ b/scripts/build-setup.sh @@ -181,6 +181,7 @@ if run_step "1"; then # use conda-lock to create env conda-lock install --conda $(which conda) -p $CYDIR/.conda-env $LOCKFILE && + source $(conda info --base)/etc/profile.d/conda.sh && conda activate $CYDIR/.conda-env exit_if_last_command_failed