Skip to content

Fixed issue with CGAL path substitution#5332

Merged
ktf merged 1 commit into
alisw:masterfrom
cholmcc:cholmcc-rivet-update-cgal
Jan 30, 2024
Merged

Fixed issue with CGAL path substitution#5332
ktf merged 1 commit into
alisw:masterfrom
cholmcc:cholmcc-rivet-update-cgal

Conversation

@cholmcc
Copy link
Copy Markdown
Contributor

@cholmcc cholmcc commented Jan 26, 2024

I had

fastjet-config --libs | \
  tr ' ' '\n'  | \
  grep cgal | \
  sed -n 's|-L\(.*\)/cgal.*|\1|p'

which would do

/cvmfs/alice.cern.ch/el7-x86_64/Packages/cgal/4.6.3-131/lib =>
/cvmfs/alice.cern.ch/el7-x86_64/Packages =>

which would then leave the cgal/4.6.3-131/lib part in the rivet-config and rivet-build scripts, which of course shouldn't be there. The right extraction should be

fastjet-config --libs | \
  tr ' ' '\n'  | \
  grep cgal | \
  sed -n 's|-L\(.*\)/lib|\1|p'

In this commit I also copy the original script (but disable the execute bit) for debugging purposes. We can of course remove that once we're happy.

See also this comment on #5230.

Yours,
Christian

I had

```
fastjet-config --libs | \
  tr ' ' '\n'  | \
  grep cgal | \
  sed -n 's|-L\(.*\)/cgal.*|\1|p'
```

which would do

```
/cvmfs/alice.cern.ch/el7-x86_64/Packages/cgal/4.6.3-131/lib =>
/cvmfs/alice.cern.ch/el7-x86_64/Packages =>
```

which would then leave the `cgal/4.6.3-131/lib` part in the
`rivet-config` and `rivet-build` scripts, which of course shouldn't be
there.  The right extraction should be

```
fastjet-config --libs | \
  tr ' ' '\n'  | \
  grep cgal | \
  sed -n 's|-L\(.*\)/lib|\1|p'
```

In this commit I also copy the original script (but disable the execute
bit) for debugging purposes.  We can of course remove that once we're
happy.
@cholmcc cholmcc requested a review from a team as a code owner January 26, 2024 20:55
@cholmcc
Copy link
Copy Markdown
Contributor Author

cholmcc commented Jan 27, 2024

  • build/alidist/O2Suite/o2/macOS : Git fetch failed
  • build/O2/fullCI/alidist: A timeout in unrelated code
  • build/O2/alidist-ubuntu2204: An unrelated unit test failed
  • build/O2/alidist-dataflow-cs8: An unrelated unit test failed

Copy link
Copy Markdown
Contributor

@jackal1-66 jackal1-66 left a comment

Choose a reason for hiding this comment

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

I checked the behaviour of the main edit and it's coherent with what you report.

@cholmcc
Copy link
Copy Markdown
Contributor Author

cholmcc commented Jan 29, 2024

build/O2/fullCI/alidist fails on a timeout. Not related to this PR. False negative

Yours,
Christian

@cholmcc
Copy link
Copy Markdown
Contributor Author

cholmcc commented Jan 29, 2024

@ktf Could this be merged even though build/O2/fullCI/alidist fails - the failure is a timeout in unrelated code. Thanks.

Yours,
Christian

Comment thread rivet.sh
@ktf ktf merged commit 0db469e into alisw:master Jan 30, 2024
@cholmcc
Copy link
Copy Markdown
Contributor Author

cholmcc commented Jan 30, 2024

Testing the install

> alienv enter Rivet/rivet-3.1.8-14 
[Rivet/rivet-3.1.8-14] ~ > rivet-config --libs | tr ' ' '\n' 
L/cvmfs/alice.cern.ch/el7-x86_64/Packages/HepMC3/3.2.5-112/lib
-lHepMC3
-lHepMC3search
-L/cvmfs/alice.cern.ch/el7-x86_64/Packages/YODA/yoda-1.9.7-9/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/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

That looks right. Let's try to build an analysis plug-in

[Rivet/rivet-3.1.8-14] analyses > rivet-build ALICE_YYYY_I1234567.cc 
Using default library name 'RivetAnalysis.so'
g++ -o "RivetAnalysis.so" -shared -fPIC  -I/cvmfs/alice.cern.ch/el7-x86_64/Packages/Rivet/rivet-3.1.8-14/include -I/cvmfs/alice.cern.ch/el7-x86_64/Packages/HepMC3/3.2.5-112/include  -DENABLE_HEPMC_3=true -I/usr/include -I/usr/include -I/cvmfs/alice.cern.ch/el7-x86_64/Packages/YODA/yoda-1.9.7-9/include -I/cvmfs/alice.cern.ch/el7-x86_64/Packages/fastjet/v3.4.1_1.052-alice2-10/include   -pedantic -Wall -Wno-long-long -Wno-format -Werror=uninitialized -Werror=delete-non-virtual-dtor -fopenmp -fPIC -g -O2 -std=c++17   -Wl,--no-as-needed  -L/cvmfs/alice.cern.ch/el7-x86_64/Packages/cgal/4.6.3-131/lib -L/cvmfs/alice.cern.ch/el7-x86_64/Packages/GMP/v6.2.1-43/lib -Wl,--no-as-needed -L/cvmfs/alice.cern.ch/el7-x86_64/Packages/Rivet/rivet-3.1.8-14/lib -L/cvmfs/alice.cern.ch/el7-x86_64/Packages/HepMC3/3.2.5-112/lib -L/cvmfs/alice.cern.ch/el7-x86_64/Packages/YODA/yoda-1.9.7-9/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 -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    ALICE_YYYY_I1234567.cc 

Yeah! That worked too. I think we can declare success - thank you all for your help and patience.

Yours,
Christian

@cholmcc
Copy link
Copy Markdown
Contributor Author

cholmcc commented Jan 30, 2024

BTW, you need to be explicit about the version to load: Rivet/rivet-3.1.8-14. It seems that module does a lexical sort on version numbers and will therefore pick up the old Rivet/rivet-3.1.8-9 if you just do

alienv enter Rivet

Do you know if there's a way to make module avoid this lexical sort? Perhaps use date-time sort, or something. Thanks.

Yours,
Christian

@jackal1-66
Copy link
Copy Markdown
Contributor

I also confirm that the fix was successful. Tested 4 jobs on the GRID and the build was performed without errors. Thanks for having looked into it @cholmcc and for the solution.

MichaelLettrich pushed a commit to MichaelLettrich/alidist that referenced this pull request Oct 3, 2024
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.

3 participants