From 59f56cfcb8b92306bd7b4dd8f8ec180e235344b0 Mon Sep 17 00:00:00 2001 From: Heather Kelly Date: Thu, 8 Sep 2022 23:14:44 -0400 Subject: [PATCH 1/7] first attempt at RESSPECT installation --- conda/build-nersc.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conda/build-nersc.sh b/conda/build-nersc.sh index 7e61335..351247e 100755 --- 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 From 212431226e7a13963d327157cebe3a3f9cd521ac Mon Sep 17 00:00:00 2001 From: Heather Kelly Date: Tue, 13 Sep 2022 13:59:14 -0400 Subject: [PATCH 2/7] add root for snana lightcurve analysis --- conda/packlist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/packlist.txt b/conda/packlist.txt index fbc5fa4..b2e861f 100644 --- a/conda/packlist.txt +++ b/conda/packlist.txt @@ -16,6 +16,7 @@ ligo.skymap ligo.em-bright lsstdesc-gcr-catalogs pygpu +root tensorflow theano # adding for lenstonomy From 22049a2f081f64de055ffd56462663c95b26868b Mon Sep 17 00:00:00 2001 From: Heather Kelly Date: Wed, 14 Sep 2022 12:31:20 -0400 Subject: [PATCH 3/7] load NERSC root module --- nersc/setup_td_dev.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nersc/setup_td_dev.sh b/nersc/setup_td_dev.sh index 94a4d7a..f490037 100755 --- a/nersc/setup_td_dev.sh +++ b/nersc/setup_td_dev.sh @@ -116,6 +116,9 @@ 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 + + module load root/6.26.00 + export GSL_DIR=$DESC_TD_INSTALL/conda/envs/$LSST_CONDA_ENV_NAME export CFITSIO_DIR=$DESC_TD_INSTALL/conda/envs/$LSST_CONDA_ENV_NAME From c81f3781b0db538235871200b7c830dbd713f70f Mon Sep 17 00:00:00 2001 From: Heather Kelly Date: Wed, 14 Sep 2022 12:32:06 -0400 Subject: [PATCH 4/7] remove root Updates packages that w_2022_10 relies on in rubin_env --- conda/packlist.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/packlist.txt b/conda/packlist.txt index b2e861f..fbc5fa4 100644 --- a/conda/packlist.txt +++ b/conda/packlist.txt @@ -16,7 +16,6 @@ ligo.skymap ligo.em-bright lsstdesc-gcr-catalogs pygpu -root tensorflow theano # adding for lenstonomy From e0376e6f8bbd69ae8ba3316954c461127443b577 Mon Sep 17 00:00:00 2001 From: Heather Kelly Date: Wed, 14 Sep 2022 19:01:53 -0400 Subject: [PATCH 5/7] Skip using NERSC's ROOT It needs too many system libraries that are not automatically found when we're using a conda environment --- nersc/setup_td_dev.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nersc/setup_td_dev.sh b/nersc/setup_td_dev.sh index f490037..3e1f07a 100755 --- a/nersc/setup_td_dev.sh +++ b/nersc/setup_td_dev.sh @@ -116,9 +116,7 @@ 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 - - module load root/6.26.00 - + export GSL_DIR=$DESC_TD_INSTALL/conda/envs/$LSST_CONDA_ENV_NAME export CFITSIO_DIR=$DESC_TD_INSTALL/conda/envs/$LSST_CONDA_ENV_NAME From 90ab931693f5d311ca31ef059956c2e79a5ed8da Mon Sep 17 00:00:00 2001 From: Heather Kelly Date: Wed, 14 Sep 2022 19:02:14 -0400 Subject: [PATCH 6/7] Try root_base --- conda/packlist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/packlist.txt b/conda/packlist.txt index fbc5fa4..4adb851 100644 --- 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 From 97d3a8c537cb234dc22f893992e53ca56b493c56 Mon Sep 17 00:00:00 2001 From: Heather Kelly Date: Thu, 15 Sep 2022 09:30:20 -0400 Subject: [PATCH 7/7] define ROOT_DIR --- nersc/setup_td_dev.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nersc/setup_td_dev.sh b/nersc/setup_td_dev.sh index 3e1f07a..61188d9 100755 --- a/nersc/setup_td_dev.sh +++ b/nersc/setup_td_dev.sh @@ -119,6 +119,7 @@ then 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