Fix for problems in `rivet-config`, `rivet-build` and `fastjet-config` #5320

cholmcc · 2024-01-18T12:35:19Z

...rivet-config, rivet-build, and - I suspect - fastjet-config.

See also #5245 for a discussion.

~~Note, the rivet.sh script is set up to explicitly fail - thus hopefully allowing me to see the log output.~~

~~This is work-in-progress.~~

…rivet-config`, `rivet-build`, and - I suspect - `fastjet-config`. See also alisw#5245 for a discussion. Note, the `rivet.sh` script is set up to explicitly fail - thus hopefully allowing me to see the log output. This is work-in-progress.

jackal1-66

Approving the changes to fix Rivet deployment

cholmcc · 2024-01-18T14:55:36Z

@jackal1-66 and @ktf Please see this test MR for more on figuring out what's up with the Rivet deployment.

This is really a test MR to see if I can deduce from the build logs whats going on. I hope we will get the build logs. If not, is there some other way we can get at them? Thanks.

cholmcc · 2024-01-18T14:57:54Z

Approving the changes to fix Rivet deployment

Whoops, a little early I think. The rivet.sh script is designed to fail (with exit 1). This PR is really only to trigger a build and get to the logs.

jackal1-66 · 2024-01-18T15:03:06Z

@cholmcc I thought some tests couldn't start without an approved review (as for other packages), Of course I didn't approve the full merge ;)

cholmcc · 2024-01-18T15:27:31Z

@cholmcc I thought some tests couldn't start without an approved review (as for other packages), Of course I didn't approve the full merge ;)

OK, I see - thanks.

cholmcc · 2024-01-18T15:27:58Z

Maybe it's the WIP in the title - I'll remove that 😄

cholmcc · 2024-01-18T23:32:41Z

Still not running - will try to do "Ready for review" - should still not be merged

The combination of special handling for GMP and CGal seems to do the trick, together with the update to the fastjet build script. Note, we may not need the special handling anymore, but I leave it in in case we are building against an older fastjet distribution.

cholmcc · 2024-01-19T08:59:05Z

Hi,

I pushed a new commit. This time I believe it fixed the issue - at least from what I saw in the last log.

It seems that the special handling of GMP and CGal, together with the updates to the fastjet-config.sh script, did the trick. Note that the special handling may not be needed if we're building against updated fastjet, but I leave it in in case we are building against an older fastjet

If this passes the CI tests, I think it is ready for deployment.

Thanks.

cholmcc · 2024-01-19T14:34:59Z

build/O2/fullCI/alidist seems to fail due to timeout - unrelated to this MR.

cholmcc · 2024-01-19T18:15:09Z

Even though the build/O2/fullCI/alidist test failed, I think this PR is ready to be merged and deployed. Maybe you want to trigger a new round of test to see if the build/O2/fullCI/alidist will succeed.

jackal1-66

The code looks good to me, just a small comment ont he last EOF of the rivet.sh script which seems not to serve a purpose

rivet.sh

jackal1-66 · 2024-01-22T15:36:40Z

@ktf could you please review the changes? Your approval is required to fix this issue.

- fastjet module need to load GMP to make sure we use the right version - Fix a typo in generated environment script for Rivet

cholmcc · 2024-01-26T07:57:21Z

Neither failure of build/O2/alidist-ubuntu2204 nor build/O2/fullCI/alidst are related to this PR. The first is a failure in the test-suite of $O^2$ (Utilities/Mergers/test/test_Algorithm.cxx) and the latter is caused by a time-out. Perhaps the CI's should be re-run, or the merge force through anyways. Thanks.

cholmcc · 2024-01-26T20:09:19Z

lxplus:~> alienv enter Rivet/rivet-3.1.8-12 
[Rivet/rivet-3.1.8-12] ~ > ls -l /cvmfs/alice.cern.ch/el7-x86_64/Packages/Rivet/rivet-3.1.8-12/bin/rivet-config 
-rwxr-xr-x. 1 cvmfs cvmfs 4369 Jan 26 18:08 /cvmfs/alice.cern.ch/el7-x86_64/Packages/Rivet/rivet-3.1.8-12/bin/rivet-config
[Rivet/rivet-3.1.8-12] ~ > rivet-config --libs | tr ' ' '\n  '
-L/cvmfs/alice.cern.ch/el7-x86_64/Packages/Rivet/rivet-3.1.8-12/lib
-L/cvmfs/alice.cern.ch/el7-x86_64/Packages/HepMC3/3.2.5-111/lib
-lHepMC3
-lHepMC3search
-L/cvmfs/alice.cern.ch/el7-x86_64/Packages/YODA/yoda-1.9.7-8/lib
-lYODA
-L/cvmfs/alice.cern.ch/el7-x86_64/Packages/fastjet/v3.4.1_1.052-alice2-10/lib
-lfastjettools
-lfastjet
-lCGAL
-lgmp
-L/cvmfs/alice.cern.ch/el7-x86_64/Packages/cgal/4.6.3-131/cgal/4.6.3-131/lib
-L/cvmfs/alice.cern.ch/el7-x86_64/Packages/GMP/v6.2.1-43/lib
-Wl,-rpath,/cvmfs/alice.cern.ch/el7-x86_64/Packages/GMP/v6.2.1-43/lib
-lm
-lfastjetplugins
-lsiscone_spherical
-lsiscone
-lfastjetcontribfragile
-lfastjettools
-lRivet

Got it 😄 - well almost. The cgal path got an extra cgal/4.6.3-131/lib on it, which breaks rivet-build - OK, I check it again an make a new MR.

However

[Rivet/rivet-3.1.8-12] ~ > ls -l `which fastjet-config` 
-rwxr-xr-x. 1 cvmfs cvmfs 13775 Jan 26 18:08 /cvmfs/alice.cern.ch/el7-x86_64/Packages/fastjet/v3.4.1_1.052-alice2-10/bin/fastjet-config
[Rivet/rivet-3.1.8-12] ~ > fastjet-config --libs | tr ' ' '\n' 
-Wl,-rpath,/cvmfs/alice.cern.ch/el7-x86_64/Packages/fastjet/v3.4.1_1.052-alice2-10/lib
-L/cvmfs/alice.cern.ch/el7-x86_64/Packages/fastjet/v3.4.1_1.052-alice2-10/lib
-lfastjettools
-lfastjet
-lCGAL
-lgmp
-L/cvmfs/alice.cern.ch/el7-x86_64/Packages/cgal/4.6.3-131/lib
-Wl,-rpath,/cvmfs/alice.cern.ch/el7-x86_64/Packages/cgal/4.6.3-131/lib
-L/local/workspace/DailyBuilds/DailyAliGenerators/daily-tags.5pNdhyUFdk/slc7_x86-64/GMP/v6.2.1-43/lib
-Wl,-rpath,/local/workspace/DailyBuilds/DailyAliGenerators/daily-tags.5pNdhyUFdk/slc7_x86-64/GMP/v6.2.1-43/lib
-lm

so the fastjet-config script reports the build-time path of GMP, still (the cgal one got fixed, though). It is not a show stopper, because the hacking in rivet.sh recipe fixes the issue. But it would be nice if fastjet-config also did the right thing. I will see if I can fix this too, but as it's not a show stopper, I think I won't spend too much time on it.

Yours,
Christian

cholmcc · 2024-01-26T20:11:56Z

BTW, just doing

alienv enter Rivet 
[Rivet] ~ > which rivet-config
/cvmfs/alice.cern.ch/el7-x86_64/Packages/Rivet/rivet-3.1.8-9/bin/rivet-config

doesn't select the newest install (rivet-3.1.8-12) but rather rivet-3.1.8-9. Is it based on a lexical sort?

Yours,
Christian

cholmcc requested review from a team as code owners January 18, 2024 12:35

cholmcc marked this pull request as draft January 18, 2024 12:35

jackal1-66 previously approved these changes Jan 18, 2024

View reviewed changes

cholmcc changed the title ~~WIP: This is a test to see if I can figure out where the problem is with `…~~ This is a test to see if I can figure out where the problem is with `… Jan 18, 2024

cholmcc marked this pull request as ready for review January 18, 2024 23:32

cholmcc dismissed jackal1-66’s stale review via bde04d7 January 19, 2024 08:56

Add a comment - mostly to trigger re-test by CI

43dfeee

cholmcc requested a review from jackal1-66 January 21, 2024 00:54

jackal1-66 reviewed Jan 22, 2024

View reviewed changes

rivet.sh Show resolved Hide resolved

jackal1-66 previously approved these changes Jan 22, 2024

View reviewed changes

jackal1-66 enabled auto-merge (squash) January 22, 2024 15:34

cholmcc changed the title ~~This is a test to see if I can figure out where the problem is with `…~~ Fix for problems in rivet-config, rivet-build and fastjet-config Jan 23, 2024

