sed s/compier/compiler/
This commit is contained in:
parent
5ad6adedec
commit
debf66a1e8
12
mpi.prov
12
mpi.prov
@ -35,7 +35,7 @@ elfdepsargs="$@"
|
||||
# Search for all MPI implementations:
|
||||
# - Search all modules which start with mpi
|
||||
# - For each module, store $MPI_DIR -> $MPI_COMPILER in assoc. array
|
||||
declare -A mpi_compier_for_dir
|
||||
declare -A mpi_compiler_for_dir
|
||||
if [ -e /etc/profile.d/modules.sh ]; then
|
||||
. /etc/profile.d/modules.sh;
|
||||
|
||||
@ -49,9 +49,9 @@ if [ -e /etc/profile.d/modules.sh ]; then
|
||||
|
||||
for module in $(module -t avail 2>&1 | grep "^mpi/"); do
|
||||
module load $module
|
||||
mpi_compier_for_dir[${MPI_HOME}]=${MPI_COMPILER}
|
||||
mpi_compier_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
|
||||
mpi_compier_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER}
|
||||
mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
|
||||
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
|
||||
mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER}
|
||||
module unload $module
|
||||
done
|
||||
fi
|
||||
@ -71,9 +71,9 @@ if [ -x /usr/lib/rpm/elfdeps -a -n "$filelist" ]; then
|
||||
|
||||
# If the path to the scanned binary starts with a known mpi binary directory,
|
||||
# append the corresponding ($MPI_COMPILER) to the provides string
|
||||
for mpi_dir in "${!mpi_compier_for_dir[@]}"; do
|
||||
for mpi_dir in "${!mpi_compiler_for_dir[@]}"; do
|
||||
if [[ "$file" == "$buildroot$mpi_dir"* ]]; then
|
||||
prov="${prov}(${mpi_compier_for_dir[$mpi_dir]})"
|
||||
prov="${prov}(${mpi_compiler_for_dir[$mpi_dir]})"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
12
mpi.req
12
mpi.req
@ -36,7 +36,7 @@ elfdepsargs="$@"
|
||||
# - Search all modules which start with mpi
|
||||
# - For each module, store $MPI_DIR -> $MPI_COMPILER and
|
||||
# $MPI_COMPILER -> $MPI_LIB in assoc. array
|
||||
declare -A mpi_compier_for_dir
|
||||
declare -A mpi_compiler_for_dir
|
||||
declare -A mpi_lib_for_compiler
|
||||
if [ -e /etc/profile.d/modules.sh ]; then
|
||||
. /etc/profile.d/modules.sh;
|
||||
@ -51,9 +51,9 @@ if [ -e /etc/profile.d/modules.sh ]; then
|
||||
|
||||
for module in $(module -t avail 2>&1 | grep "^mpi/"); do
|
||||
module load $module
|
||||
mpi_compier_for_dir[${MPI_HOME}]=${MPI_COMPILER}
|
||||
mpi_compier_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
|
||||
mpi_compier_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER}
|
||||
mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
|
||||
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
|
||||
mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER}
|
||||
mpi_lib_for_compiler[${MPI_COMPILER}]=${MPI_LIB}
|
||||
module unload $module
|
||||
done
|
||||
@ -71,9 +71,9 @@ if [ -x /usr/lib/rpm/elfdeps -a -n "$filelist" ]; then
|
||||
|
||||
# Check whether the scanned binary is inside a know mpi binary dir
|
||||
mpi_comp=
|
||||
for mpi_dir in "${!mpi_compier_for_dir[@]}"; do
|
||||
for mpi_dir in "${!mpi_compiler_for_dir[@]}"; do
|
||||
if [[ "$file" == "$buildroot$mpi_dir"* ]]; then
|
||||
mpi_comp="${mpi_compier_for_dir[$mpi_dir]}"
|
||||
mpi_comp="${mpi_compiler_for_dir[$mpi_dir]}"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
Loading…
Reference in New Issue
Block a user