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

use (=|:=) in regex because OpenFOAM rule files use := instead of = since v2212 #3073

Merged

Conversation

mboisson
Copy link
Contributor

No description provided.

@boegel boegel changed the title use (=|:=) in regex because openfoam rule files use := instead of = since v2212 use (=|:=) in regex because OpenFOAM rule files use := instead of = since v2212 Jan 17, 2024
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.

lgtm after visual review

@boegel boegel added the bug fix label Jan 17, 2024
@boegel boegel added this to the release after 4.9.0 milestone Jan 17, 2024
@boegel
Copy link
Member

boegel commented Jan 17, 2024

@mboisson Can you clarify in the PR description how problems manifest if OpenFOAM v2212 was installed without this fix (which errors, etc.)?

@boegel
Copy link
Member

boegel commented Jan 17, 2024

@boegelbot please test @ generoso
EB_ARGS="OpenFOAM-v2306-foss-2022b.eb OpenFOAM-v2206-foss-2022a.eb OpenFOAM-11-foss-2023a.eb"
CORE_CNT=16

@boegelbot
Copy link

@boegel: Request for testing this PR well received on login1

PR test command 'EB_PR=3073 EB_ARGS="OpenFOAM-v2306-foss-2022b.eb OpenFOAM-v2206-foss-2022a.eb OpenFOAM-11-foss-2023a.eb" EB_CONTAINER= EB_REPO=easybuild-easyblocks /opt/software/slurm/bin/sbatch --job-name test_PR_3073 --ntasks="16" ~/boegelbot/eb_from_pr_upload_generoso.sh' executed!

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

Test results coming soon (I hope)...

- notification for comment with ID 1896067033 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).

@mboisson
Copy link
Contributor Author

mboisson commented Jan 17, 2024

@mboisson Can you clarify in the PR description how problems manifest if OpenFOAM v2212 was installed without this fix (which errors, etc.)?

The way it manifested for us is that redistributePar and a few other binaries are not compiled with the MPI compiler, which in our case resulted in libmpi.so.4 not being found (it is coming from another library) because the proper RPATH was not injected in the executable. This is not an issue for sites that use LD_LIBRARY_PATH because the shared object is then found through that. For these sites, the issue is probably more subtle and it probably manifests itself by the wrong flags being used.

A way to detect that would probably to test whether the regex actually applied something. In our case, for example, not fixed (avx2)

$ diff  /cvmfs/soft.computecanada.ca/easybuild/software/2020/avx2/MPI/gcc9/openmpi4/openfoam/v2212/OpenFOAM-v2212/wmake/rules/General/Gcc/c++{,.orig.eb}

(returns nothing), vs fixed (avx512):

$ diff  /cvmfs/soft.computecanada.ca/easybuild/software/2020/avx512/MPI/gcc9/openmpi4/openfoam/v2212/OpenFOAM-v2212/wmake/rules/General/Gcc/c++{,.orig.eb}
9c9
< CC         := OMPI_CXX="g++" mpicxx
---
> CC         := g++$(COMPILER_VERSION) -std=c++11
13c13
< c++OPT     := -O2 -fno-tree-vectorize -march=skylake-avx512 -fno-math-errno -std=c++14 -fuse-ld=bfd
---
> c++OPT     := -O2

@boegelbot
Copy link

Test report by @boegelbot

Overview of tested easyconfigs (in order)

  • SUCCESS OpenFOAM-v2306-foss-2022b.eb
  • SUCCESS OpenFOAM-v2206-foss-2022a.eb
  • SUCCESS OpenFOAM-11-foss-2023a.eb

Build succeeded for 3 out of 3 (3 easyconfigs in total)
cnx1 - Linux Rocky Linux 8.5, x86_64, Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz (haswell), Python 3.6.8
See https://gist.github.com/boegelbot/d378eea1d366d304e813f604b1c45bf7 for a full test report.

Copy link

@boegelbot boegelbot left a comment

Choose a reason for hiding this comment

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

lgtm

@boegel boegel merged commit 7ca6c35 into easybuilders:develop Jan 18, 2024
47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants