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

LAMMPS: generate version from the source files when using software-commit #3485

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from

Conversation

laraPPr
Copy link
Contributor

@laraPPr laraPPr commented Oct 14, 2024

Please do not merge this one untill these two are merged I will update the easyBlock when the others get merged. The new additions is so that LAMMPS can be used with --software-commit for https://github.com/EESSI/dev.eessi.io-example.

Currently --module-only does not work when the correct version is not specified. [RESOLVED]

@laraPPr
Copy link
Contributor Author

laraPPr commented Jan 30, 2025

This pr has been test in the dev.eessi.io-example repository (EESSI/dev.eessi.io-example#8) and is also used to set up the following github action laraPPr/lammps#3.

@laraPPr laraPPr changed the title generate version from the source files when using software-commit LAMMPS: generate version from the source files when using software-commit Jan 30, 2025
@laraPPr
Copy link
Contributor Author

laraPPr commented Jan 31, 2025

By merging with develop I now get the following error when testing

ERROR: Failed to import easyblock easybuild.easyblocks.generic.easyblock_specific from /tmp/eb-w0y1rq44/included-easyblocks-5iev4nma/easybuild/easyblocks/generic: no module named 'test.easyblocks'

@laraPPr
Copy link
Contributor Author

laraPPr commented Jan 31, 2025

The error about the test.easyblocks is not happening anymore with the last commit.

--module-only is now also working when the when the correct version is not specified and the EasyBlock infers it from the src/version.h file.

The LICENSE file is now also copied to the installdir.

Also tested the last commit in a github action see https://github.com/laraPPr/lammps/actions/runs/13077882201/job/36494374056.

easybuild/easyblocks/l/lammps.py Outdated Show resolved Hide resolved
easybuild/easyblocks/l/lammps.py Outdated Show resolved Hide resolved
easybuild/easyblocks/l/lammps.py Outdated Show resolved Hide resolved
easybuild/easyblocks/l/lammps.py Outdated Show resolved Hide resolved
laraPPr and others added 4 commits February 3, 2025 12:04
Co-authored-by: ocaisa <alan.ocais@cecam.org>
Co-authored-by: ocaisa <alan.ocais@cecam.org>
Co-authored-by: ocaisa <alan.ocais@cecam.org>
Co-authored-by: ocaisa <alan.ocais@cecam.org>
@boegel
Copy link
Member

boegel commented Feb 4, 2025

@boegelbot please test @ jsc-zen3-a100
EB_ARGS="LAMMPS-2Aug2023_update2-foss-2023a-kokkos.eb LAMMPS-2Aug2023_update2-foss-2023a-kokkos-CUDA-12.1.1.eb"

@boegelbot
Copy link

@boegel: Request for testing this PR well received on jsczen3l1.int.jsc-zen3.fz-juelich.de

PR test command 'if [[ develop != 'develop' ]]; then EB_BRANCH=develop ./easybuild_develop.sh 2> /dev/null 1>&2; EB_PREFIX=/home/boegelbot/easybuild/develop source init_env_easybuild_develop.sh; fi; EB_PR=3485 EB_ARGS="LAMMPS-2Aug2023_update2-foss-2023a-kokkos.eb LAMMPS-2Aug2023_update2-foss-2023a-kokkos-CUDA-12.1.1.eb" EB_REPO=easybuild-easyblocks EB_BRANCH=develop /opt/software/slurm/bin/sbatch --job-name test_PR_3485 --ntasks=8 ~/boegelbot/eb_from_pr_upload_jsc-zen3.sh' executed!

  • exit code: 0
  • output:
Submitted batch job 5660

Test results coming soon (I hope)...

- notification for comment with ID 2634085430 processed

Message to humans: this is just bookkeeping information for me,
it is of no use to you (unless you think I have a bug, which I don't).

@boegelbot
Copy link

Test report by @boegelbot

Overview of tested easyconfigs (in order)

  • SUCCESS LAMMPS-2Aug2023_update2-foss-2023a-kokkos.eb
  • SUCCESS LAMMPS-2Aug2023_update2-foss-2023a-kokkos-CUDA-12.1.1.eb

Build succeeded for 2 out of 2 (2 easyconfigs in total)
jsczen3c1.int.jsc-zen3.fz-juelich.de - Linux Rocky Linux 9.5, x86_64, AMD EPYC-Milan Processor (zen3), Python 3.9.21
See https://gist.github.com/boegelbot/65f8c9e6ef094b43780f1bbc3f406705 for a full test report.

Copy link
Member

@boegel boegel left a comment

Choose a reason for hiding this comment

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

@laraPPr I've made some suggestions for improvements, mostly code cleanup.

I'll apply them and re-test myself so we can get this merged ASAP...

easybuild/easyblocks/l/lammps.py Outdated Show resolved Hide resolved
easybuild/easyblocks/l/lammps.py Outdated Show resolved Hide resolved
easybuild/easyblocks/l/lammps.py Outdated Show resolved Hide resolved
easybuild/easyblocks/l/lammps.py Outdated Show resolved Hide resolved
easybuild/easyblocks/l/lammps.py Show resolved Hide resolved
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.

5 participants