Merge branch 'main' into dev

LSSTDESC · Sep 8, 2022 · 94104b8 · 94104b8
2 parents bb7bc09 + dd1746b
commit 94104b8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/td-env-docker-dev.yml b/.github/workflows/td-env-docker-dev.yml
@@ -11,8 +11,12 @@ jobs:
     name: Build on Ubuntu
     runs-on: ubuntu-20.04
     steps:
+    - name: Check Disk Space
+      run: df -h && sudo apt-get clean && df -h 
     - name: Docker login
       run: echo '${{ secrets.DOCKERHUB_ACCESSTOK }}' | docker login --username heather999 --password-stdin
+    - name : Docker prune
+      run: sudo docker system prune && df -h 
     - name: checkout td_env
       uses: actions/checkout@v2
       with:
@@ -32,18 +36,20 @@ jobs:
         docker commit -m"initial testing" install-mpich lsstdesc/td-dev:mpich
         docker run -u lsst -v $GITHUB_WORKSPACE:$GITHUB_WORKSPACE -w $GITHUB_WORKSPACE/conda --name="td-test-env" lsstdesc/td-dev:mpich /bin/bash /$GITHUB_WORKSPACE/docker/update-docker.sh ${{env.LSST_TAG}}
         docker commit -m"initial testing" td-test-env lsstdesc/td-dev:test
+        docker rmi -f lsstdesc/td-dev:mpich
         docker run -u lsst -w /opt/lsst/software/stack --name="td-setwd" lsstdesc/td-dev:test /bin/bash
         docker commit -m"initial testing" td-setwd lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev
+        docker rmi -f lsstdesc/td-dev:test
     - name: Test and push
       run: |
         docker run --rm lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev /bin/bash -c "source /opt/lsst/software/stack/loadLSST.bash && setup lsst_distrib && python -c 'import coloredlogs'"
         docker push lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev
         docker tag lsstdesc/td-env:${{env.LSST_TAG}}-${{env.DATE_TAG}}-dev lsstdesc/td-env:dev
         docker push lsstdesc/td-env:dev
-        mkdir -p /tmp/desc
-        docker save lsstdesc/td-env:dev > /tmp/desc/lsstdesc-td-env-dev.tar
-    - name: Upload docker tarball
-      uses: actions/upload-artifact@v3
-      with:
-          name: lsstdesc-td-env-dev
-          path: /tmp/desc/lsstdesc-td-env-dev.tar
+#        mkdir -p /tmp/desc
+#        docker save lsstdesc/td-env:dev > /tmp/desc/lsstdesc-td-env-dev.tar
+#    - name: Upload docker tarball
+#      uses: actions/upload-artifact@v3
+#      with:
+#          name: lsstdesc-td-env-dev
+#          path: /tmp/desc/lsstdesc-td-env-dev.tar
diff --git a/nersc/setup_td.sh b/nersc/setup_td.sh
@@ -45,6 +45,8 @@ export TD_SL=${TD}/SL
 export TD_SN=${TD}/SN
 export TD_SOFTWARE=${TD}/SOFTWARE
 
+export VERSION_LIBPYTHON=3.8
+
 if [[ -z "$keepenv" ]] && [[ -z $SHIFTER_RUNTIME ]];
 then
   module purge
@@ -109,7 +111,7 @@ then
   #export CFITSIO_DIR=$CONDA_PREFIX
 
   export PYTHONPATH=$PYTHONPATH:$DESC_TD_INSTALL
-
+  
   # SLURM_JOB_ID is set only on compute nodes
   # DESC_TD_KEEP_MPI will be user-controlled way to keep MPI set up 
   #if [[ -z "$DESC_TD_KEEP_MPI" && -z "$SLURM_JOB_ID" ]];
@@ -127,6 +129,7 @@ fi
 
 # SN Environment Variables
 export SNANA_DIR="$TD_SOFTWARE/SNANA"
+export PYTHONPATH=$PYTHONPATH:$SNANA_DIR/src
 
 export SNDATA_ROOT="$TD_SN/SNANA/SNDATA_ROOT"
 export SNANA_TESTS="$TD_SN/SNANA/SNANA_TESTS"
@@ -146,8 +149,8 @@ export PIPPIN_OUTPUT="/global/cscratch1/sd/kessler/PIPPIN_OUTPUT"
 export PIPPIN_DIR="$TD_SOFTWARE/Pippin"
 export SBATCH_TEMPLATES="$SNANA_LSST_ROOT/SBATCH_TEMPLATES"
 export SNANA_DEBUG="$SNANA_LSST_USERS/kessler/debug"
-export SNANA_SETUP_COMMAND="source $TD/setup_td_dev.sh"
-export SNANA_IMAGE_DOCKER="lsstdesc/td-env:dev"
+export SNANA_SETUP_COMMAND="source $TD/setup_td.sh"
+export SNANA_IMAGE_DOCKER="lsstdesc/td-env:stable"
 
 
 export PATH=$PATH:${SNANA_DIR}/bin:${SNANA_DIR}/util:${PIPPIN_DIR}

diff --git a/nersc/setup_td_dev.sh b/nersc/setup_td_dev.sh
@@ -56,6 +56,9 @@ export VERSION_LIBPYTHON=3.8
 
 export PYSYN_CDBS=${TD_SOFTWARE}/bayeSN/synphot/grp/redcat/trds
 
+export VERSION_LIBPYTHON=3.8
+
+
 if [[ -z "$keepenv" ]] && [[ -z $SHIFTER_RUNTIME ]];
 then
   module purge
@@ -117,7 +120,7 @@ then
   export CFITSIO_DIR=$DESC_TD_INSTALL/conda/envs/$LSST_CONDA_ENV_NAME
 
   export PYTHONPATH=$PYTHONPATH:$DESC_TD_INSTALL
-
+  
   # SLURM_JOB_ID is set only on compute nodes
   # DESC_TD_KEEP_MPI will be user-controlled way to keep MPI set up 
   #if [[ -z "$DESC_TD_KEEP_MPI" && -z "$SLURM_JOB_ID" ]];