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.

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

Prefer archdetect in our scripts, also make EESSI compatible with archspec 0.2.3+ #485

Open
wants to merge 12 commits into
base: 2023.06-software.eessi.io
Choose a base branch
from

Conversation

ocaisa
Copy link
Member

@ocaisa ocaisa commented Feb 29, 2024

No description provided.

Copy link

eessi-bot bot commented Feb 29, 2024

Instance eessi-bot-mc-aws is configured to build:

  • arch x86_64/generic for repo eessi-hpc.org-2023.06-compat
  • arch x86_64/generic for repo eessi-hpc.org-2023.06-software
  • arch x86_64/generic for repo eessi.io-2023.06-compat
  • arch x86_64/generic for repo eessi.io-2023.06-software
  • arch x86_64/intel/haswell for repo eessi-hpc.org-2023.06-compat
  • arch x86_64/intel/haswell for repo eessi-hpc.org-2023.06-software
  • arch x86_64/intel/haswell for repo eessi.io-2023.06-compat
  • arch x86_64/intel/haswell for repo eessi.io-2023.06-software
  • arch x86_64/intel/skylake_avx512 for repo eessi-hpc.org-2023.06-compat
  • arch x86_64/intel/skylake_avx512 for repo eessi-hpc.org-2023.06-software
  • arch x86_64/intel/skylake_avx512 for repo eessi.io-2023.06-compat
  • arch x86_64/intel/skylake_avx512 for repo eessi.io-2023.06-software
  • arch x86_64/amd/zen2 for repo eessi-hpc.org-2023.06-compat
  • arch x86_64/amd/zen2 for repo eessi-hpc.org-2023.06-software
  • arch x86_64/amd/zen2 for repo eessi.io-2023.06-compat
  • arch x86_64/amd/zen2 for repo eessi.io-2023.06-software
  • arch x86_64/amd/zen3 for repo eessi-hpc.org-2023.06-compat
  • arch x86_64/amd/zen3 for repo eessi-hpc.org-2023.06-software
  • arch x86_64/amd/zen3 for repo eessi.io-2023.06-compat
  • arch x86_64/amd/zen3 for repo eessi.io-2023.06-software
  • arch aarch64/generic for repo eessi-hpc.org-2023.06-compat
  • arch aarch64/generic for repo eessi-hpc.org-2023.06-software
  • arch aarch64/generic for repo eessi.io-2023.06-compat
  • arch aarch64/generic for repo eessi.io-2023.06-software
  • arch aarch64/neoverse_n1 for repo eessi-hpc.org-2023.06-compat
  • arch aarch64/neoverse_n1 for repo eessi-hpc.org-2023.06-software
  • arch aarch64/neoverse_n1 for repo eessi.io-2023.06-compat
  • arch aarch64/neoverse_n1 for repo eessi.io-2023.06-software
  • arch aarch64/neoverse_v1 for repo eessi-hpc.org-2023.06-compat
  • arch aarch64/neoverse_v1 for repo eessi-hpc.org-2023.06-software
  • arch aarch64/neoverse_v1 for repo eessi.io-2023.06-compat
  • arch aarch64/neoverse_v1 for repo eessi.io-2023.06-software

@ocaisa
Copy link
Member Author

ocaisa commented Feb 29, 2024

This is still missing the most important part, the update to https://github.com/EESSI/software-layer/blob/2023.06-software.eessi.io/init/eessi_software_subdir_for_host.py

@ocaisa ocaisa marked this pull request as ready for review February 29, 2024 16:57
Comment on lines 145 to 153
possible_subdir_paths=$(bash $TOPDIR/init/eessi_archdetect.sh -a cpupath)

if [[ "$GENERIC" -eq 1 ]]; then
# Last path is the generic case
override_subdir="${possible_subdir_paths##*:}"
else
# First path is the best option (according to archspec)
override_subdir="${possible_subdir_paths%%:*}"
fi
Copy link
Member Author

Choose a reason for hiding this comment

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

Just to note, this works as expected

~$ /cvmfs/software.eessi.io/versions/2023.06/init/eessi_archdetect.sh  -a cpupath
x86_64/intel/skylake_avx512:x86_64/intel/haswell:x86_64/generic
~$ possible_subdir_paths=$(/cvmfs/software.eessi.io/versions/2023.06/init/eessi_archdetect.sh  -a cpupath)
~$ echo ${possible_subdir_paths##*:}
x86_64/generic
~$ echo ${possible_subdir_paths%%:*}
x86_64/intel/skylake_avx512
~$ possible_subdir_paths="x86_64/generic"
~$ echo ${possible_subdir_paths%%:*}
x86_64/generic
~$ echo ${possible_subdir_paths##*:}
x86_64/generic

EESSI-install-software.sh Outdated Show resolved Hide resolved
@ocaisa ocaisa changed the title Make EESSI compatible with archspec 0.2.3+ Make EESSI compatible with archspec 0.2.3+ but also prefer archdetect in our scripts Jul 30, 2024
@ocaisa ocaisa changed the title Make EESSI compatible with archspec 0.2.3+ but also prefer archdetect in our scripts Prefer archdetect in our scripts, also make EESSI compatible with archspec 0.2.3+ Jul 30, 2024
EESSI-install-software.sh Outdated Show resolved Hide resolved
EESSI-remove-software.sh Outdated Show resolved Hide resolved
test_suite.sh Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant