zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

builtin: delete spack.store import (#50383)

Browse Source
This commit is contained in:
Harmen Stoppels 2025-05-08 18:31:11 +02:00 committed by GitHub
parent 9fa2bb375c
commit 6f2393a345
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
var/spack/repos/spack_repo/builtin/packages/cbtf_krell/package.py
View File

@ -2,7 +2,6 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
import spack.store
from spack.package import *
@ -41,11 +40,6 @@ class CbtfKrell(CMakePackage):
description="The build type to build",
values=("Debug", "Release", "RelWithDebInfo"),
)
variant(
"crayfe",
default=False,
description="build only the FE tool using the runtime_dir to point to target build.",
)
# Fix build errors with gcc >= 10
patch(
@ -147,44 +141,6 @@ def set_mpi_cmake_options(self, spec, cmake_options):
cmake_options.extend(mpi_options)
def set_cray_login_node_cmake_options(self, spec, cmake_options):
# Appends to cmake_options the options that will enable
# the appropriate Cray login node libraries
cray_login_node_options = []
rt_platform = "cray"
# How do we get the compute node (CNL) cbtf package
# install directory path. spec['cbtf'].prefix is the
# login node path for this build, as we are building
# the login node components with this spack invocation. We
# need these paths to be the ones created in the CNL
# spack invocation.
be_cbtf = spack.store.db.query_one("cbtf arch=cray-CNL-haswell")
be_cbtfk = spack.store.db.query_one("cbtf-krell arch=cray-CNL-haswell")
be_papi = spack.store.db.query_one("papi arch=cray-CNL-haswell")
be_boost = spack.store.db.query_one("boost arch=cray-CNL-haswell")
be_mont = spack.store.db.query_one("libmonitor arch=cray-CNL-haswell")
be_unw = spack.store.db.query_one("libunwind arch=cray-CNL-haswell")
be_xer = spack.store.db.query_one("xerces-c arch=cray-CNL-haswell")
be_dyn = spack.store.db.query_one("dyninst arch=cray-CNL-haswell")
be_mrnet = spack.store.db.query_one("mrnet arch=cray-CNL-haswell")
cray_login_node_options.append("-DCN_RUNTIME_PLATFORM=%s" % rt_platform)
# Use install directories as CMAKE args for the building
# of login cbtf-krell
cray_login_node_options.append("-DCBTF_CN_RUNTIME_DIR=%s" % be_cbtf.prefix)
cray_login_node_options.append("-DCBTF_KRELL_CN_RUNTIME_DIR=%s" % be_cbtfk.prefix)
cray_login_node_options.append("-DPAPI_CN_RUNTIME_DIR=%s" % be_papi.prefix)
cray_login_node_options.append("-DBOOST_CN_RUNTIME_DIR=%s" % be_boost.prefix)
cray_login_node_options.append("-DLIBMONITOR_CN_RUNTIME_DIR=%s" % be_mont.prefix)
cray_login_node_options.append("-DLIBUNWIND_CN_RUNTIME_DIR=%s" % be_unw.prefix)
cray_login_node_options.append("-DXERCESC_CN_RUNTIME_DIR=%s" % be_xer.prefix)
cray_login_node_options.append("-DDYNINST_CN_RUNTIME_DIR=%s" % be_dyn.prefix)
cray_login_node_options.append("-DMRNET_CN_RUNTIME_DIR=%s" % be_mrnet.prefix)
cmake_options.extend(cray_login_node_options)
def cmake_args(self):
spec = self.spec
@ -218,11 +174,6 @@ def cmake_args(self):
# Add any MPI implementations coming from variant settings
self.set_mpi_cmake_options(spec, cmake_args)
if self.spec.satisfies("+crayfe"):
# We need to build target/compute node components/libraries first
# then pass those libraries to the cbtf-krell login node build
self.set_cray_login_node_cmake_options(spec, cmake_args)
return cmake_args
def setup_run_environment(self, env: EnvironmentModifications) -> None:

41
var/spack/repos/spack_repo/builtin/packages/openspeedshop/package.py
View File

@ -4,7 +4,6 @@
import os
import spack.store
from spack.package import *
from ..boost.package import Boost
@ -38,11 +37,6 @@ class Openspeedshop(CMakePackage):
variant(
"runtime", default=False, description="build only the runtime libraries and collectors."
)
variant(
"crayfe",
default=False,
description="build only the FE tool using the runtime_dir to point to target build.",
)
variant("cuda", default=False, description="build with cuda packages included.")
variant(
@ -123,11 +117,6 @@ class Openspeedshop(CMakePackage):
depends_on("cbtf-krell@develop", when="@develop", type=("build", "link", "run"))
depends_on("cbtf-krell@1.9.3:9999", when="@2.4.0:9999", type=("build", "link", "run"))
depends_on("cbtf-krell@develop+crayfe", when="@develop+crayfe", type=("build", "link", "run"))
depends_on(
"cbtf-krell@1.9.3:9999+crayfe", when="@2.4.0:9999+crayfe", type=("build", "link", "run")
)
depends_on("cbtf-krell@develop+mpich2", when="@develop+mpich2", type=("build", "link", "run"))
depends_on(
"cbtf-krell@1.9.3:9999+mpich2", when="@2.4.0:9999+mpich2", type=("build", "link", "run")
@ -164,29 +153,6 @@ class Openspeedshop(CMakePackage):
build_directory = "build_openspeedshop"
def set_cray_login_node_cmake_options(self, spec, cmake_options):
# Appends to cmake_options the options that will enable the appropriate
# Cray login node libraries
cray_login_node_options = []
rt_platform = "cray"
# How do we get the compute node (CNL) cbtf package install
# directory path?
# spec['cbtf'].prefix is the login node value for this build, as
# we only get here when building the login node components and
# that is all that is known to spack.
store = spack.store
be_ck = store.db.query_one("cbtf-krell arch=cray-CNL-haswell")
# Equivalent to install-tool cmake arg:
# '-DCBTF_KRELL_CN_RUNTIME_DIR=%s'
# % <base dir>/cbtf_v2.4.0.release/compute)
cray_login_node_options.append("-DCBTF_KRELL_CN_RUNTIME_DIR=%s" % be_ck.prefix)
cray_login_node_options.append("-DRUNTIME_PLATFORM=%s" % rt_platform)
cmake_options.extend(cray_login_node_options)
def cmake_args(self):
spec = self.spec
@ -240,13 +206,6 @@ def cmake_args(self):
if spec.satisfies("+cuda"):
cmake_args.extend(["-DCBTF_ARGONAVIS_DIR=%s" % spec["cbtf-argonavis"].prefix])
if spec.satisfies("+crayfe"):
# We need to build target/compute node
# components/libraries first then pass
# those libraries to the openspeedshop
# login node build
self.set_cray_login_node_cmake_options(spec, cmake_args)
return cmake_args
def set_defaultbase_cmake_options(self, spec, cmake_options):

40
var/spack/repos/spack_repo/builtin/packages/openspeedshop_utils/package.py
View File

@ -4,7 +4,6 @@
import os
import spack.store
from spack.package import *
from ..boost.package import Boost
@ -41,11 +40,6 @@ class OpenspeedshopUtils(CMakePackage):
variant(
"runtime", default=False, description="build only the runtime libraries and collectors."
)
variant(
"crayfe",
default=False,
description="build only the FE tool using the runtime_dir to point to target build.",
)
variant("cuda", default=False, description="build with cuda packages included.")
variant(
@ -117,11 +111,6 @@ class OpenspeedshopUtils(CMakePackage):
depends_on("cbtf-krell@develop", when="@develop", type=("build", "link", "run"))
depends_on("cbtf-krell@1.9.3:9999", when="@2.4.0:9999", type=("build", "link", "run"))
depends_on("cbtf-krell@develop+crayfe", when="@develop+crayfe", type=("build", "link", "run"))
depends_on(
"cbtf-krell@1.9.3:9999+crayfe", when="@2.4.0:9999+crayfe", type=("build", "link", "run")
)
depends_on("cbtf-krell@develop+mpich2", when="@develop+mpich2", type=("build", "link", "run"))
depends_on(
"cbtf-krell@1.9.3:9999+mpich2", when="@2.4.0:9999+mpich2", type=("build", "link", "run")
@ -158,28 +147,6 @@ class OpenspeedshopUtils(CMakePackage):
build_directory = "build_openspeedshop"
def set_cray_login_node_cmake_options(self, spec, cmake_options):
# Appends to cmake_options the options that will enable the appropriate
# Cray login node libraries
cray_login_node_options = []
rt_platform = "cray"
# How do we get the compute node (CNL) cbtf package install
# directory path?
# spec['cbtf'].prefix is the login node value for this build, as
# we only get here when building the login node components and
# that is all that is known to spack.
be_ck = spack.store.db.query_one("cbtf-krell arch=cray-CNL-haswell")
# Equivalent to install-tool cmake arg:
# '-DCBTF_KRELL_CN_RUNTIME_DIR=%s'
# % <base dir>/cbtf_v2.4.0elease/compute)
cray_login_node_options.append("-DCBTF_KRELL_CN_RUNTIME_DIR=%s" % be_ck.prefix)
cray_login_node_options.append("-DRUNTIME_PLATFORM=%s" % rt_platform)
cmake_options.extend(cray_login_node_options)
def cmake_args(self):
# Appends base options to cmake_args
spec = self.spec
@ -220,13 +187,6 @@ def cmake_args(self):
]
)
if spec.satisfies("+crayfe"):
# We need to build target/compute node
# components/libraries first then pass
# those libraries to the openspeedshop
# login node build
self.set_cray_login_node_cmake_options(spec, cmake_args)
cmake_args.extend(["-DBUILD_QT3_GUI=FALSE"])
return cmake_args