From 61cc013f0e5ff775ea3f2ad9560c570860b360f3 Mon Sep 17 00:00:00 2001 From: Jan Patrick Lehr Date: Tue, 7 Jul 2026 16:24:35 +0200 Subject: [PATCH 1/3] [CK] Check git validity instead of dir existence (#2321) --- bin/run_composable-kernels.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/run_composable-kernels.sh b/bin/run_composable-kernels.sh index 0184330f2..574d17077 100755 --- a/bin/run_composable-kernels.sh +++ b/bin/run_composable-kernels.sh @@ -282,7 +282,14 @@ if [ ! -d "${CK_TOP}" ]; then mkdir -p "${CK_TOP}" || exit 1 fi -if [ ! -d "${CK_REPO}" ]; then +# Validate that CK_REPO is an actual git checkout, not just an existing +# directory. Alola periodically wipes the *contents* of old node-local dirs +# while leaving the directory shells behind, which yields a CK_REPO that +# exists but has no .git (and no CMakeLists.txt), breaking the build. A plain +# "-d" test would skip the clone and then fail. Re-clone when the tree is +# missing or not a valid repo; only pull when it is a healthy checkout. +if ! git -C "${CK_REPO}" rev-parse --is-inside-work-tree >/dev/null 2>&1; then + rm -rf "${CK_REPO}" git clone --single-branch --depth 1 ${CKRepoURL} "${CK_REPO}" elif [ "${ShouldUpdateCKRepo}" == 'yes' ]; then pushd "${CK_REPO}" || exit 1 From 82e63e1c13c83e946c1a7f0a9270a90d974105fa Mon Sep 17 00:00:00 2001 From: Greg Rodgers Date: Tue, 7 Jul 2026 13:18:50 -0400 Subject: [PATCH 2/3] [SMOKE] turn on -fuse-emissary-print so printf n format works (#2322) --- test/smoke/helloworld%n/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/smoke/helloworld%n/Makefile b/test/smoke/helloworld%n/Makefile index a1a819858..51d5ebc57 100644 --- a/test/smoke/helloworld%n/Makefile +++ b/test/smoke/helloworld%n/Makefile @@ -5,6 +5,11 @@ TESTSRC_MAIN = helloworld.c TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) +# The %n printf format does not work with libc printf so force emissary printf +ifeq ($(shell echo 'int main() { return 0; }' | $(CC) -fuse-emissary-print -xc - 2>/dev/null && echo true), true) + EXTRA_CFLAGS=-fuse-emissary-print +endif + CLANG ?= clang OMP_BIN = $(AOMP)/bin/$(CLANG) CC = $(OMP_BIN) $(VERBOSE) From f7f17b4a2bd94a9b46cf6ed3b0a24a180b82da76 Mon Sep 17 00:00:00 2001 From: estewart08 Date: Tue, 7 Jul 2026 15:30:51 -0500 Subject: [PATCH 3/3] [build] - Remove usage of aompi manifest (#2320) --- bin/clone_aomp.sh | 25 +++++++------------------ manifests/aomp_23.0.xml | 28 +++++++++------------------- manifests/aompi_23.0.xml | 20 -------------------- 3 files changed, 16 insertions(+), 57 deletions(-) delete mode 100644 manifests/aompi_23.0.xml diff --git a/bin/clone_aomp.sh b/bin/clone_aomp.sh index fefddbbef..2d00cff05 100755 --- a/bin/clone_aomp.sh +++ b/bin/clone_aomp.sh @@ -218,26 +218,15 @@ if [[ "$AOMP_VERSION" == "13.1" ]] || [[ $AOMP_MAJOR_VERSION -gt 13 ]] ; then # However, we gave up on using the repo command to clone the repos. # That is all done here by parsing the manifest file. - # According to git documentation this ssh command should return 1 if authentication is successful - ssh -T $AOMP_GIT_INTERNAL_IP 2> /dev/null - if [ $? == 1 ] && [ "$AOMP_EXTERNAL_MANIFEST" != 1 ]; then - # AMD internal repo file - if [ "$AOMP_NEW" == "1" ]; then - manifest_file=$thisdir/../manifests/aompi_new_${AOMP_VERSION}.xml - else - manifest_file=$thisdir/../manifests/aompi_${AOMP_VERSION}.xml - fi + abranch=$(git branch | awk '/\*/ { print $2; }') + # Use release manifest if on release branch + if [ "$abranch" == "aomp-${AOMP_VERSION_STRING}" ]; then + manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION_STRING}.xml else - abranch=$(git branch | awk '/\*/ { print $2; }') - # Use release manifest if on release branch - if [ "$abranch" == "aomp-${AOMP_VERSION_STRING}" ]; then - manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION_STRING}.xml + if [ "$AOMP_NEW" == "1" ]; then + manifest_file=$thisdir/../manifests/aomp_new_${AOMP_VERSION}.xml else - if [ "$AOMP_NEW" == "1" ]; then - manifest_file=$thisdir/../manifests/aomp_new_${AOMP_VERSION}.xml - else - manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION}.xml - fi + manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION}.xml fi fi echo "USED manifest file: $manifest_file" diff --git a/manifests/aomp_23.0.xml b/manifests/aomp_23.0.xml index e0119381b..656ab1546 100644 --- a/manifests/aomp_23.0.xml +++ b/manifests/aomp_23.0.xml @@ -1,30 +1,20 @@ - + - - - - - - + + + + - - - - - - - - - - - - + + + + diff --git a/manifests/aompi_23.0.xml b/manifests/aompi_23.0.xml deleted file mode 100644 index 656ab1546..000000000 --- a/manifests/aompi_23.0.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - -