Skip to content

Updated Geant4 and dependencies clhep and vecgeom to use cxxstd= variant#10518

Merged
gartung merged 24 commits intospack:developfrom
gartung:geant4-clhep-update
Feb 14, 2019
Merged

Updated Geant4 and dependencies clhep and vecgeom to use cxxstd= variant#10518
gartung merged 24 commits intospack:developfrom
gartung:geant4-clhep-update

Conversation

@gartung
Copy link
Copy Markdown
Member

@gartung gartung commented Feb 5, 2019

so that it is applied consistently.

@gartung gartung force-pushed the geant4-clhep-update branch from 7d9563a to d9f23aa Compare February 6, 2019 22:32
greenc-FNAL added a commit to FNALssi/spack that referenced this pull request Feb 6, 2019
@gartung gartung requested a review from adamjstewart February 8, 2019 19:01
@gartung
Copy link
Copy Markdown
Member Author

gartung commented Feb 13, 2019

@drbenmorgan can you please add a review.

@gartung gartung requested review from alalazo and healther February 13, 2019 15:30
patch('cxx17_geant4_10_0.patch', level=1, when='@10.04.00: cxxstd=17')
depends_on("[email protected] cxxstd=17", when="@10.04 cxxstd=17")
depends_on("[email protected] cxxstd=17", when="@10.03.p03 cxxstd=17")
depends_on("vecgeom cxxstd=17", when="+vecgeom cxxstd=17")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

With #10561 merged, and xerces-c always on, depends_on('xerces-c cxxstd=NN', when='cxxstd=NN') should be added for 11, 14 and 17.

@drbenmorgan
Copy link
Copy Markdown
Member

@gartung only one minor suggestion in the Geant4 package.py.

The data dependencies also look o.k., and definitely the way to go with this package. My only thought would be whether to split the data work into a separate PR for clarity/orthogonality, but I defer to Spack's policy here. One thing to look at would be introducing a geant4-data package between geant4 and the individual data libraries. It might keep the version mapping and creation of the data "view" in one place? In geant4 the dependency would just be expressed as

depends_on('geant4-data@VERSION', when='@VERSION')

Anyway, we can think about that later!

@gartung
Copy link
Copy Markdown
Member Author

gartung commented Feb 13, 2019

@drbenmorgan the naming of the data packages follows the FNAL ups package names. This does not always match the Geant4 name. Do you think I should rename them?

@gartung gartung merged commit 0748a32 into spack:develop Feb 14, 2019
@gartung gartung deleted the geant4-clhep-update branch February 14, 2019 15:39
gartung added a commit to gartung/spack that referenced this pull request Feb 14, 2019
…ant (spack#10518)

* Updated Geant4 and dependencies clhep and vecgeom to use cxxstd= variant so that it is applied consistently.

* Make standalone geant4 data packages that are used when data is not installed with geant4. This allows installing the data files are externals that can be common to many compiler version.

* move geant4 data package dependencies to umbrella package geant4-data

Conflicts:
	var/spack/repos/builtin/packages/geant4/package.py
@gartung gartung restored the geant4-clhep-update branch February 14, 2019 21:14
@gartung gartung deleted the geant4-clhep-update branch February 27, 2019 23:44
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.

2 participants