changeset 96:e1a05ead2b1c

try to do csing correctly on compute nodes
author Henry S. Thompson <ht@inf.ed.ac.uk>
date Fri, 08 Sep 2023 18:05:57 +0100
parents 86df63d251cf
children 135a8c56dcc2
files .bashrc .csing_init
diffstat 2 files changed, 18 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.bashrc	Fri Sep 08 09:29:25 2023 +0100
+++ b/.bashrc	Fri Sep 08 18:05:57 2023 +0100
@@ -39,22 +39,18 @@
  # fix $W -> \$W after tab completion
  shopt -u progcomp
 
- if [ -d /mnt/lustre/indy2lfs/sw/ ]
- then
-  # We have access to mounted modules from Cirrus, use anaconda python libs,
-  #  in particular, tkinter for matplotlib
-  export MODULES=/mnt/lustre/indy2lfs/sw
-  export SING=csing
-  export PYTHONPATH=:/usr/lib/python39.zip:/usr/lib/python3.9:/usr/lib/python3.9/lib-dynload:/usr/local/lib/python3.9/dist-packages:/usr/lib/python3/dist-packages
-  PATH=$MODULES/anaconda/anaconda3-2021.11/bin:$PATH
-  export XDG_RUNTIME_DIR=/tmp/runtime-$USER
- fi
- 
 fi
 
+
 EDITOR=xemacs
 
-PATH=$PATH:$HOME/.local/bin:$HOME/bin
+
+if [ -d /mnt/lustre/indy2lfs/sw/ ]
+then
+  . .csing_init
+fi
+
+
 
 HHOME=/home/dc007/dc007/$(whoami)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.csing_init	Fri Sep 08 18:05:57 2023 +0100
@@ -0,0 +1,10 @@
+# sourced by .bashrc if we're csinging, as well as via $BASHENV
+
+# We have access to mounted modules from Cirrus, use anaconda python libs,
+#  in particular, tkinter for matplotlib
+export MODULES=/mnt/lustre/indy2lfs/sw
+export ANACONDA=$MODULES/anaconda/anaconda3-2021.11
+export SING=csing
+export PYTHONPATH=:/usr/lib/python39.zip:/usr/lib/python3.9:/usr/lib/python3.9/lib-dynload:/usr/local/lib/python3.9/dist-packages:$ANACONDA/lib/python3.9:$ANACONDA/lib/python3.9/site-packages:$ANACONDA/lib/python3.9/lib-dynload
+PATH=$ANACONDA/bin:$PATH
+export XDG_RUNTIME_DIR=/tmp/runtime-$USER