Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bring main up to date #39

Merged
merged 6 commits into from
Apr 1, 2022
Merged

Bring main up to date #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b04031e
install which and wget
heather999 Mar 31, 2022
8cd91ef
adding --no-cache-dir to save some space
heather999 Mar 31, 2022
b0d1518
add #!/bin/bash to setup script
heather999 Mar 31, 2022
0794ea0
drop baseline for zsh compatibility
heather999 Apr 1, 2022
312f79c
bash or zsh for now
heather999 Apr 1, 2022
c05114b
Merge pull request #38 from LSSTDESC/issue/36/improve-docker-image
heather999 Apr 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docker/install-mpich.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

yum install -y wget which

source /opt/lsst/software/stack/loadLSST.bash

export mpich=3.3
Expand Down
2 changes: 1 addition & 1 deletion docker/update-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ conda install -c conda-forge -y mamba
mamba install -c conda-forge -y mpich=3.3.*=external_*

mamba install -c conda-forge -y --file ./packlist.txt
pip install -r ./piplist.txt
pip install --no-cache-dir -r ./piplist.txt

conda config --set env_prompt "(lsst-scipipe-$1)" --system

3 changes: 2 additions & 1 deletion nersc/setup_td_dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/bash

# Feb 19 2022: HK Use native install of LSST Sci Pipelines at NERSC
# Jan 27 2022: HK update to optionally setup LSST Sci Pipelines
Expand All @@ -8,7 +9,7 @@
# Feb 2020: install SNANA on Cori
#

SCRIPT=`basename ${BASH_SOURCE[0]}`
SCRIPT=${BASH_SOURCE[0]}

usage() { # Function: Print a help message.
echo -e \\n"Help documentation for ${BOLD}${SCRIPT}"\\n
Expand Down
9 changes: 8 additions & 1 deletion nersc/setup_td_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,12 @@ unset LSST_HOME EUPS_PATH LSST_DEVEL EUPS_PKGROOT REPOSITORY_PATH PYTHONPATH
export LD_LIBRARY_PATH=$CRAY_MPICH_BASEDIR/mpich-gnu-abi/8.2/lib:$LD_LIBRARY_PATH

export DESC_LSST_INSTALL_DIR=$1
source $DESC_LSST_INSTALL_DIR/loadLSST.bash

curshell=$(echo $0)
if [ $curshell = bash ];
then
source $DESC_LSST_INSTALL_DIR/loadLSST.bash
else
source $DESC_LSST_INSTALL_DIR/loadLSST.zsh
fi
setup lsst_distrib