Skip to content

Commit

Permalink
Merge pull request #1544 from ucb-bar/conda-bump
Browse files Browse the repository at this point in the history
Bump Conda + Deprecate docker image docs
  • Loading branch information
abejgonzalez authored Jul 7, 2023
2 parents 6a3e3d9 + adcb736 commit 0841ad1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/install-conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
export HOME="${HOME:-/root}"

CONDA_INSTALL_PREFIX=/opt/conda
CONDA_INSTALLER_VERSION=22.11.1-4
CONDA_INSTALLER_VERSION=23.1.0-1
CONDA_INSTALLER="https://github.com/conda-forge/miniforge/releases/download/${CONDA_INSTALLER_VERSION}/Miniforge3-${CONDA_INSTALLER_VERSION}-Linux-x86_64.sh"
CONDA_CMD="conda" # some installers install mamba or micromamba

Expand Down
22 changes: 11 additions & 11 deletions docs/Chipyard-Basics/Initial-Repo-Setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,25 @@ Run the following script based off which compiler you would like to use.

.. Warning:: The following script will complete a "full" installation of Chipyard which may take a long time depending on the system.
Ensure that this script completes fully (no interruptions) before continuing on. User can use the ``--skip`` or ``-s`` flag to skip steps:

``-s 1`` skips initializing Conda environment

``-s 2`` skips initializing Chipyard submodules

``-s 3`` skips initializing toolchain collateral (Spike, PK, tests, libgloss)

``-s 4`` skips initializing ctags

``-s 5`` skips pre-compiling Chipyard Scala sources

``-s 6`` skips initializing FireSim

``-s 7`` skips pre-compiling FireSim sources

``-s 8`` skips initializing FireMarshal

``-s 9`` skips pre-compiling FireMarshal default buildroot Linux sources

``-s 10`` skips running repository clean-up

.. code-block:: shell
Expand Down Expand Up @@ -140,7 +140,7 @@ You can source this file in your ``.bashrc`` or equivalent environment setup fil
However, it is recommended that the final ``env.sh`` file sourced is the ``env.sh`` located in the
Chipyard repo that you expect to run ``make`` commands in.

Pre-built Docker Image
DEPRECATED: Pre-built Docker Image
-------------------------------------------

An alternative to setting up the Chipyard repository locally is to pull the pre-built Docker image from Docker Hub. The image comes with all dependencies installed, Chipyard cloned, and toolchains initialized. This image sets up baseline Chipyard (not including FireMarshal, FireSim, and Hammer initializations). Each image comes with a tag that corresponds to the version of Chipyard cloned/set-up in that image. Not including a tag during the pull will pull the image with the latest version of Chipyard.
Expand Down

0 comments on commit 0841ad1

Please sign in to comment.