Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More attempts to fix XC-x86 module #13637

Merged
merged 1 commit into from
Aug 2, 2019
Merged

More attempts to fix XC-x86 module #13637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion util/build_configs/cray-internal/setenv-xc-x86_64.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ else

# pin to mpich/libsci versions compatible with the gen compiler
load_module_version cray-mpich 7.7.7
load_module_version cray-libsci 18.07.1
load_module_version cray-libsci 19.04.1.1
}

function load_target_cpu() {
Expand Down
8 changes: 5 additions & 3 deletions util/build_configs/module-functions.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,10 @@ function load_module_version() {
bashDebugPop
found=$( get_module_version $target_module )
fi
if [ -z "$found" -o "$found" != $target_version ]; then
log_error "Failed: $bug_msg"
exit 2
if [ "$target_version" != "default" ] ; then
if [ -z "$found" -o "$found" != $target_version ]; then
log_error "Failed: $bug_msg"
exit 2
fi
fi
}