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

cm_test_all_sandia: more caraway module updates and cleanup #2145

Merged
merged 1 commit into from
Mar 15, 2024
+6 −14
Merged

cm_test_all_sandia: more caraway module updates and cleanup #2145

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
20 changes: 6 additions & 14 deletions scripts/cm_test_all_sandia
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,8 +634,8 @@ elif [ "$MACHINE" = "caraway" ]; then
# report_and_log_test_result: only testing compilation of code for now,
# output description and success based only on build succes; build time output (no run-time)

BASE_MODULE_LIST="cmake/3.19.3,<COMPILER_NAME>/<COMPILER_VERSION>"
ROCM520_MODULE_LIST="$BASE_MODULE_LIST,openblas/0.3.20/rocm/5.2.0"
BASE_MODULE_LIST="cmake,<COMPILER_NAME>/<COMPILER_VERSION>"
ROCM520_MODULE_LIST="$BASE_MODULE_LIST,openblas/0.3.20"

HIPCLANG_BUILD_LIST="Hip_Serial"
HIPCLANG_WARNING_FLAGS=""
Expand All @@ -647,10 +647,7 @@ elif [ "$MACHINE" = "caraway" ]; then
else
# Format: (compiler module-list build-list exe-name warning-flag)
COMPILERS=("rocm/5.2.0 $BASE_MODULE_LIST $HIPCLANG_BUILD_LIST hipcc $HIPCLANG_WARNING_FLAGS"
"gcc/8.2.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
"gcc/9.2.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
"gcc/10.2.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
"gcc/11.2.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
"gcc/11.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
)
fi

Expand All @@ -666,28 +663,23 @@ elif [ "$MACHINE" = "vega90a_caraway" ]; then
# output description and success based only on build succes; build time output (no run-time)

BASE_MODULE_LIST="cmake,<COMPILER_NAME>/<COMPILER_VERSION>"
ROCM520_MODULE_LIST="$BASE_MODULE_LIST,openblas/0.3.20/rocm/5.2.0"
ROCM520_MODULE_LIST="$BASE_MODULE_LIST,openblas/0.3.20"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still correct to call the variables ROCM520_?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can modify the name, the important thing is to keep a separate list for rocm/5.2.0 vs rocm/5.6.1+rocm/6.0.0, the tpl (i.e. openblas) supported with rocm/5.2.0 is different from the other rocm versions

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name is fine, I was not sure if we were still having modules with rocm/5.2.0 but if we do then that's totally fine!

ROCM_TPL_MODULE_LIST="$BASE_MODULE_LIST,openblas/0.3.23"

HIPCLANG_BUILD_LIST="Hip_Serial"
HIPCLANG_WARNING_FLAGS=""

if [ "$SPOT_CHECK_TPLS" = "True" ]; then
# Format: (compiler module-list build-list exe-name warning-flag)
COMPILERS=("rocm/5.6.0 $ROCM520_MODULE_LIST $HIPCLANG_BUILD_LIST hipcc $HIPCLANG_WARNING_FLAGS"
"rocm/5.6.1 $ROCM_TPL_MODULE_LIST $HIPCLANG_BUILD_LIST hipcc $HIPCLANG_WARNING_FLAGS"
COMPILERS=("rocm/5.6.1 $ROCM_TPL_MODULE_LIST $HIPCLANG_BUILD_LIST hipcc $HIPCLANG_WARNING_FLAGS"
"rocm/6.0.0 $ROCM_TPL_MODULE_LIST $HIPCLANG_BUILD_LIST hipcc $HIPCLANG_WARNING_FLAGS"
)
else
# Format: (compiler module-list build-list exe-name warning-flag)
COMPILERS=("rocm/5.2.0 $BASE_MODULE_LIST $HIPCLANG_BUILD_LIST hipcc $HIPCLANG_WARNING_FLAGS"
"rocm/5.6.0 $BASE_MODULE_LIST $HIPCLANG_BUILD_LIST hipcc $HIPCLANG_WARNING_FLAGS"
"rocm/5.6.1 $BASE_MODULE_LIST $HIPCLANG_BUILD_LIST hipcc $HIPCLANG_WARNING_FLAGS"
"rocm/6.0.0 $BASE_MODULE_LIST $HIPCLANG_BUILD_LIST hipcc $HIPCLANG_WARNING_FLAGS"
"gcc/8.2.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
"gcc/9.2.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
"gcc/10.2.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
"gcc/11.2.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
"gcc/11.3.0 $BASE_MODULE_LIST $GCC_BUILD_LIST g++ $GCC_WARNING_FLAGS"
)
fi

Expand Down