From 62419c0952d1e10151197eeedd7a5c0f06d08af1 Mon Sep 17 00:00:00 2001 From: whitequark Date: Fri, 30 Oct 2015 04:18:42 +0300 Subject: [PATCH 1/2] manual: update installing.rst. --- doc/manual/installing.rst | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 6d2498121..263f5fceb 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -29,7 +29,7 @@ If it prints the help of the ``conda`` command, your install is OK. If not, then make sure your ``$PATH`` environment variable contains the path to anaconda3/bin (or miniconda3/bin):: $ echo $PATH - /home/..../miniconda3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games + /home/.../miniconda3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin If your ``$PATH`` misses reference the miniconda3/bin or anaconda3/bin you can fix this by typing:: @@ -38,14 +38,37 @@ If your ``$PATH`` misses reference the miniconda3/bin or anaconda3/bin you can f Installing the host side software ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -For this, you need to add our binstar repository to your conda configuration:: +For this, you need to add our Anaconda repository to your conda configuration:: $ conda config --add channels http://conda.anaconda.org/m-labs/channel/main $ conda config --add channels http://conda.anaconda.org/m-labs/channel/dev -Then you can install the ARTIQ package, it will pull all the necessary dependencies:: +Then you can install the ARTIQ package, it will pull all the necessary dependencies. - $ conda install artiq +* For the Pipistrello board:: + + $ ENV=$(date +artiq-%Y-%m-%d); conda create -n $ENV artiq-pipistrello-nist_qc1; \ + echo "Created environment $ENV for ARTIQ" + +* For the KC705 board:: + + $ ENV=$(date +artiq-%Y-%m-%d); conda create -n $ENV artiq-kc705-nist_qc1 artiq-kc705-nist_qc2; \ + echo "Created environment $ENV for ARTIQ" + +This creates a new Conda "environment" (i.e. an isolated installation) and prints its name. +If you ever need to upgrade ARTIQ, it is advised to install it again +in a new environment so that you can roll back to a version that is known to +work correctly. + +After this, add the newly created environment to your ``$PATH``. This can be easily +done using the following command:: + + $ source activate artiq-[date] + +You will need to invoke this command in every new shell. When in doubt, you can list +the existing environments using:: + + $ conda env list Preparing the core device FPGA board ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ From ff93e3c149786b6b14cb493dd774566647744c67 Mon Sep 17 00:00:00 2001 From: whitequark Date: Fri, 30 Oct 2015 05:07:01 +0300 Subject: [PATCH 2/2] manual: update installing.rst to elaborate QC1/QC2 differences. --- doc/manual/installing.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst index 263f5fceb..9a3ea155a 100644 --- a/doc/manual/installing.rst +++ b/doc/manual/installing.rst @@ -50,9 +50,14 @@ Then you can install the ARTIQ package, it will pull all the necessary dependenc $ ENV=$(date +artiq-%Y-%m-%d); conda create -n $ENV artiq-pipistrello-nist_qc1; \ echo "Created environment $ENV for ARTIQ" -* For the KC705 board:: +* For the KC705 board with SCSI cables and AD9858 DDS chips:: - $ ENV=$(date +artiq-%Y-%m-%d); conda create -n $ENV artiq-kc705-nist_qc1 artiq-kc705-nist_qc2; \ + $ ENV=$(date +artiq-%Y-%m-%d); conda create -n $ENV artiq-kc705-nist_qc1; \ + echo "Created environment $ENV for ARTIQ" + +* For the KC705 board with the FMC backplane and AD9914 DDS chips:: + + $ ENV=$(date +artiq-%Y-%m-%d); conda create -n $ENV artiq-kc705-nist_qc2; \ echo "Created environment $ENV for ARTIQ" This creates a new Conda "environment" (i.e. an isolated installation) and prints its name.