Merge pull request #311 from firesim/new-conda

Use conda-lock for dependencies

.github/workflows/run-tests.yml

@@ -79,8 +79,7 @@ jobs:
  run: |
  cd ${{ env.REMOTE_WORK_DIR }}
  eval "$(conda shell.bash hook)"
- conda-lock --conda $(which conda) -f ./conda-reqs.yaml -f ./riscv-tools.yaml -p linux-64
- conda-lock install --conda $(which conda) -p $PWD/.conda-env
+ ./scripts/setup-conda.sh
  - name: Install Spike
  run: |
  cd ${{ env.REMOTE_WORK_DIR }}

.github/workflows/weekly-build.yml

@@ -33,8 +33,7 @@ jobs:
  run: |
  cd ${{ env.REMOTE_WORK_DIR }}
  eval "$(conda shell.bash hook)"
- conda-lock --conda $(which conda) -f ./conda-reqs.yaml -f ./riscv-tools.yaml -p linux-64
- conda-lock install --conda $(which conda) -p $PWD/.conda-env
+ ./scripts/setup-conda.sh
  - name: Initialize all submodules
  run: |
  cd ${{ env.REMOTE_WORK_DIR }}

.gitignore

@@ -8,3 +8,5 @@ boards/default/distros/ubuntu/rootfs.img*
 .ropeproject
 *~
 *#
+.conda-env
+.conda-lock-env

README.md

@@ -22,14 +22,11 @@ To run FireMarshal independently, follow along from the next section (Standalone
 
 FireMarshal uses the [Conda](https://docs.conda.io/en/latest/) package manager to help manage system dependencies.
 This allows users to create an "environment" that holds system dependencies like ``make``, ``git``, etc.
-Additionally, FireMarshal uses [Conda Lock](https://conda.github.io/conda-lock/) to generate lock files for Conda environments.
-Please install Conda and Conda Lock using the Chipyard documentation [here](https://chipyard.readthedocs.io/en/main/Chipyard-Basics/Initial-Repo-Setup.html#default-requirements-installation).
 
 Next you can run the following commands to create a FireMarshal environment called ``firemarshal`` with a RISC-V compatible toolchain:
 
 ```bash
-conda-lock --conda $(which conda) -f ./conda-reqs.yaml -f ./riscv-tools.yaml -p linux-64
-conda-lock install --conda $(which conda) -n firemarshal
+./scripts/setup-conda.sh --conda-env-name firemarshal
 ```
 
 To enter this environment, you then run the ``activate`` command.

conda-reqs.yaml → conda-reqs/conda-reqs.yaml

@@ -3,11 +3,12 @@ channels:
  - ucb-bar
  - nodefaults
 
-# non-standard key used in conda-lock: https://github.com/conda-incubator/conda-lock#platform-specification
 platforms:
  - linux-64
 
 dependencies:
+ # required for lockfile generation
+ - conda-lock=2.5.7
  - qemu # from ucb-bar channel - https://github.com/ucb-bar/qemu-feedstock
  - python>=3.9,<3.11
  - rsync