Fixes for GMP in fastjet and rivet

3b17911

- fastjet module need to load GMP to make sure we use the right version - Fix a typo in generated environment script for Rivet

auto-merge was automatically disabled January 23, 2024 15:36
Head branch was pushed to by a user without write access

cholmcc dismissed jackal1-66’s stale review via 3b17911 January 23, 2024 15:36

Merge branch 'master' into cholmcc-rivet-fastjet-update

ed15aad

jackal1-66 previously approved these changes Jan 24, 2024

View reviewed changes

cholmcc added 2 commits January 25, 2024 15:31

Merge branch 'master' into cholmcc-rivet-fastjet-update

5daf6a9

Fix typo SED_EXR -> SED_EXPR

d29175a

cholmcc dismissed jackal1-66’s stale review via d29175a January 25, 2024 14:32

ktf enabled auto-merge (squash) January 25, 2024 15:02

ktf disabled auto-merge January 26, 2024 08:17

ktf merged commit 390b9a6 into alisw:master Jan 26, 2024
10 of 12 checks passed

cholmcc mentioned this pull request Jan 26, 2024

Fixed issue with CGAL path substitution #5332

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix for problems in `rivet-config`, `rivet-build` and `fastjet-config` #5320

Fix for problems in `rivet-config`, `rivet-build` and `fastjet-config` #5320

