Merge pull request #143 from LSSTDESC/issue/131/take-2

Issue/131/take-2

Author: heather999

conda/build-nersc.sh

@@ -5,7 +5,7 @@ module swap PrgEnv-intel PrgEnv-gnu
 module unload craype-network-aries
 module unload cray-libsci
 module unload craype
-module load cray-mpich-abi/8.1.25
+module load cray-mpich-abi/8.1.28
 
 export LD_LIBRARY_PATH=$CRAY_MPICH_BASEDIR/mpich-gnu-abi/8.2/lib:$LD_LIBRARY_PATH
 
@@ -18,6 +18,10 @@ commonWeeklyBuildDir=/global/common/software/lsst/gitlab/desc-python-int
 commonDevBuildDir=/global/common/software/lsst/gitlab/desc-python-dev
 commonProdBuildDir=/global/common/software/lsst/gitlab/desc-python-prod
 
+export BUILD_ID_DATE=`echo "$(date "+%F-%M-%S")"`
+export CI_COMMIT_REF_NAME=prod
+export CI_PIPELINE_ID=$BUILD_ID_DATE
+
 if [ "$CI_COMMIT_REF_NAME" = "dev" ];  # dev
 then
     curBuildDir=$commonDevBuildDir/$CI_PIPELINE_ID
@@ -66,7 +70,7 @@ pip install --no-cache-dir -r ./pip-pack.txt
 
 conda clean -y -a 
 
-conda config --set env_prompt "(desc-py)" --system
+conda config --set env_prompt "(desc-py)" --env
 
 conda env export --no-builds > $curBuildDir/desc-python-nersc-$CI_PIPELINE_ID-nobuildinfo.yml
 conda env export > $curBuildDir/desc-python-nersc-$CI_PIPELINE_ID.yml

conda/conda-pack.txt

@@ -46,6 +46,7 @@ numba
 numdifftools
 numpy
 pandas
+parsl
 pip  
 pot
 psycopg2

conda/install-desc-python.sh

@@ -16,38 +16,24 @@ fi
 # Set up environment if running at NERSC
 if [ "$NERSC_HOST" ]
 then
-  if [ "$NERSC_HOST" == "cori" ]
-  then
-    module unload python
-    module swap PrgEnv-intel PrgEnv-gnu
-    module unload cray-libsci
-    module unload cray-mpich
-    module load cray-mpich-abi/7.7.19
-    export LD_LIBRARY_PATH=$CRAY_MPICH_BASEDIR/mpich-gnu-abi/8.2/lib:$LD_LIBRARY_PATH
-  else
-    module unload cray-libsci
-    module load cray-mpich-abi/8.1.15
-  fi
+  module unload cray-libsci
+  module load cray-mpich-abi/8.1.28
   module list
 fi
 
 
 unset PYTHONPATH
 
-#curl -LO https://repo.anaconda.com/miniconda/Miniconda3-py38_4.9.2-Linux-x86_64.sh
-#bash ./Miniconda3-py38_4.9.2-Linux-x86_64.sh -b -p $1
-
 # Try Mambaforge latest
 url="https://github.com/conda-forge/miniforge/releases/latest/download"
 url="$url/Mambaforge-Linux-x86_64.sh"
 curl -LO "$url"
 
 bash ./Mambaforge-Linux-x86_64.sh -b -p $1
 which python
-source $1/etc/profile.d/conda.sh
-conda activate base
+source $1/bin/activate
 #conda install -c conda-forge -y mamba
-mamba install -c conda-forge -y mpich=3.4.*=external_*
+mamba install -c conda-forge -y mpich=4.0.3=external_*
 which python
 which conda
 

conda/pip-pack.txt

@@ -1,6 +1,5 @@
 ceci
 fits2hdf
-parsl
 https://bitbucket.org/yymao/helpers/get/v0.3.2.tar.gz
 https://github.com/LSSTDESC/descqa/archive/v2.8.0.tar.gz
 https://github.com/yymao/FoFCatalogMatching/archive/v0.1.0.tar.gz