-
Notifications
You must be signed in to change notification settings - Fork 714
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to 4.2.0 (which includes bug fixes) and added new patch that …
…fixes some tests
- Loading branch information
1 parent
62ebaa5
commit 445a2c2
Showing
3 changed files
with
125 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
easybuild/easyconfigs/e/Extrae/Extrae-4.2.0-fix-hw-counters-checks.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| diff -Nru extrae-4.2.0.orig/tests/functional/hw-counters/check_Extrae_PAPI_TOT_CYC.sh extrae-4.2.0/tests/functional/hw-counters/check_Extrae_PAPI_TOT_CYC.sh | ||
| --- extrae-4.2.0.orig/tests/functional/hw-counters/check_Extrae_PAPI_TOT_CYC.sh 2024-07-01 16:12:03.454963219 +0200 | ||
| +++ extrae-4.2.0/tests/functional/hw-counters/check_Extrae_PAPI_TOT_CYC.sh 2024-07-02 10:26:41.603395579 +0200 | ||
| @@ -11,6 +11,20 @@ | ||
| ../../../src/merger/mpi2prv -f TRACE.mpits -o ${TRACE}.prv | ||
|
|
||
| # Check | ||
| +if ! command -v papi_avail &> /dev/null | ||
| +then | ||
| + echo "papi_avail could not be found" | ||
| + exit 0 | ||
| +fi | ||
| + | ||
| +PAPI_TOT_CYC_available=`papi_avail | grep PAPI_TOT_CYC | awk '{print $3}'` | ||
| +if [[ "$PAPI_TOT_CYC_available" == No ]] | ||
| +then | ||
| + echo "PAPI_TOT_CYC is not available" | ||
| + exit 0 | ||
| +fi | ||
| + | ||
| + | ||
| CheckEntryInPCF ${TRACE}.pcf PAPI_TOT_CYC | ||
|
|
||
| rm -fr TRACE* set-0 ${TRACE}.??? | ||
| diff -Nru extrae-4.2.0.orig/tests/functional/hw-counters/check_Extrae_PAPI_TOT_INS.sh extrae-4.2.0/tests/functional/hw-counters/check_Extrae_PAPI_TOT_INS.sh | ||
| --- extrae-4.2.0.orig/tests/functional/hw-counters/check_Extrae_PAPI_TOT_INS.sh 2024-07-01 16:12:03.455963214 +0200 | ||
| +++ extrae-4.2.0/tests/functional/hw-counters/check_Extrae_PAPI_TOT_INS.sh 2024-07-02 10:28:14.723917087 +0200 | ||
| @@ -11,6 +11,20 @@ | ||
| ../../../src/merger/mpi2prv -f TRACE.mpits -o ${TRACE}.prv | ||
|
|
||
| # Check | ||
| +if ! command -v papi_avail &> /dev/null | ||
| +then | ||
| + echo "papi_avail could not be found" | ||
| + exit 0 | ||
| +fi | ||
| + | ||
| +PAPI_TOT_INS_available=`papi_avail | grep PAPI_TOT_INS | awk '{print $3}'` | ||
| +if [[ "$PAPI_TOT_INS_available" == No ]] | ||
| +then | ||
| + echo "PAPI_TOT_INS is not available" | ||
| + exit 0 | ||
| +fi | ||
| + | ||
| + | ||
| CheckEntryInPCF ${TRACE}.pcf PAPI_TOT_INS | ||
|
|
||
| rm -fr TRACE* set-0 ${TRACE}.??? | ||
| diff -Nru extrae-4.2.0.orig/tests/functional/hw-counters/check_Extrae_PAPI_TOT_INS_CYC.sh extrae-4.2.0/tests/functional/hw-counters/check_Extrae_PAPI_TOT_INS_CYC.sh | ||
| --- extrae-4.2.0.orig/tests/functional/hw-counters/check_Extrae_PAPI_TOT_INS_CYC.sh 2024-07-01 16:12:03.448963249 +0200 | ||
| +++ extrae-4.2.0/tests/functional/hw-counters/check_Extrae_PAPI_TOT_INS_CYC.sh 2024-07-02 10:29:00.084684067 +0200 | ||
| @@ -11,6 +11,20 @@ | ||
| ../../../src/merger/mpi2prv -f TRACE.mpits -o ${TRACE}.prv | ||
|
|
||
| # Check | ||
| +if ! command -v papi_avail &> /dev/null | ||
| +then | ||
| + echo "papi_avail could not be found" | ||
| + exit 0 | ||
| +fi | ||
| + | ||
| +PAPI_TOT_CYC_available=`papi_avail | grep PAPI_TOT_CYC | awk '{print $3}'` | ||
| +if [[ "$PAPI_TOT_CYC_available" == No ]] | ||
| +then | ||
| + echo "PAPI_TOT_CYC is not available" | ||
| + exit 0 | ||
| +fi | ||
| + | ||
| + | ||
| CheckEntryInPCF ${TRACE}.pcf PAPI_TOT_INS | ||
| CheckEntryInPCF ${TRACE}.pcf PAPI_TOT_CYC | ||
|
|
||
| diff -Nru extrae-4.2.0.orig/tests/functional/xml/check_Extrae_xml_envvar_counters.sh extrae-4.2.0/tests/functional/xml/check_Extrae_xml_envvar_counters.sh | ||
| --- extrae-4.2.0.orig/tests/functional/xml/check_Extrae_xml_envvar_counters.sh 2024-07-01 16:12:03.484963068 +0200 | ||
| +++ extrae-4.2.0/tests/functional/xml/check_Extrae_xml_envvar_counters.sh 2024-07-02 10:19:24.415644506 +0200 | ||
| @@ -11,6 +11,20 @@ | ||
| ../../../src/merger/mpi2prv -f TRACE.mpits -o ${TRACE}.prv | ||
|
|
||
| # Check | ||
| +if ! command -v papi_avail &> /dev/null | ||
| +then | ||
| + echo "papi_avail could not be found" | ||
| + exit 0 | ||
| +fi | ||
| + | ||
| +PAPI_TOT_CYC_available=`papi_avail | grep PAPI_TOT_CYC | awk '{print $3}'` | ||
| +if [[ "$PAPI_TOT_CYC_available" == No ]] | ||
| +then | ||
| + echo "PAPI_TOT_CYC is not available" | ||
| + exit 0 | ||
| +fi | ||
| + | ||
| + | ||
| CheckEntryInPCF ${TRACE}.pcf PAPI_TOT_INS | ||
|
|
||
| rm -fr TRACE* set-0 ${TRACE}.??? |
22 changes: 15 additions & 7 deletions
22
...figs/e/Extrae/Extrae-4.1.7-gompi-2023b.eb → ...figs/e/Extrae/Extrae-4.2.0-gompi-2023b.eb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters