Merge pull request #69 from LSSTDESC/dev

Prepare for next release and include RESSPECT and ROOT
LSSTDESC · Sep 15, 2022 · a4c69de · a4c69de
2 parents b9c5b74 + 97d3a8c
commit a4c69de
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/conda/build-nersc.sh b/conda/build-nersc.sh
@@ -63,6 +63,12 @@ conda clean -y -a
 # Install bayeSN
 git clone https://github.com/bayesn/bayesn-public
 
+#Install RESSPECT
+git clone https://github.com/COINtoolbox/resspect
+cd resspect
+python setup.py install
+cd ..
+
 python -m compileall $curBuildDir
 
 # Hard-coding this for now for building at NERSC

diff --git a/conda/packlist.txt b/conda/packlist.txt
@@ -16,6 +16,7 @@ ligo.skymap
 ligo.em-bright
 lsstdesc-gcr-catalogs
 pygpu
+root_base
 tensorflow
 theano
 # adding for lenstonomy

diff --git a/nersc/setup_td_dev.sh b/nersc/setup_td_dev.sh
@@ -116,8 +116,10 @@ then
   #export DESC_TD_INSTALL=/global/common/software/lsst/cori-haswell-gcc/stack/td_env-prod/stable
   export DESC_TD_INSTALL=/global/common/software/lsst/cori-haswell-gcc/stack/td_env-dev/dev
   source $DESC_TD_INSTALL/setup_td_env.sh
+
   export GSL_DIR=$DESC_TD_INSTALL/conda/envs/$LSST_CONDA_ENV_NAME
   export CFITSIO_DIR=$DESC_TD_INSTALL/conda/envs/$LSST_CONDA_ENV_NAME
+  export ROOT_DIR=$ROOTSYS
 
   export PYTHONPATH=$PYTHONPATH:$DESC_TD_INSTALL