Herwig3: make njet, vbfnlo dependencies optional... (#33941)
* Herwig3: make njet, vbfnlo dependencies optional... also drop openloops dependency when building on PowerPC * Update package.py
This commit is contained in:
parent
f63fb2f521
commit
f66ec00fa9
@ -33,14 +33,22 @@ class Herwig3(AutotoolsPackage):
|
|||||||
depends_on("python", type=("build", "run"))
|
depends_on("python", type=("build", "run"))
|
||||||
depends_on("gsl")
|
depends_on("gsl")
|
||||||
depends_on("fastjet")
|
depends_on("fastjet")
|
||||||
depends_on("vbfnlo@3:")
|
depends_on("vbfnlo@3:", when="+vbfnlo")
|
||||||
depends_on("madgraph5amc")
|
depends_on("madgraph5amc")
|
||||||
|
depends_on("njet", when="+njet")
|
||||||
|
depends_on("py-gosam")
|
||||||
depends_on("njet")
|
depends_on("njet")
|
||||||
depends_on("gosam-contrib")
|
depends_on("gosam-contrib")
|
||||||
depends_on("openloops")
|
|
||||||
|
# OpenLoops fail to build on PPC64: error: detected recursion whilst expanding macro "vector"
|
||||||
|
depends_on("openloops", when="target=aarch64:")
|
||||||
|
depends_on("openloops", when="target=x86_64:")
|
||||||
|
|
||||||
force_autoreconf = True
|
force_autoreconf = True
|
||||||
|
|
||||||
|
variant("vbfnlo", default=True, description="Use VBFNLO")
|
||||||
|
variant("njet", default=True, description="Use NJet")
|
||||||
|
|
||||||
def autoreconf(self, spec, prefix):
|
def autoreconf(self, spec, prefix):
|
||||||
autoreconf("--install", "--verbose", "--force")
|
autoreconf("--install", "--verbose", "--force")
|
||||||
|
|
||||||
@ -54,11 +62,16 @@ def configure_args(self):
|
|||||||
"--with-madgraph=" + self.spec["madgraph5amc"].prefix,
|
"--with-madgraph=" + self.spec["madgraph5amc"].prefix,
|
||||||
"--with-openloops=" + self.spec["openloops"].prefix,
|
"--with-openloops=" + self.spec["openloops"].prefix,
|
||||||
"--with-gosam-contrib=" + self.spec["gosam-contrib"].prefix,
|
"--with-gosam-contrib=" + self.spec["gosam-contrib"].prefix,
|
||||||
"--with-njet=" + self.spec["njet"].prefix,
|
|
||||||
"--with-vbfnlo=" + self.spec["vbfnlo"].prefix,
|
|
||||||
"--with-evtgen=" + self.spec["evtgen"].prefix,
|
"--with-evtgen=" + self.spec["evtgen"].prefix,
|
||||||
|
"--with-gosam=" + self.spec["py-gosam"].prefix,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if self.spec.satisfies("+njet"):
|
||||||
|
args.append("--with-njet=" + self.spec["njet"].prefix)
|
||||||
|
|
||||||
|
if self.spec.satisfies("+vbfnlo"):
|
||||||
|
args.append("--with-vbfnlo=" + self.spec["vbfnlo"].prefix)
|
||||||
|
|
||||||
return args
|
return args
|
||||||
|
|
||||||
def flag_handler(self, name, flags):
|
def flag_handler(self, name, flags):
|
||||||
@ -76,10 +89,6 @@ def setup_build_environment(self, env):
|
|||||||
|
|
||||||
def build(self, spec, prefix):
|
def build(self, spec, prefix):
|
||||||
make()
|
make()
|
||||||
with working_dir("MatrixElement/FxFx"):
|
|
||||||
make()
|
|
||||||
|
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
make("install")
|
make("install")
|
||||||
with working_dir("MatrixElement/FxFx"):
|
|
||||||
make("install")
|
|
||||||
|
Loading…
Reference in New Issue
Block a user