From dbba3c9f5467a1a5d1ce51d405f39f8caa923d11 Mon Sep 17 00:00:00 2001 From: Romain Boman <romain.boman@gmail.com> Date: Fri, 14 Aug 2020 14:05:20 +0200 Subject: [PATCH] add new spirou --- cfg/spirou/compilers.bashrc | 25 +++++++++++++++++++++++++ cfg/spirou/compilers.profile | 27 +++++++++++++++++++++++++++ cfg/spirou/misc.bashrc | 3 +++ 3 files changed, 55 insertions(+) create mode 100644 cfg/spirou/compilers.bashrc create mode 100644 cfg/spirou/compilers.profile create mode 100644 cfg/spirou/misc.bashrc diff --git a/cfg/spirou/compilers.bashrc b/cfg/spirou/compilers.bashrc new file mode 100644 index 0000000..9655075 --- /dev/null +++ b/cfg/spirou/compilers.bashrc @@ -0,0 +1,25 @@ +# Intel compiler and/or TBB/MKL +# +# EXPLANATIONS [RB]: +# In practise, the call to "compilervars.sh" or ("mklvars.sh", etc) sets PATH, LD_LIBRARY_PATH. +# If we want these variables to be set system-wide, it should be run in .profile +# +# BUT +# 1. the gnome display manager unset LD_LIBRARY_PATH +# +# 2. if the login shell is "dash", the script cannot be called +# (we cannot add an extra argument to a sourced script with dash). +# THEN +# => we call the scripts in both places (.bashrc & .profile) +# => the env is cleaned in "loop.sh", removing duplicates if the .profile was actually read by bash +# +# SPECIAL CASE: "at" job +# => the environment is OK and kept, but "LD_LIBRARY_PATH" is set to nothing by "at" +# => the .profile is then rerun manually in our scripts (with bash) +# should we run also .bashrc as LD_LIBRARY_PATH should be set here on systems with gnome? +# => duplicates are finally removed by loop.sh + +if [ -d /opt/intel ] ; then + . /opt/intel/mkl/bin/mklvars.sh intel64 + . /opt/intel/tbb/bin/tbbvars.sh intel64 +fi diff --git a/cfg/spirou/compilers.profile b/cfg/spirou/compilers.profile new file mode 100644 index 0000000..47e3980 --- /dev/null +++ b/cfg/spirou/compilers.profile @@ -0,0 +1,27 @@ +# Intel compiler and/or TBB/MKL +# +# EXPLANATIONS [RB]: +# In practise, the call to "compilervars.sh" or ("mklvars.sh", etc) sets PATH, LD_LIBRARY_PATH. +# If we want these variables to be set system-wide, it should be run in .profile +# +# BUT +# 1. the gnome display manager unset LD_LIBRARY_PATH +# +# 2. if the login shell is "dash", the script cannot be called +# (we cannot add an extra argument to a sourced script with dash). +# THEN +# => we call the scripts in both places (.bashrc & .profile) +# => the env is cleaned in "loop.sh", removing duplicates if the .profile was actually read by bash +# +# SPECIAL CASE: "at" job +# => the environment is OK and kept, but "LD_LIBRARY_PATH" is set to nothing by "at" +# => the .profile is then rerun manually in our scripts (with bash) +# should we run also .bashrc as LD_LIBRARY_PATH should be set here on systems with gnome? +# => duplicates are finally removed by loop.sh + +if [ -n "$BASH_VERSION" ]; then + if [ -d /opt/intel ] ; then + . /opt/intel/mkl/bin/mklvars.sh intel64 + . /opt/intel/tbb/bin/tbbvars.sh intel64 + fi +fi diff --git a/cfg/spirou/misc.bashrc b/cfg/spirou/misc.bashrc new file mode 100644 index 0000000..d3fa8f4 --- /dev/null +++ b/cfg/spirou/misc.bashrc @@ -0,0 +1,3 @@ +alias a2ps='a2ps --pro=color --line-numbers=5 --medium=A4' +alias plotdigitizer='java -Xmx256m -jar /opt/PlotDigitizer/PlotDigitizer.jar' +alias open='xdg-open' -- GitLab