Skip to content

Commit

Permalink
Changes for the latest build (#567)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcarcell authored Mar 9, 2024
1 parent a7badc0 commit 3100342
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .latest-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18051dbb6278a18705d6f1a48d97650f701967fe
12963c894f59bf03f2f8ab94536019d9f82d3527
16 changes: 14 additions & 2 deletions environments/key4hep-common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ packages:
boost:
require: +python
buildable: true
curl:
require: +gssapi
dd4hep:
require: +edm4hep+lcio+xercesc+hepmc3
gaudi:
# +examples seems not be compatible with newer versions of python
require: +aida+cppunit+examples+gperftools+heppdt+jemalloc+unwind+xercesc
require: +aida+cppunit+examples+gaudialg+gperftools+heppdt+jemalloc+unwind+xercesc
gdb:
require: +python+tui+source-highlight~debuginfod
# https://github.com/key4hep/key4hep-spack/pull/501
Expand All @@ -33,6 +35,8 @@ packages:
# Requested by Thomas Madlener for DESY, without CUDA and before v2
py-torch:
require: ~cuda
texlive:
require: scheme=basic
xrootd:
require: +krb5

Expand Down Expand Up @@ -64,10 +68,18 @@ packages:
externals:
- spec: krb5@99
prefix: /usr
# Use the system ssh, otherwise the configuration for the provided ssh will likely be
# different and things like ssh using kerberos won't work (by extension authentication
# for git with ssh with kerberos)
openssh:
buildable: False
externals:
- spec: openssh@99
prefix: /usr


root:
require: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20 build_type=RelWithDebInfo
require: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20
py-tensorflow:
require: ~cuda~nccl
whizard:
Expand Down
2 changes: 1 addition & 1 deletion environments/key4hep-nightly/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ packages:
raida:
variants: build_type=RelWithDebInfo cxxstd=20
root:
variants: build_type=RelWithDebInfo cxxstd=20
variants: build_type=Release cxxstd=20
require: cxxstd=20
sio:
variants: build_type=RelWithDebInfo cxxstd=20
Expand Down
1 change: 0 additions & 1 deletion environments/key4hep-nightly/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ spack:
repos:
- ../..
specs:
- lhapdf~python
- key4hep-stack+devtools
2 changes: 2 additions & 0 deletions packages/key4hep-stack/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ class Key4hepStack(BundlePackage, Key4hepPackage):
# depends_on('prmon', when='+devtools')
depends_on("py-awkward", when="+devtools")
depends_on("py-black", when="+devtools")
depends_on("py-flake8", when="+devtools")
depends_on("py-pylint", when="+devtools")
depends_on("py-boto3", when="+devtools")
depends_on("py-gcovr", when="+devtools")
depends_on("py-h5py", when="+devtools")
Expand Down

0 comments on commit 3100342

Please sign in to comment.