cholmcc commented Jan 18, 2024 •

edited

jackal1-66 left a comment

cholmcc commented Jan 18, 2024

cholmcc commented Jan 18, 2024

jackal1-66 commented Jan 18, 2024

cholmcc commented Jan 18, 2024

cholmcc commented Jan 18, 2024

cholmcc commented Jan 18, 2024

cholmcc commented Jan 19, 2024

cholmcc commented Jan 19, 2024

cholmcc commented Jan 19, 2024

jackal1-66 left a comment

jackal1-66 commented Jan 22, 2024

cholmcc commented Jan 26, 2024

cholmcc commented Jan 26, 2024

cholmcc commented Jan 26, 2024

Fix for problems in rivet-config, rivet-build and fastjet-config #5320

Fix for problems in rivet-config, rivet-build and fastjet-config #5320

Conversation

cholmcc commented Jan 18, 2024 • edited

jackal1-66 left a comment

Choose a reason for hiding this comment

cholmcc commented Jan 18, 2024

cholmcc commented Jan 18, 2024

jackal1-66 commented Jan 18, 2024

cholmcc commented Jan 18, 2024

cholmcc commented Jan 18, 2024

cholmcc commented Jan 18, 2024

cholmcc commented Jan 19, 2024

cholmcc commented Jan 19, 2024

cholmcc commented Jan 19, 2024

jackal1-66 left a comment

Choose a reason for hiding this comment

jackal1-66 commented Jan 22, 2024

cholmcc commented Jan 26, 2024

cholmcc commented Jan 26, 2024

cholmcc commented Jan 26, 2024

Fix for problems in `rivet-config`, `rivet-build` and `fastjet-config` #5320

Fix for problems in `rivet-config`, `rivet-build` and `fastjet-config` #5320

cholmcc commented Jan 18, 2024 •

edited