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
sci-physics/pythia: add 8.3.09, 9999 #32056
Conversation
Pull Request assignmentSubmitter: @APN-Pucky sci-physics/pythia: @gentoo/sci-physics Linked bugsBugs linked: 862103 In order to force reassignment and/or bug reference scan, please append Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide |
Pull request CI reportReport generated at: 2023-07-26 19:10 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, some minor comments.
There is no need to drop the x86
keyword for these changes.
IUSE="doc examples fastjet +hepmc3 hepmc2 lhapdf root test zlib" | ||
RESTRICT="!test? ( test )" | ||
REQUIRED_USE=" | ||
^^ ( hepmc3 hepmc2 ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be ??
instead of ^^
? I.e. 'zero or one' instead of 'exactly one'.
https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/CT10.tar.gz | ||
https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2007lomod.tar.gz | ||
https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nlo_as_0119_qed_mc.tar.gz | ||
https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/NNPDF23_nnlo_as_0119_qed_mc.tar.gz | ||
https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq66.tar.gz | ||
https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/cteq6l1.tar.gz | ||
https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/${LHA_VER}/unvalidated/MRST2004qed.tar.gz |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These are redirected to ../downloads/.. instead of ../archive/..:
RedirectedUrl: version 8.3.09: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/CT10.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/CT10.tar.gz
RedirectedUrl: version 8.3.09: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/MRST2007lomod.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/MRST2007lomod.tar.gz
RedirectedUrl: version 8.3.09: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/NNPDF23_nlo_as_0119_qed_mc.tar.gz-> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/NNPDF23_nlo_as_0119_qed_mc.tar.gz
RedirectedUrl: version 8.3.09: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/NNPDF23_nnlo_as_0119_qed_mc.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
RedirectedUrl: version 8.3.09: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/cteq66.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/cteq66.tar.gz
RedirectedUrl: version 8.3.09: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/cteq6l1.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/cteq6l1.tar.gz
RedirectedUrl: version 8.3.09: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/unvalidated/MRST2004qed.tar.gz ->https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/unvalidated/MRST2004qed.tar.gz
RedirectedUrl: version 9999: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/CT10.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/CT10.tar.gz
RedirectedUrl: version 9999: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/MRST2007lomod.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/MRST2007lomod.tar.gz
RedirectedUrl: version 9999: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/NNPDF23_nlo_as_0119_qed_mc.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/NNPDF23_nlo_as_0119_qed_mc.tar.gz
RedirectedUrl: version 9999: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/NNPDF23_nnlo_as_0119_qed_mc.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/NNPDF23_nnlo_as_0119_qed_mc.tar.gz
RedirectedUrl: version 9999: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/cteq66.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/cteq66.tar.gz
RedirectedUrl: version 9999: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/cteq6l1.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/cteq6l1.tar.gz
RedirectedUrl: version 9999: SRC_URI: permanently redirected: https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/unvalidated/MRST2004qed.tar.gz -> https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/unvalidated/MRST2004qed.tar.gz
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They are all over the place. i.e.
https://www.hepforge.org/archive/lhapdf/pdfsets/v6.backup/6.2.1/CT10.tar.gz -> https://lhapdf.hepforge.org/downloads?f=pdfsets/v6.backup/6.2.1/CT10.tar.gz
https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/6.2.1/CT10.tar.gz -> https://lhapdf.hepforge.org/downloads?f=pdfsets/v6.backup/6.2.1/CT10.tar.gz
lhapdfsets.web.cern.ch/lhapdfsets/current/CT10.tar.gz -> https://lhapdfsets.web.cern.ch/current/CT10.tar.gz
all give the same checksum in the end. Not sure which to pick but since LHAPDF
uses http://lhapdfsets.web.cern.ch/lhapdfsets/current/
this would probably be the most reliable?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
current
sounds like it is a moving target, so this is not an option as it would break the SRC_URI
every time a new version is released. We need something that includes some version number and ideally doesn't cause a RedirectedUrl
warning, but this might not be possible.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, I'll switch to downloads then, since the unvalidated
path also does not exist at the cern url.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll update these while I am at it:
* failed fetching file: pythia-6.4.28.tar.xz, uri: https://dev.gentoo.org/~bicatali/distfiles/pythia-6.4.28.tar.xz
* failed fetching file: lutp0613man2.pdf, uri: http://home.thep.lu.se/~torbjorn/pythia/lutp0613man2.pdf
* failed fetching file: pythia8245.tgz, uri: http://home.thep.lu.se/~torbjorn/pythia8/pythia8245.tgz
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See direct links in https://pythia.org/releases/, for lhapdfsets, I think using http://lhapdfsets.web.cern.ch/lhapdfsets/current/ should be stable (see https://lhapdf.hepforge.org/#sets).
Pull request CI reportReport generated at: 2023-07-29 17:25 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
Closes: https://bugs.gentoo.org/862103 Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
309c0bc
to
af0290a
Compare
Pull request CI reportReport generated at: 2023-07-29 19:25 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Conceptually LGTM, haven't tested though since I'm travelling at the moment.
# workaround to official pythia-split not having a pythia subdir | ||
src_unpack() { | ||
mkdir -p "${S}" | ||
cd "${S}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|| die
I'm getting non-empty git diff after applying this patch and running |
|
Pull request CI reportReport generated at: 2023-08-04 15:01 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
Signed-off-by: Alexander Puck Neuwirth <alexander@neuwirth-informatik.de>
https://lhapdfsets.web.cern.ch/lhapdfsets/current/NNPDF23_nnlo_as_0119_qed_mc.tar.gz | ||
https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq66.tar.gz | ||
https://lhapdfsets.web.cern.ch/lhapdfsets/current/cteq6l1.tar.gz | ||
https://www.hepforge.org/downloads/lhapdf/pdfsets/v6.backup/${LHA_VER}/MRST2004qed.tar.gz |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can the tests maybe run with the split MRST2004qed_proton MRST2004qed_neutron files? The split files are available in https://lhapdfsets.web.cern.ch/lhapdfsets/current/. In any case, shouldn't these all be installed by lhapdf itself?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I'll check where it is needed and if it works with the other ones.
Pull request CI reportReport generated at: 2023-08-04 15:46 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
Now it looks fine, I will run with tests too then I can merge this. Thanks for the work! |
I changed some of the PDFs, but it seems to me like the tests (mainXX.cc) are just compiled but not run in
and it succeeded, but the tests also succeeded with previous different pdfs. |
Great work, Thanks 👍 |
I have another package ( Here is what my first attempt would look like. Give a user has already installed one of those packages manually (eg. |
It's a bit weird to check for a pdf file in the configure phase, is it really required?
Are these pdf files unusually big? We usually don't introduce USE flags for toggling the installation of small (documentation) files. |
I'd say yes extracted:
The non-extracted tar's are of about 30M (just to be sure, they are not documentation, but grid data, Parton Distribution Function).
For reference Herwig is a bit special and has its own Programming via ThePEG's
|
My idea behind the use flags was to make the dependency explicit. Apart from taking up some space installing more than the minimal collection of PDFs is no problem, which is quite a draw back for containerizing it, IMO. What do you think about grouping the PDFs use-flag, i.e. atm. Or one could just call |
aaaah right, this makes a lot more sense now, I though we were talking about plain
I don't know, this might be confusing for users.
This might be the best solution, it seems the easiest and therefore least likely to break in the future. With sed it is usually easy to make install commands respect some prefix/destdir if they don't already do so. |
sci-physics/geant uses a separate package for data, I think it's fine to split the datasets into a separate package, especially since they are used not only by lhapdf, but also other generators. |
Turns out this does not work since it would require network access to fetch the data via the web. (I can trick it to think of gentoo's
The problem is more if we want a use flag for each of the pdf-set or just install all in one. I don't think installing all makes sense, since pythias tests would already be ~100M. (here a permanent link https://gitlab.com/APN-Pucky/gentoo-hep-forge/-/blob/f96ce260c3762f835b4b044b094e509a58abae48/sci-physics/lhapdf-sets/lhapdf-sets-0.ebuild) |
Maybe we can do something like What does the upstream |
Looks like atm
|
Yes but they are grouped in USE_EXPANDS: https://github.com/gentoo/guru/tree/master/profiles/desc
It might make sense to do something similar here so users can set Then again the approach in |
I see they are defined in profiles/make.defaults. I think since we don't want to ever provide all of them, just letting the user/dependencies choose packages is best. |
Modifying I have it working here https://gitlab.com/APN-Pucky/gentoo-hep-forge/-/blob/master/sci-physics/lhapdf-sets/lhapdf-sets-0.ebuild?ref_type=heads. Should I PR it to |
Sure, lets add it to |
Closes: https://bugs.gentoo.org/862103
Signed-off-by: Alexander Puck Neuwirth alexander@neuwirth-informatik.de
In the last half year I accumulated some changes compared to the most recent ebuild
8.3.07-r1
.These changes are:
hepmc2
andhepmc3
use flags to switch between versions, however I would not mind too much dropinghepmc2
support, but I think it is a nice to have.PYTHIADIR
is/usr/share/Pythia8
instead of/usr/share/pythia8
. First letter in caps is also the default by pythia. So typical tools using pythia expect it with a capital first letter.share/Pythia8/pdfdata
installationEPREFIX
as absolute instead of relative path for--prefix-lib