From c1d439483d0dae552b71a57c851108b83dd1cbae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 15 Oct 2024 10:45:27 +0200 Subject: [PATCH 1/7] rebuild LAMMPS for generic CPU targets --- .../20241015-eb-4.9.4-LAMMPS-generic-builds.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml new file mode 100644 index 0000000000..36e887644d --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml @@ -0,0 +1,16 @@ +# 2024.10.15 +# Generic build of LAMMPS have optimizations for the build host CPU, +# this is fixed in https://github.com/easybuilders/easybuild-easyblocks/pull/3484 +easyconfigs: + - LAMMPS-2Aug2023_update2-foss-2023a-kokkos.eb: + options: + # see: https://github.com/easybuilders/easybuild-easyblocks/pull/3484/commits/64060fa9b6a4d444406cc403ae00fbbc3f36c416 + include-easyblocks-from-commit: 64060fa9b6a4d444406cc403ae00fbbc3f36c416 + - LAMMPS-29Aug2024-foss-2023b-kokkos.eb: + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21436 + from-commit: 9dc24e57880a8adb06ae10557c5315e66671a533 + # see: https://github.com/easybuilders/easybuild-easyblocks/pull/3484/commits/64060fa9b6a4d444406cc403ae00fbbc3f36c416 + include-easyblocks-from-commit: 64060fa9b6a4d444406cc403ae00fbbc3f36c416 + + From 0e20f008382ca6cf00afb64a9d143debfa0e2c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 15 Oct 2024 14:00:08 +0200 Subject: [PATCH 2/7] individually remove every file of the installation dir --- EESSI-remove-software.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index 98576efcb0..1d38092004 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -127,7 +127,7 @@ if [ $EUID -eq 0 ]; then app_dir=${app_installprefix}/software/${app} app_module=${app_installprefix}/modules/all/${app}.lua echo_yellow "Removing ${app_dir} and ${app_module}..." - rm -rf ${app_dir} + find ${app_dir} -exec rm -rf {} \; rm -rf ${app_module} done else From 1091ab75ac474fb8e74c75cd5d93c8fb7f437b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 15 Oct 2024 14:27:27 +0200 Subject: [PATCH 3/7] only find and remove files, and then remove the entire install dir --- EESSI-remove-software.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index 1d38092004..fbd2760596 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -127,7 +127,8 @@ if [ $EUID -eq 0 ]; then app_dir=${app_installprefix}/software/${app} app_module=${app_installprefix}/modules/all/${app}.lua echo_yellow "Removing ${app_dir} and ${app_module}..." - find ${app_dir} -exec rm -rf {} \; + find ${app_dir} -type f -exec rm -f {} \; + rm -rf ${app_dir} rm -rf ${app_module} done else From eb5f29b02739addb1e3db3ceb2cf03d3215a9f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 21 Oct 2024 10:44:09 +0200 Subject: [PATCH 4/7] easyblocks PR has been merged, use merge commit --- .../rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml index 36e887644d..5b90d44a89 100644 --- a/easystacks/software.eessi.io/2023.06/rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20241015-eb-4.9.4-LAMMPS-generic-builds.yml @@ -4,13 +4,13 @@ easyconfigs: - LAMMPS-2Aug2023_update2-foss-2023a-kokkos.eb: options: - # see: https://github.com/easybuilders/easybuild-easyblocks/pull/3484/commits/64060fa9b6a4d444406cc403ae00fbbc3f36c416 - include-easyblocks-from-commit: 64060fa9b6a4d444406cc403ae00fbbc3f36c416 + # see: https://github.com/easybuilders/easybuild-easyblocks/pull/3484 + include-easyblocks-from-commit: 3671c5b7c238c7dc8aadd2c510329770ef1bdcdf - LAMMPS-29Aug2024-foss-2023b-kokkos.eb: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21436 from-commit: 9dc24e57880a8adb06ae10557c5315e66671a533 - # see: https://github.com/easybuilders/easybuild-easyblocks/pull/3484/commits/64060fa9b6a4d444406cc403ae00fbbc3f36c416 - include-easyblocks-from-commit: 64060fa9b6a4d444406cc403ae00fbbc3f36c416 + # see: https://github.com/easybuilders/easybuild-easyblocks/pull/3484 + include-easyblocks-from-commit: 3671c5b7c238c7dc8aadd2c510329770ef1bdcdf From 8d5ef69a02d34d1dba5c09a141fab0758672dbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 3 Feb 2025 14:02:11 +0100 Subject: [PATCH 5/7] remove find command --- EESSI-remove-software.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index 5f540b8061..e4b377fd16 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -128,7 +128,6 @@ if [ $EUID -eq 0 ]; then app_subdirs=$(find ${app_dir} -mindepth 1 -maxdepth 1 -type d) app_module=${app_installprefix}/modules/all/${app}.lua echo_yellow "Removing ${app_dir} and ${app_module}..." - find ${app_dir} -type f -exec rm -f {} \; rm -rf ${app_dir} rm -rf ${app_module} # recreate the installation directories and first-level subdirectories to work around permission denied From aa31e15c22833412e74ebd0e8a729dd4a7fc8992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 3 Feb 2025 15:21:16 +0100 Subject: [PATCH 6/7] do an ls on the original subdirs of the installation dir to work around permission issues (instead of recreating them) --- EESSI-remove-software.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index e4b377fd16..8c48a3e362 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -130,12 +130,12 @@ if [ $EUID -eq 0 ]; then echo_yellow "Removing ${app_dir} and ${app_module}..." rm -rf ${app_dir} rm -rf ${app_module} - # recreate the installation directories and first-level subdirectories to work around permission denied - # issues when rebuilding the package (see https://github.com/EESSI/software-layer/issues/556) + # recreate the installation directory and do an ls on the first-level subdirectories to work around + # permission denied issues when rebuilding the package (see https://github.com/EESSI/software-layer/issues/556) echo_yellow "Recreating an empty ${app_dir}..." mkdir -p ${app_dir} for app_subdir in ${app_subdirs}; do - mkdir -p ${app_subdir} + ls ${app_subdir} >& /dev/null || true done done else From ecbc3612891ef89ca98ce4d666ca962f14bfffbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 3 Feb 2025 15:39:29 +0100 Subject: [PATCH 7/7] no need to do the ls on subdirs in a for loop, do them all at once --- EESSI-remove-software.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index 8c48a3e362..928d162ae6 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -134,9 +134,7 @@ if [ $EUID -eq 0 ]; then # permission denied issues when rebuilding the package (see https://github.com/EESSI/software-layer/issues/556) echo_yellow "Recreating an empty ${app_dir}..." mkdir -p ${app_dir} - for app_subdir in ${app_subdirs}; do - ls ${app_subdir} >& /dev/null || true - done + ls ${app_subdirs} >& /dev/null || true done else fatal_error "Easystack file ${easystack_file} not found!"