From 24d924d1adaa83db83e7f91151b669a221e89720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Doll=C3=A9?= Date: Fri, 11 Mar 2016 14:57:52 +0100 Subject: [PATCH] Cleanup and update hpc-login path --- etc/feelpprc.d/{ => backup}/fermi.sh | 0 etc/feelpprc.d/{ => backup}/froggy.sh | 0 etc/feelpprc.d/backup/hpc-login.sh | 66 ++++++++++++++++++++ etc/feelpprc.d/{ => backup}/turing.sh | 0 etc/feelpprc.d/hpc-login.sh | 88 +++++++-------------------- etc/feelpprc.d/template.sh | 59 ------------------ 6 files changed, 88 insertions(+), 125 deletions(-) rename etc/feelpprc.d/{ => backup}/fermi.sh (100%) rename etc/feelpprc.d/{ => backup}/froggy.sh (100%) create mode 100755 etc/feelpprc.d/backup/hpc-login.sh rename etc/feelpprc.d/{ => backup}/turing.sh (100%) mode change 100755 => 100644 etc/feelpprc.d/hpc-login.sh delete mode 100755 etc/feelpprc.d/template.sh diff --git a/etc/feelpprc.d/fermi.sh b/etc/feelpprc.d/backup/fermi.sh similarity index 100% rename from etc/feelpprc.d/fermi.sh rename to etc/feelpprc.d/backup/fermi.sh diff --git a/etc/feelpprc.d/froggy.sh b/etc/feelpprc.d/backup/froggy.sh similarity index 100% rename from etc/feelpprc.d/froggy.sh rename to etc/feelpprc.d/backup/froggy.sh diff --git a/etc/feelpprc.d/backup/hpc-login.sh b/etc/feelpprc.d/backup/hpc-login.sh new file mode 100755 index 0000000..57de79a --- /dev/null +++ b/etc/feelpprc.d/backup/hpc-login.sh @@ -0,0 +1,66 @@ +################################################################################ +# Author(s): Guillaume dollé +# Machine: Mesocentre Strasbourg +################################################################################ + +#------------------------------------------------------------------------------ +# CUSTOM PATH +#------------------------------------------------------------------------------ + +# Default feel++ local install +export FEELPP_SHARE_PATH=/usr/local/feelpp + +# Default feel++ module path. +#export FEELPP_MODULE_PATH=/usr/local/feelpp/config/modules + +# Custom feel++ modules +export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/files/$FEELPP_HPCNAME +export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/profiles/$FEELPP_HPCNAME + +# Compilers +export FEELPP_CLANG33_PATH=$FEELPP_SHARE_PATH/clang-3.3 +export FEELPP_CLANG34_PATH=$FEELPP_SHARE_PATH/clang-3.4 +export FEELPP_CLANG35_PATH=$FEELPP_SHARE_PATH/clang-3.5 +export FEELPP_GCC463_PATH=$FEELPP_SHARE_PATH/gcc-3.6.3 +export FEELPP_GCC472_PATH=$FEELPP_SHARE_PATH/gcc-4.7.2 +export FEELPP_GCC473_PATH=$FEELPP_SHARE_PATH/gcc-4.7.3 +export FEELPP_GCC481_PATH=$FEELPP_SHARE_PATH/gcc-4.8.1 +export FEELPP_CMAKE28_PATH=$FEELPP_SHARE_PATH/cmake +export FEELPP_CMAKE302_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/cmake-3.0.2 + +# Libraries +export FEELPP_LIBSTCPPV3_GCC472_PATH=$FEELPP_SHARE_PATH/gcc-4.7.2 +export FEELPP_BOOST149_AUTOCC_PATH=$FEELPP_SHARE_PATH/boost +export FEELPP_BOOST149_GCC472_PATH=$FEELPP_SHARE_PATH/boost/gcc-4.7.2 +export FEELPP_BOOST154_GCC463_PATH=$FEELPP_SHARE_PATH/boost/1.54 +export FEELPP_BOOST155_PATH=$FEELPP_SHARE_PATH/boost/1.55 +export FEELPP_BOOST156_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/boost-1.56 +export FEELPP_PETSC33_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.3 +export FEELPP_PETSC342_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.4.2 +export FEELPP_PETSC351_OMPI163_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.5.1 +export FEELPP_PETSC351_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/petsc-3.5.1 +export FEELPP_SLEPC342_GCC_PATH=$FEELPP_SHARE_PATH/slepc/3.4.2 +export FEELPP_SLEPC350_GCC_PATH=$FEELPP_SHARE_PATH/slepc/3.5.0 +export FEELPP_SLEPC351_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/slepc-3.5.1 +export FEELPP_HDF51813_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/hdf5-1.8.13 + +# Mpi +export FEELPP_OPENMPI163_AUTOCC_PATH=$FEELPP_SHARE_PATH/openmpi/1.6.3 +export FEELPP_OPENMPI163_GCC472_PATH=$FEELPP_SHARE_PATH/openmpi/1.6.3/gcc-4.7.2 +export FEELPP_OPENMPI181_PATH=$FEELPP_SHARE_PATH/openmpi/1.8.1 +export FEELPP_OPENMPI182_PATH=$FEELPP_SHARE_PATH/openmpi/1.8.2 +export FEELPP_OPENMPI183_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/openmpi-1.8.3 + +# Science +export FEELPP_GMSH261_GCC_PATH=$FEELPP_SHARE_PATH/gmsh/2.6.1 +export FEELPP_GMSH282_GCC_PATH=$FEELPP_SHARE_PATH/gmsh/2.8.2 +export FEELPP_GMSH285_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/gmsh-2.8.5 + +# Tools +export FEELPP_PARAVIEW420_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/ParaView-v4.2.0 + +#------------------------------------------------------------------------------ +# CUSTOM COMMANDS +#------------------------------------------------------------------------------ + +module load batch/slurm diff --git a/etc/feelpprc.d/turing.sh b/etc/feelpprc.d/backup/turing.sh similarity index 100% rename from etc/feelpprc.d/turing.sh rename to etc/feelpprc.d/backup/turing.sh diff --git a/etc/feelpprc.d/hpc-login.sh b/etc/feelpprc.d/hpc-login.sh old mode 100755 new mode 100644 index 57de79a..8ff9676 --- a/etc/feelpprc.d/hpc-login.sh +++ b/etc/feelpprc.d/hpc-login.sh @@ -1,66 +1,22 @@ -################################################################################ -# Author(s): Guillaume dollé -# Machine: Mesocentre Strasbourg -################################################################################ - -#------------------------------------------------------------------------------ -# CUSTOM PATH -#------------------------------------------------------------------------------ - -# Default feel++ local install -export FEELPP_SHARE_PATH=/usr/local/feelpp - -# Default feel++ module path. -#export FEELPP_MODULE_PATH=/usr/local/feelpp/config/modules - -# Custom feel++ modules -export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/files/$FEELPP_HPCNAME -export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/profiles/$FEELPP_HPCNAME - -# Compilers -export FEELPP_CLANG33_PATH=$FEELPP_SHARE_PATH/clang-3.3 -export FEELPP_CLANG34_PATH=$FEELPP_SHARE_PATH/clang-3.4 -export FEELPP_CLANG35_PATH=$FEELPP_SHARE_PATH/clang-3.5 -export FEELPP_GCC463_PATH=$FEELPP_SHARE_PATH/gcc-3.6.3 -export FEELPP_GCC472_PATH=$FEELPP_SHARE_PATH/gcc-4.7.2 -export FEELPP_GCC473_PATH=$FEELPP_SHARE_PATH/gcc-4.7.3 -export FEELPP_GCC481_PATH=$FEELPP_SHARE_PATH/gcc-4.8.1 -export FEELPP_CMAKE28_PATH=$FEELPP_SHARE_PATH/cmake -export FEELPP_CMAKE302_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/cmake-3.0.2 - -# Libraries -export FEELPP_LIBSTCPPV3_GCC472_PATH=$FEELPP_SHARE_PATH/gcc-4.7.2 -export FEELPP_BOOST149_AUTOCC_PATH=$FEELPP_SHARE_PATH/boost -export FEELPP_BOOST149_GCC472_PATH=$FEELPP_SHARE_PATH/boost/gcc-4.7.2 -export FEELPP_BOOST154_GCC463_PATH=$FEELPP_SHARE_PATH/boost/1.54 -export FEELPP_BOOST155_PATH=$FEELPP_SHARE_PATH/boost/1.55 -export FEELPP_BOOST156_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/boost-1.56 -export FEELPP_PETSC33_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.3 -export FEELPP_PETSC342_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.4.2 -export FEELPP_PETSC351_OMPI163_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.5.1 -export FEELPP_PETSC351_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/petsc-3.5.1 -export FEELPP_SLEPC342_GCC_PATH=$FEELPP_SHARE_PATH/slepc/3.4.2 -export FEELPP_SLEPC350_GCC_PATH=$FEELPP_SHARE_PATH/slepc/3.5.0 -export FEELPP_SLEPC351_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/slepc-3.5.1 -export FEELPP_HDF51813_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/hdf5-1.8.13 - -# Mpi -export FEELPP_OPENMPI163_AUTOCC_PATH=$FEELPP_SHARE_PATH/openmpi/1.6.3 -export FEELPP_OPENMPI163_GCC472_PATH=$FEELPP_SHARE_PATH/openmpi/1.6.3/gcc-4.7.2 -export FEELPP_OPENMPI181_PATH=$FEELPP_SHARE_PATH/openmpi/1.8.1 -export FEELPP_OPENMPI182_PATH=$FEELPP_SHARE_PATH/openmpi/1.8.2 -export FEELPP_OPENMPI183_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/openmpi-1.8.3 - -# Science -export FEELPP_GMSH261_GCC_PATH=$FEELPP_SHARE_PATH/gmsh/2.6.1 -export FEELPP_GMSH282_GCC_PATH=$FEELPP_SHARE_PATH/gmsh/2.8.2 -export FEELPP_GMSH285_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/gmsh-2.8.5 - -# Tools -export FEELPP_PARAVIEW420_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/ParaView-v4.2.0 - -#------------------------------------------------------------------------------ -# CUSTOM COMMANDS -#------------------------------------------------------------------------------ - -module load batch/slurm +FEELPP_CLANG33_PATH=/usr/local/feelpp/clang-3.3 +FEELPP_CLANG34_PATH=/usr/local/feelpp/clang-3.4 +FEELPP_CLANG35_PATH=/usr/local/feelpp/clang-3.5 +FEELPP_GCC463_PATH=/usr/local/feelpp/gcc-4.6.3 +FEELPP_GCC472_PATH=/usr/local/feelpp/gcc-4.7.2 +FEELPP_GCC473_PATH=/usr/local/feelpp/gcc-4.7.3 +FEELPP_GCC481_PATH=/usr/local/feelpp/gcc-4.8.1 +FEELPP_BOOST155_PATH=/usr/local/feelpp/boost/1.55 +FEELPP_BOOST156_PATH=/usr/local/feelpp/install/with-gcc-4.8.1/with-openmpi-1.8.3/boost-1.56 +FEELPP_HDF51813_PATH=/usr/local/feelpp/install/with-gcc-4.8.1/with-openmpi-1.8.3/hdf5-1.8.13 +FEELPP_LIBSTDC++V3_GCC472_PATH=/usr/local/feelpp/gcc-4.7.2 +FEELPP_PETSC342_PATH=/usr/local/feelpp/petsc/3.4.2 +FEELPP_PETSC351_PATH=/usr/local/feelpp/petsc/3.5.1 +FEELPP_PETSC351_OMPI182_PATH=/usr/local/feelpp/petsc/3.5.1_ompi182 +FEELPP_SLEPC342_PATH=/usr/local/feelpp/slepc/3.4.2 +FEELPP_SLEPC351_PATH=/usr/local/feelpp/slepc/3.5.1 +FEELPP_OPENMPI163_AUTOCC_PATH=/usr/local/feelpp/openmpi/1.6.3 +FEELPP_OPENMPI163_GCC472_PATH=/usr/local/feelpp/openmpi/1.6.3/gcc-4.7.2 +FEELPP_OPENMPI182_PATH=/usr/local/feelpp/openmpi/1.8.2 +FEELPP_OPENMPI183_PATH=/usr/local/feelpp/install/with-gcc-4.8.1/openmpi-1.8.3 +FEELPP_GMSH285_PATH=/usr/local/feelpp/gmsh/2.8.5 +FEELPP_CMAKE302_PATH=/usr/local/feelpp/install/with-gcc-4.8.1/cmake-3.0.2 diff --git a/etc/feelpprc.d/template.sh b/etc/feelpprc.d/template.sh deleted file mode 100755 index d5c3dd5..0000000 --- a/etc/feelpprc.d/template.sh +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# Author(s): Guillaume dollé -# Cluster config template v.1.0 (2014) -# -# NOTE: -# - Rename this script with the HOSTNAME of the machine. -# - Adapt path to fit your custom installation -# -################################################################################ - -#------------------------------------------------------------------------------ -# CUSTOM PATH -#------------------------------------------------------------------------------ - -# Default feel++ local install -export FEELPP_SHARE_PATH=/usr/local/feelpp - -# Default feel++ module path. -#export FEELPP_MODULE_PATH=/usr/local/feelpp/config/modules - -# Custom feel++ modules -export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/files//$FEELPP_HPCNAME -export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/profiles//$FEELPP_HPCNAME - -# Compilers -export FEELPP_CLANG33_PATH= -export FEELPP_CLANG34_PATH= -export FEELPP_GCC463_PATH= -export FEELPP_GCC472_PATH= -export FEELPP_GCC473_PATH= -export FEELPP_GCC481_PATH= -export FEELPP_CMAKE28_PATH= - -# Libraries -export FEELPP_BOOST149_AUTOCC_PATH= -export FEELPP_BOOST154_GCC_PATH= -export FEELPP_BOOST154_GCC463_PATH= -export FEELPP_BOOST155_PATH= -export FEELPP_PETSC33_GCC_PATH= -export FEELPP_PETSC342_GCC_PATH= -export FEELPP_PETSC351_GCC_PATH= -export FEELPP_SLEPC342_GCC_PATH= -export FEELPP_SLEPC350_GCC_PATH= - -# Mpi -export FEELPP_OPENMPI163_AUTOCC_PATH= -export FEELPP_OPENMPI163_GCC463_PATH= -export FEELPP_OPENMPI181_PATH= - -# Science -export FEELPP_GMSH261_GCC_PATH= -export FEELPP_GMSH282_GCC_PATH= -export FEELPP_GMSH285_GCC_PATH= - -#------------------------------------------------------------------------------ -# CUSTOM COMMANDS -#------------------------------------------------------------------------------ - -# <... add your commands here ...>