From 725ece34b1adfced569f5b60b804aeb95f0c7fc6 Mon Sep 17 00:00:00 2001 From: lintao Date: Fri, 15 Jan 2021 23:51:11 +0800 Subject: [PATCH 1/7] WIP: add genfit and hepmc for the latest CEPCSW. --- packages/cepcsw/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/cepcsw/package.py b/packages/cepcsw/package.py index b87c7334..2ee85f87 100644 --- a/packages/cepcsw/package.py +++ b/packages/cepcsw/package.py @@ -32,8 +32,10 @@ class Cepcsw(CMakePackage, Key4hepPackage): depends_on('gaudi@:34.99', when='@:0.1.99') depends_on('gaudi@35.0:', 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') From 45baeab3b12b0d425952c4d34a09f9d8aa0447fa Mon Sep 17 00:00:00 2001 From: lintao Date: Fri, 15 Jan 2021 23:57:35 +0800 Subject: [PATCH 2/7] WIP: the migration to Gaudi v35 is done in the master branch of CEPCSW --- packages/key4hep-stack/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/key4hep-stack/package.py b/packages/key4hep-stack/package.py index d2eb208d..c2682d47 100644 --- a/packages/key4hep-stack/package.py +++ b/packages/key4hep-stack/package.py @@ -244,8 +244,8 @@ class Key4hepStack(BundlePackage, Key4hepPackage): ############################## cepcsw ################# ####################################################### - #depends_on("cepcsw") - #k4_add_latest_commit_as_dependency("cepcsw", "cepc/cepcsw", when="@master") + depends_on("cepcsw") + 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") From cb89521d12b1b3ccc6fd53d71a323614f7c42e31 Mon Sep 17 00:00:00 2001 From: lintao Date: Sat, 16 Jan 2021 11:03:37 +0800 Subject: [PATCH 3/7] WIP: add k4FWCore v0.3.0 --- packages/k4lcioreader/package.py | 4 +++- packages/key4hep-stack/package.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/k4lcioreader/package.py b/packages/k4lcioreader/package.py index af6697c5..46becd35 100644 --- a/packages/k4lcioreader/package.py +++ b/packages/k4lcioreader/package.py @@ -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', @@ -25,7 +26,8 @@ class K4lcioreader(CMakePackage, Key4hepPackage): depends_on('lcio') depends_on('podio@0.12:') depends_on('edm4hep') - depends_on('k4fwcore@0.2.0') + depends_on('k4fwcore@0.2.0', when='@:0.2.0') + depends_on('k4fwcore@0.3.0:', when='@0.3:') def cmake_args(self): args = [] diff --git a/packages/key4hep-stack/package.py b/packages/key4hep-stack/package.py index c2682d47..aee54ea5 100644 --- a/packages/key4hep-stack/package.py +++ b/packages/key4hep-stack/package.py @@ -247,8 +247,8 @@ class Key4hepStack(BundlePackage, Key4hepPackage): depends_on("cepcsw") 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 ################# From b979a38d0995fc1b833517e0bb08b6135d56ac0b Mon Sep 17 00:00:00 2001 From: lintao Date: Sat, 16 Jan 2021 17:19:02 +0800 Subject: [PATCH 4/7] WIP: add k4pandora. --- packages/k4pandora/package.py | 54 +++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 packages/k4pandora/package.py diff --git a/packages/k4pandora/package.py b/packages/k4pandora/package.py new file mode 100644 index 00000000..5657e110 --- /dev/null +++ b/packages/k4pandora/package.py @@ -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'] + + 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('k4fwcore@0.3.0:') + depends_on('gaudi@35.0:') + 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') + + 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 + From 706301468981855fa9ac7f8e0a97b8b02cf194ff Mon Sep 17 00:00:00 2001 From: Tao Lin <831611+mirguest@users.noreply.github.com> Date: Mon, 18 Jan 2021 17:37:35 +0800 Subject: [PATCH 5/7] Update packages/k4pandora/package.py Co-authored-by: vvolkl --- packages/k4pandora/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/k4pandora/package.py b/packages/k4pandora/package.py index 5657e110..3c6bc9b8 100644 --- a/packages/k4pandora/package.py +++ b/packages/k4pandora/package.py @@ -14,6 +14,8 @@ class K4pandora(CMakePackage, Key4hepPackage): url = "https://github.com/key4hep/k4Pandora/archive/master.tar.gz" git = "https://github.com/key4hep/k4Pandora.git" + tags = ['hep', 'key4hep'] + maintainers = ['mirguest'] variant('cxxstd', @@ -51,4 +53,3 @@ def cmake_args(self): cmake_modules = pandorapfa_cmake_modules args.append('-DCMAKE_MODULE_PATH=%s'%cmake_modules) return args - From 684f13e8b6d19202eaeb29d4d064ba418197cfad Mon Sep 17 00:00:00 2001 From: Tao Lin <831611+mirguest@users.noreply.github.com> Date: Mon, 18 Jan 2021 17:37:42 +0800 Subject: [PATCH 6/7] Update packages/k4pandora/package.py Co-authored-by: vvolkl --- packages/k4pandora/package.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/k4pandora/package.py b/packages/k4pandora/package.py index 3c6bc9b8..501ecd13 100644 --- a/packages/k4pandora/package.py +++ b/packages/k4pandora/package.py @@ -44,8 +44,6 @@ 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') pandorapfa_prefix = self.spec["pandorapfa"].prefix pandorapfa_cmake_modules = pandorapfa_prefix + "/cmakemodules" From 1717a564203944d7754fc8594836ab859fbc8125 Mon Sep 17 00:00:00 2001 From: lintao Date: Mon, 18 Jan 2021 22:08:48 +0800 Subject: [PATCH 7/7] WIP: add CEPCSW v0.1.2 and v0.2.0 --- packages/cepcsw/package.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/cepcsw/package.py b/packages/cepcsw/package.py index 2ee85f87..51641471 100644 --- a/packages/cepcsw/package.py +++ b/packages/cepcsw/package.py @@ -23,6 +23,8 @@ class Cepcsw(CMakePackage, Key4hepPackage): k4_add_latest_commit_as_version(git) version('master', branch='master') version('0.1.1', sha256='0d56c2e63c0d91a64854c44ab4c0575fb0646cb566113721e3f35aee24e6a334') + version('0.1.2', sha256='2caaf0723fa2561e97eb303e245b6a5e25185d4195b48c6a30dcc8d315951f42') + version('0.2.0', sha256='1ca9823ef4492c25e776de9f2f4884ed9068f907b4e080342276d92ad4071af6') depends_on('clhep') depends_on('dd4hep +geant4')