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

Modifying directory structure + drop pilot terminology #217

Merged

Conversation

TopRichard
Copy link

@TopRichard TopRichard commented Jan 11, 2024

Trying to get closer to EESSI by modifying the directory structure and applying modifications done in PR 387

@nessi-bot
Copy link

nessi-bot bot commented Jan 11, 2024

Instance AWS-MC-NESSI is configured to build:

  • arch x86_64/generic for repo nessi-2022.11-swl-deb10
  • arch x86_64/generic for repo nessi-2023.06-cl
  • arch x86_64/generic for repo nessi-2023.06-swl-deb10
  • arch x86_64/generic for repo nessi-2023.06-swl-deb11
  • arch x86_64/intel/skylake_avx512 for repo nessi-2022.11-swl-deb10
  • arch x86_64/intel/skylake_avx512 for repo nessi-2023.06-cl
  • arch x86_64/intel/skylake_avx512 for repo nessi-2023.06-swl-deb10
  • arch x86_64/intel/skylake_avx512 for repo nessi-2023.06-swl-deb11
  • arch x86_64/amd/zen2 for repo nessi-2022.11-swl-deb10
  • arch x86_64/amd/zen2 for repo nessi-2023.06-cl
  • arch x86_64/amd/zen2 for repo nessi-2023.06-swl-deb10
  • arch x86_64/amd/zen2 for repo nessi-2023.06-swl-deb11
  • arch aarch64/generic for repo nessi-2022.11-swl-deb10
  • arch aarch64/generic for repo nessi-2023.06-cl
  • arch aarch64/generic for repo nessi-2023.06-swl-deb10
  • arch aarch64/generic for repo nessi-2023.06-swl-deb11

@nessi-bot
Copy link

nessi-bot bot commented Jan 11, 2024

Instance eX3-NESSI is configured to build:

  • arch x86_64/amd/zen2 for repo nessi-2022.11-swl-deb10
  • arch x86_64/amd/zen2 for repo nessi-2023.06-cl
  • arch x86_64/amd/zen2 for repo nessi-2023.06-swl-deb10
  • arch x86_64/amd/zen2 for repo nessi-2023.06-swl-deb11
  • arch aarch64/generic for repo nessi-2022.11-swl-deb10
  • arch aarch64/generic for repo nessi-2023.06-cl
  • arch aarch64/generic for repo nessi-2023.06-swl-deb10
  • arch aarch64/generic for repo nessi-2023.06-swl-deb11

@nessi-bot
Copy link

nessi-bot bot commented Jan 11, 2024

Instance Saga-NESSI is configured to build:

  • arch x86_64/intel/cascadelake for repo nessi-2022.11-swl-deb10
  • arch x86_64/intel/cascadelake for repo nessi-2023.06-cl
  • arch x86_64/intel/cascadelake for repo nessi-2023.06-swl-deb10
  • arch x86_64/intel/cascadelake for repo nessi-2023.06-swl-deb11
  • arch x86_64/intel/skylake_avx512 for repo nessi-2022.11-swl-deb10
  • arch x86_64/intel/skylake_avx512 for repo nessi-2023.06-cl
  • arch x86_64/intel/skylake_avx512 for repo nessi-2023.06-swl-deb10
  • arch x86_64/intel/skylake_avx512 for repo nessi-2023.06-swl-deb11
  • arch x86_64/intel/broadwell for repo nessi-2022.11-swl-deb10
  • arch x86_64/intel/broadwell for repo nessi-2023.06-cl
  • arch x86_64/intel/broadwell for repo nessi-2023.06-swl-deb10
  • arch x86_64/intel/broadwell for repo nessi-2023.06-swl-deb11
  • arch x86_64/generic for repo nessi-2022.11-swl-deb10
  • arch x86_64/generic for repo nessi-2023.06-cl
  • arch x86_64/generic for repo nessi-2023.06-swl-deb10
  • arch x86_64/generic for repo nessi-2023.06-swl-deb11

@TopRichard TopRichard force-pushed the nessi.no-2023.06-Directory-structure branch from 72d8ba1 to 41f8bc6 Compare January 12, 2024 10:44
@TopRichard TopRichard requested a review from trz42 January 15, 2024 08:36
Copy link
Collaborator

@trz42 trz42 left a comment

Choose a reason for hiding this comment

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

Looks mostly good. Left a few comments.

I'm a bit uncertain about the changes related to archdetect. To be on the safe side we would have to build for all architectures we need or at least those that are different from EESSI.

Using x86_64/intel/broadwell subdirectory for software layer (HARDCODED)
Using x86_64/intel/haswell subdirectory for software layer
Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe (HARDCODED) was wrong? I think, this is just an example output. So maybe good to check what we get on a client, then use that?

README.md Outdated
Comment on lines 12 to 13
$ source /cvmfs/software.eessi.io/versions/2023.06/init/bash
Found EESSI repo @ /cvmfs/software.eessi.io/versions/2023.06!
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is a bit tricky as it is the result of what is in the CVMFS repository. Maybe check what it is now and use that? In case we change the CVMFS repository side, we only need to remember to change it here too.

Copy link
Author

Choose a reason for hiding this comment

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

Check last two commits, keeping it as /cvmfs/pilot.nessi.no results in failing CI tests.

README.md Outdated
Comment on lines 17 to 19
Prepending /cvmfs/software.eessi.io/versions/2023.06/software/x86_64/intel/haswell/modules/all to $MODULEPATH...
Environment set up to use EESSI (2023.06), have fun!
[EESSI 2023.06] $
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is a bit tricky as it is the result of what is in the CVMFS repository. Maybe check what it is now and use that? In case we change the CVMFS repository side, we only need to remember to change it here too.

Comment on lines 11 to 12
export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/software.eessi.io}"
# export EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO_OVERRIDE:=/cvmfs/pilot.nessi.no}"
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think, we need to keep /cvmfs/pilot.nessi.no here.

Copy link
Author

@TopRichard TopRichard Jan 15, 2024

Choose a reason for hiding this comment

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

Keeping /cvmfs/pilot.nessi.no results in failing CI tests, check last two commits.

@TopRichard
Copy link
Author

When changing the README.md only without the init/eessi_defaults file to default, the CI Tests for consistency of README.md fails with :

Run source init/eessi_defaults
  source init/eessi_defaults
  grep "${EESSI_CVMFS_REPO}" README.md
  shell: /usr/bin/bash -e {0}
Error: Process completed with exit code 1.

Copy link
Collaborator

@trz42 trz42 left a comment

Choose a reason for hiding this comment

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

Lets merge it and see if it/what works.

@trz42 trz42 merged commit 4ed3a63 into NorESSI:nessi.no-2023.06 Jan 16, 2024
62 of 63 checks passed
@TopRichard TopRichard deleted the nessi.no-2023.06-Directory-structure branch January 28, 2024 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants