Skip to content
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.

Sign up for GitHub

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

Add GenFit and HepMC as the dependencies of CEPC and Re-enable the CEPCSW and k4LCIOReader in key4hep-stack #150

Merged
merged 7 commits into from
Jan 18, 2021
Merged

Add GenFit and HepMC as the dependencies of CEPC and Re-enable the CEPCSW and k4LCIOReader in key4hep-stack #150

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
725ece3
WIP: add genfit and hepmc for the latest CEPCSW.
mirguest Jan 15, 2021
45baeab
WIP: the migration to Gaudi v35 is done in the master branch of CEPCSW
mirguest Jan 15, 2021
cb89521
WIP: add k4FWCore v0.3.0
mirguest Jan 16, 2021
b979a38
WIP: add k4pandora.
mirguest Jan 16, 2021
7063014
Update packages/k4pandora/package.py
mirguest Jan 18, 2021
684f13e
Update packages/k4pandora/package.py
mirguest Jan 18, 2021
1717a56
WIP: add CEPCSW v0.1.2 and v0.2.0
mirguest Jan 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/cepcsw/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ class Cepcsw(CMakePackage, Key4hepPackage):
depends_on('gaudi@:34.99', when='@:0.1.99')
depends_on('[email protected]:', when='@0.2:')
depends_on('gear')
depends_on('genfit')
depends_on('lcio')
depends_on('lccontent')
depends_on('hepmc')
depends_on('pandorasdk')
depends_on('pandorapfa')
depends_on('root')
Expand Down
4 changes: 3 additions & 1 deletion packages/k4lcioreader/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class K4lcioreader(CMakePackage, Key4hepPackage):
k4_add_latest_commit_as_version(git)
version('0.1.0', sha256='996d1ff78c0a8a2f7f358dd4ea19f955853ad0902ee86b99c484de58c5fc2e2c')
version('0.2.0', sha256='346fc2ba4b4175895597e093f566ba6407be9eeb9cde0766304e0f19ad03e081')
version('0.3.0', sha256='ce6a5596a21bfa23e641eda84830d8aa7caf15fd47da35878ee61e7f555d0e51')

variant('cxxstd',
default='17',
Expand All @@ -25,7 +26,8 @@ class K4lcioreader(CMakePackage, Key4hepPackage):
depends_on('lcio')
depends_on('[email protected]:')
depends_on('edm4hep')
depends_on('[email protected]')
depends_on('[email protected]', when='@:0.2.0')
depends_on('[email protected]:', when='@0.3:')

def cmake_args(self):
args = []
Expand Down
54 changes: 54 additions & 0 deletions packages/k4pandora/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)

from spack import *
from spack.pkg.k4.Ilcsoftpackage import Key4hepPackage, k4_add_latest_commit_as_version


class K4pandora(CMakePackage, Key4hepPackage):
"""k4Pandora is a pandora app for the Key4HEP software framework"""

homepage = "https://github.com/key4hep/k4Pandora"
url = "https://github.com/key4hep/k4Pandora/archive/master.tar.gz"
git = "https://github.com/key4hep/k4Pandora.git"

maintainers = ['mirguest']
mirguest marked this conversation as resolved.
Show resolved Hide resolved

variant('cxxstd',
default='17',
values=('14', '17'),
multi=False,
description='Use the specified C++ standard when building.')

k4_add_latest_commit_as_version(git)
version('master', branch='master')

depends_on('clhep')
depends_on('dd4hep +geant4')
depends_on('edm4hep')
depends_on('[email protected]:')
depends_on('[email protected]:')
depends_on('gear')
depends_on('lcio')
depends_on('lccontent')
depends_on('hepmc')
depends_on('pandorasdk')
depends_on('pandorapfa')
depends_on('root')

def cmake_args(self):
args = []
# C++ Standard
args.append('-DCMAKE_CXX_STANDARD=%s'%self.spec.variants['cxxstd'].value)
if self.spec.satisfies('^gaudi@:34.99'):
args.append('-DHOST_BINARY_TAG=x86_64-linux-gcc9-opt')
mirguest marked this conversation as resolved.
Show resolved Hide resolved

pandorapfa_prefix = self.spec["pandorapfa"].prefix
pandorapfa_cmake_modules = pandorapfa_prefix + "/cmakemodules"

cmake_modules = pandorapfa_cmake_modules
args.append('-DCMAKE_MODULE_PATH=%s'%cmake_modules)
return args

8 changes: 4 additions & 4 deletions packages/key4hep-stack/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@ class Key4hepStack(BundlePackage, Key4hepPackage):

############################## cepcsw #################
#######################################################
#depends_on("cepcsw")
#k4_add_latest_commit_as_dependency("cepcsw", "cepc/cepcsw", when="@master")
depends_on("cepcsw")
vvolkl marked this conversation as resolved.
Show resolved Hide resolved
k4_add_latest_commit_as_dependency("cepcsw", "cepc/cepcsw", when="@master")

#depends_on("k4lcioreader")
#k4_add_latest_commit_as_dependency("k4lcioreader", "key4hep/k4LCIOReader", when="@master")
depends_on("k4lcioreader")
k4_add_latest_commit_as_dependency("k4lcioreader", "key4hep/k4LCIOReader", when="@master")


##################### developer tools #################
Expand Down