pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-07-09 07:10:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

modbuild: pass YAML configuration to library

Browse Source
This commit is contained in:
gsell
2023-11-17 15:37:28 +01:00
parent a17340fbfb
commit 0080e9d6f3
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libpbuild.bash
+10 -1
View File
@@ -892,8 +892,17 @@ pbuild.build_module_legacy(){
}
readonly -f pbuild.build_module_legacy
declare -n Config
declare -- Systems
pbuild.build_module_yaml(){
_build_module "$@"
local -- module_name="$1"
local -- module_version="$2"
Config=$3
local -- module_relstage="${Config['relstage']}"
local -- tmp="${Config['systems']//::/, }"
Systems="${tmp:1:-1}"
shift 3
_build_module "${module_name}" "${module_version}" "${module_relstage}" "$@"
}
readonly -f pbuild.build_module_yaml
Pmodules/modbuild.in
+10 -24
View File
@@ -858,9 +858,6 @@ build_modules_yaml_v1(){
local -- module_name="$1"
local -- module_version="$2"
local -n module_cfg="$3"
shift 3
local -a module_deps=( "$@" )
local -a with_compiler=()
get_group_deps "${module_cfg['group_deps']}" 'compiler' with_compiler
debug "${with_compiler[@]}"
@@ -869,9 +866,9 @@ build_modules_yaml_v1(){
for compiler in "${with_compiler[@]}"; do
pbuild.build_module_yaml \
"${module_name}" "${module_version}" \
"${module_cfg['relstage']}" \
"$3" \
"${compiler}" \
"${module_deps[@]}"
"${@:4}"
done
}
@@ -879,9 +876,6 @@ build_modules_yaml_v1(){
local -- module_name="$1"
local -- module_version="$2"
local -n module_cfg="$3"
shift 3
local -a module_deps=( "$@" )
local -a with_compiler=()
local -a with_hdf5=()
get_group_deps "${module_cfg['group_deps']}" 'compiler' with_compiler
@@ -897,10 +891,10 @@ build_modules_yaml_v1(){
debug " build requires: ${build_requires[@]}"
pbuild.build_module_yaml \
"${module_name}" "${module_version}" \
"${module_cfg['relstage']}" \
"$3" \
"${compiler}" \
"${hdf5}" \
"${module_deps[@]}"
"${@:4}"
done
done
}
@@ -910,9 +904,6 @@ build_modules_yaml_v1(){
local -- module_name="$1"
local -- module_version="$2"
local -n module_cfg="$3"
shift 3
local -a module_deps=( "$@" )
local -a with_compiler=()
local -a with_mpi=()
get_group_deps "${module_cfg['group_deps']}" 'compiler' with_compiler
@@ -930,10 +921,10 @@ build_modules_yaml_v1(){
debug " build requires: ${build_requires[@]}"
pbuild.build_module_yaml \
"${module_name}" "${module_version}" \
"${module_cfg['relstage']}" \
"$3" \
"${compiler}" \
"${mpi}" \
"${module_deps[@]}"
"${@:4}"
done
done
}
@@ -942,9 +933,6 @@ build_modules_yaml_v1(){
local -- module_name="$1"
local -- module_version="$2"
local -n module_cfg="$3"
shift 3
local -a module_deps=( "$@" )
local -a with_compiler=()
local -a with_mpi=()
local -a with_hdf5=()
@@ -967,11 +955,11 @@ build_modules_yaml_v1(){
debug " build requires: ${build_requires[@]}"
pbuild.build_module_yaml \
"${module_name}" "${module_version}" \
"${module_cfg['relstage']}" \
"$3" \
"${compiler}" \
"${mpi}" \
"${hdf5}" \
"${module_deps[@]}"
"${@:4}"
done
done
done
@@ -982,12 +970,10 @@ build_modules_yaml_v1(){
local -- module_name="$1"
local -- module_version="$2"
local -n module_cfg="$3"
shift 3
local -a module_deps=( "$@" )
pbuild.build_module_yaml \
"${module_name}" "${module_version}" \
"${module_cfg['relstage']}" \
"${module_deps[@]}"
"$3" \
"${@:4}"
}
set_urls() {