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

Merge remote-tracking branch 'origin' into psakiev/dev-build

Browse Source
This commit is contained in:
psakiev 2024-11-12 13:18:16 -07:00
commit 973f59abbc
50 changed files with 1329 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/docs/getting_started.rst
View File

@ -35,7 +35,7 @@ A build matrix showing which packages are working on which systems is shown belo
.. code-block:: console
apt update
apt install build-essential ca-certificates coreutils curl environment-modules gfortran git gpg lsb-release python3 python3-distutils python3-venv unzip zip
apt install bzip2 ca-certificates file g++ gcc gfortran git gzip lsb-release patch python3 tar unzip xz-utils zstd
.. tab-item:: RHEL
@ -43,14 +43,14 @@ A build matrix showing which packages are working on which systems is shown belo
dnf install epel-release
dnf group install "Development Tools"
dnf install curl findutils gcc-gfortran gnupg2 hostname iproute redhat-lsb-core python3 python3-pip python3-setuptools unzip python3-boto3
dnf install gcc-gfortran redhat-lsb-core python3 unzip
.. tab-item:: macOS Brew
.. code-block:: console
brew update
brew install curl gcc git gnupg zip
brew install gcc git zip
------------
Installation

15
lib/spack/spack/compiler.py
View File

@ -428,6 +428,11 @@ def default_dynamic_linker(self) -> Optional[str]:
@property
def default_libc(self) -> Optional["spack.spec.Spec"]:
"""Determine libc targeted by the compiler from link line"""
# technically this should be testing the target platform of the compiler, but we don't have
# that, so stick to host platform for now.
if sys.platform in ("darwin", "win32"):
return None
dynamic_linker = self.default_dynamic_linker
if not dynamic_linker:
@ -449,14 +454,20 @@ def compiler_verbose_output(self) -> Optional[str]:
return self.cache.get(self).c_compiler_output
def _compile_dummy_c_source(self) -> Optional[str]:
cc = self.cc if self.cc else self.cxx
if self.cc:
cc = self.cc
ext = "c"
else:
cc = self.cxx
ext = "cc"
if not cc or not self.verbose_flag:
return None
try:
tmpdir = tempfile.mkdtemp(prefix="spack-implicit-link-info")
fout = os.path.join(tmpdir, "output")
fin = os.path.join(tmpdir, "main.c")
fin = os.path.join(tmpdir, f"main.{ext}")
with open(fin, "w") as csource:
csource.write(

1
var/spack/repos/builtin/packages/arrow/package.py
View File

@ -17,6 +17,7 @@ class Arrow(CMakePackage, CudaPackage):
license("Apache-2.0")
version("18.0.0", sha256="9c473f2c9914c59ab571761c9497cf0e5cfd3ea335f7782ccc6121f5cb99ae9b")
version("16.1.0", sha256="9762d9ecc13d09de2a03f9c625a74db0d645cb012de1e9a10dfed0b4ddc09524")
version("15.0.2", sha256="4735b349845bff1fe95ed11abbfed204eb092cabc37523aa13a80cb830fe5b5e")
version("14.0.2", sha256="07cdb4da6795487c800526b2865c150ab7d80b8512a31793e6a7147c8ccd270f")

1
var/spack/repos/builtin/packages/bfs/package.py
View File

@ -16,6 +16,7 @@ class Bfs(MakefilePackage):
license("0BSD")
version("4.0.4", sha256="209da9e9f43d8fe30fd689c189ea529e9d6b5358ce84a63a44721003aea3e1ca")
version("4.0.1", sha256="8117b76b0a967887278a11470cbfa9e7aeae98f11a7eeb136f456ac462e5ba23")
version("3.1.1", sha256="d73f345c1021e0630e0db930a3fa68dd1f968833037d8471ee1096e5040bf91b")
version("3.1", sha256="aa6a94231915d3d37e5dd62d194cb58a575a8f45270020f2bdd5ab41e31d1492")

49
var/spack/repos/builtin/packages/costo/package.py Normal file
View File

@ -0,0 +1,49 @@
# Copyright 2013-2024 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.package import *
class Costo(CMakePackage):
"""costo stand for COSimulation TOols.
Its a layer above MPI to share data between meshes.
"""
homepage = "https://gitlab.com/Te_ch/costo"
git = "https://gitlab.com/Te_ch/costo.git"
maintainers("tech-91")
license("LGPL-3.0-or-later")
version("0.0.5", tag="v0.0.5", preferred=True)
version("develop", branch="devel")
version("main", branch="main", deprecated=True)
variant("shared", default=True, description="Build shared library")
variant("tests", default=False, description="Enable testing")
depends_on("mpi", type=all)
depends_on("python@3.10:", type=all)
depends_on("py-non-regression-test-tools", type="build")
depends_on("py-pyvista", type=("build", "run"))
depends_on("py-numpy", type=("build", "link", "run"))
depends_on("py-mpi4py", type=("build", "run"))
depends_on("py-scipy", type=("build", "run"))
depends_on("py-mgmetis", type=("build", "run"))
depends_on("py-colorama", type=("build", "run"))
depends_on("py-pip", type="build")
def cmake_args(self):
args = [
# self.define("COSTO_ENABLE_TESTS", "OFF"),
self.define("COSTO_ENABLE_PYTHON_BINDINGS", "OFF"),
self.define("WITH_PYTHON_MODULE", "ON"),
self.define_from_variant("WITH_SHARED_LIBS", "shared"),
self.define_from_variant("WITH_TESTS", "tests"),
]
return args

1
var/spack/repos/builtin/packages/diamond/package.py
View File

@ -16,6 +16,7 @@ class Diamond(CMakePackage):
license("GPL-3.0-only")
version("2.1.10", sha256="c6ede5df30d9d496af314e740964c35a0e358458d9c8d9b8dd517d69828d9981")
version("2.1.9", sha256="4cde9df78c63e8aef9df1e3265cd06a93ce1b047d6dba513a1437719b70e9d88")
version("2.1.8", sha256="b6088259f2bc92d1f9dc4add44590cff68321bcbf91eefbc295a3525118b9415")
version("2.1.7", sha256="2dcaba0e79ecb02c3d2a6816d317e714767118a9a056721643abff4c586ca95b")

13
var/spack/repos/builtin/packages/environment-modules/package.py
View File

@ -13,12 +13,13 @@ class EnvironmentModules(Package):
"""
homepage = "https://cea-hpc.github.io/modules/"
url = "https://github.com/cea-hpc/modules/releases/download/v5.4.0/modules-5.4.0.tar.gz"
url = "https://github.com/cea-hpc/modules/releases/download/v5.5.0/modules-5.5.0.tar.gz"
git = "https://github.com/cea-hpc/modules.git"
maintainers("xdelaruelle")
version("main", branch="main")
version("5.5.0", sha256="ad0e360c7adc2515a99836863d98499b3ad89cd7548625499b20293845b040cb")
version("5.4.0", sha256="586245cbf9420866078d8c28fce8ef4f192530c69a0f368f51e848340dcf3b90")
version("5.3.1", sha256="d02f9ce4f8baf6c99edceb7c73bfdd1e97d77bcc4725810b86efed9f58dda962")
version("5.3.0", sha256="21b8daa0181044ef65097a1e3517af1f24e7c7343cc5bdaf70be11e3cb0edb51")
@ -62,6 +63,7 @@ class EnvironmentModules(Package):
variant("X", default=True, description="Build with X functionality")
depends_on("util-linux", type=("build", "run"), when="@5.5:")
depends_on("less", type=("build", "run"), when="@4.1:")
with when("@main"):
depends_on("autoconf", type="build")
@ -75,7 +77,8 @@ class EnvironmentModules(Package):
# Dependencies:
depends_on("tcl", type=("build", "link", "run"))
depends_on("tcl@8.4:", type=("build", "link", "run"), when="@4.0.0:4.8")
depends_on("tcl@8.5:", type=("build", "link", "run"), when="@5.0.0:")
depends_on("tcl@8.5:8", type=("build", "link", "run"), when="@5.0.0:5.4.0")
depends_on("tcl@8.5:", type=("build", "link", "run"), when="@5.5.0:")
def install(self, spec, prefix):
tcl = spec["tcl"]
@ -95,6 +98,9 @@ def install(self, spec, prefix):
if spec.satisfies("~X"):
config_args = ["--without-x"] + config_args
if self.spec.satisfies("@5.5.0:"):
config_args.extend(["--enable-conflict-unload"])
if self.spec.satisfies("@4.4.0:4.8"):
config_args.extend(
[
@ -140,6 +146,9 @@ def install(self, spec, prefix):
]
)
if self.spec.satisfies("@5.5:"):
config_args.append(f"--with-logger={str(self.spec['util-linux'].prefix.bin.logger)}")
if self.spec.satisfies("@4.1:"):
config_args.append(f"--with-pager={str(self.spec['less'].prefix.bin.less)}")

11
var/spack/repos/builtin/packages/expat/package.py
View File

@ -16,9 +16,14 @@ class Expat(AutotoolsPackage, CMakePackage):
url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.bz2"
license("MIT")
version("2.6.3", sha256="b8baef92f328eebcf731f4d18103951c61fa8c8ec21d5ff4202fb6f2198aeb2d")
# deprecate all releases before 2.6.3 because of security issues
version("2.6.4", sha256="8dc480b796163d4436e6f1352e71800a774f73dbae213f1860b60607d2a83ada")
# deprecate all releases before 2.6.4 because of security issues
# CVE-2024-50602 (fixed in 2.6.4)
version(
"2.6.3",
sha256="b8baef92f328eebcf731f4d18103951c61fa8c8ec21d5ff4202fb6f2198aeb2d",
deprecated=True,
)
# CVE-2024-45490 (fixed in 2.6.3)
# CVE-2024-45491 (fixed in 2.6.3)
# CVE-2024-45492 (fixed in 2.6.3)

19
var/spack/repos/builtin/packages/extrae/dyninst_instruction.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/src/launcher/dyninst/commonSnippets.C b/src/launcher/dyninst/commonSnippets.C
index 94904a23..2f918949 100644
--- a/src/launcher/dyninst/commonSnippets.C
+++ b/src/launcher/dyninst/commonSnippets.C
@@ -482,9 +482,10 @@ string decodeBasicBlocks(BPatch_function * function, string routine)
ParseAPI::Block* b = ParseAPI::convert(block);
void * buf = b->region()->getPtrToInstruction(b->start());
InstructionAPI::InstructionDecoder dec((unsigned char*)buf,b->size(),b->region()->getArch());
- InstructionAPI::Instruction::Ptr insn;
- while((insn = dec.decode())) {
- res <<loop_name<<"# "<<line++<<": "<< insn->format() << endl;
+ InstructionAPI::Instruction insn = dec.decode();
+ while(insn.isValid()) {
+ res <<loop_name<<"# "<<line++<<": "<< insn.format() << endl;
+ insn = dec.decode();
}
}
return res.str();

30
var/spack/repos/builtin/packages/extrae/package.py
View File

@ -16,6 +16,8 @@
# --with-papi=/usr
# --with-dwarf=/usr
# --with-elf=/usr
# --with-elfutils=/usr
# --with-tbb=/usr
# --with-dyninst=/usr
# --with-binutils=/usr
# --with-xml-prefix=/usr
@ -88,7 +90,10 @@ class Extrae(AutotoolsPackage):
build_directory = "spack-build"
variant("dyninst", default=False, description="Use dyninst for dynamic code installation")
depends_on("dyninst@:9", when="+dyninst")
with when("+dyninst"):
depends_on("dyninst@10.1.0:")
depends_on("elfutils", when="@4.1.2:")
depends_on("intel-oneapi-tbb", when="@4.1.2:")
variant("papi", default=True, description="Use PAPI to collect performance counters")
depends_on("papi", when="+papi")
@ -106,6 +111,12 @@ class Extrae(AutotoolsPackage):
description="Enable single MPI instrumentation library that supports both Fortran and C",
)
patch(
"dyninst_instruction.patch",
when="@:4.0.6 +dyninst",
sha256="c1df1627b51b9d0f38711aee50ff11f30ffc34c43e520c39118157e9c31a927e",
)
def configure_args(self):
spec = self.spec
if spec.satisfies("^[virtuals=mpi] intel-oneapi-mpi"):
@ -129,11 +140,16 @@ def configure_args(self):
else ["--without-papi"]
)
args += (
["--with-dyninst=%s" % spec["dyninst"].prefix]
if spec.satisfies("+dyninst")
else ["--without-dyninst"]
)
if spec.satisfies("+dyninst"):
args += ["--with-dyninst={spec['dyninst'].prefix}"]
if spec.satisfies("@4.1.2:"):
args += [
f"--with-elfutils={spec['elfutils'].prefix}",
f"--with-tbb={spec['tbb'].prefix}",
]
else:
args += ["--without-dyninst"]
args += (
["--with-cuda=%s" % spec["cuda"].prefix]
@ -147,7 +163,7 @@ def configure_args(self):
args += ["--with-cupti=%s" % cupti_dir] if "+cupti" in spec else ["--without-cupti"]
if spec.satisfies("^dyninst@9.3.0:"):
if spec.satisfies("+dyninst"):
make.add_default_arg("CXXFLAGS=%s" % self.compiler.cxx11_flag)
args.append("CXXFLAGS=%s" % self.compiler.cxx11_flag)

1
var/spack/repos/builtin/packages/fzf/package.py
View File

@ -19,6 +19,7 @@ class Fzf(MakefilePackage):
license("MIT")
version("0.56.2", sha256="1d67edb3e3ffbb14fcbf786bfcc0b5b8d87db6a0685135677b8ef4c114d2b864")
version("0.55.0", sha256="805383f71bca7f8fb271ecd716852aea88fd898d5027d58add9e43df6ea766da")
version("0.54.3", sha256="6413f3916f8058b396820f9078b1336d94c72cbae39c593b1d16b83fcc4fdf74")
version("0.53.0", sha256="d45abbfb64f21913c633d46818d9d3eb3d7ebc7e94bd16f45941958aa5480e1d")

1
var/spack/repos/builtin/packages/gdb/package.py
View File

@ -21,6 +21,7 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage):
license("GPL-3.0-or-later AND LGPL-3.0-or-later")
version("15.2", sha256="9d16bc2539a2a20dc3ef99b48b8414d51c51305c8577eb7a1da00996f6dea223")
version("14.2", sha256="2de5174762e959a5e529e20c20d88a04735469d8fffd98f61664e70b341dc47c")
version("14.1", sha256="683e63182fb72bd5d8db32ab388143796370a8e3e71c26bc264effb487db7927")
version("13.2", sha256="7ead13d9e19fa0c57bb19104e1a5f67eefa9fc79f2e6360de491e8fddeda1e30")

9
var/spack/repos/builtin/packages/geomodel/package.py
View File

@ -54,6 +54,14 @@ class Geomodel(CMakePackage):
when="+fullsimlight",
)
variant(
"cxxstd",
default="17",
values=("17", "20", "23"),
multi=False,
description="Use the specified C++ standard when building",
)
conflicts("+fullsimlight", when="+fsl", msg="FSL triggers the build of the FullSimLight")
depends_on("cmake@3.16:", type="build")
@ -80,5 +88,6 @@ def cmake_args(self):
self.define_from_variant("GEOMODEL_BUILD_FSL", "fsl"),
self.define_from_variant("GEOMODEL_BUILD_EXAMPLES", "examples"),
self.define_from_variant("GEOMODEL_BUILD_TOOLS", "tools"),
self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd"),
]
return args

4
var/spack/repos/builtin/packages/git/package.py
View File

@ -29,6 +29,8 @@ class Git(AutotoolsPackage):
# Every new git release comes with a corresponding manpage resource:
# https://www.kernel.org/pub/software/scm/git/git-manpages-{version}.tar.gz
# https://mirrors.edge.kernel.org/pub/software/scm/git/sha256sums.asc
version("2.47.0", sha256="a84a7917e0ab608312834413f01fc01edc7844f9f9002ba69f3b4f4bcb8d937a")
version("2.46.2", sha256="65c5689fd44f1d09de7fd8c44de7fef074ddd69dda8b8503d44afb91495ecbce")
version("2.45.2", sha256="98b26090ed667099a3691b93698d1e213e1ded73d36a2fde7e9125fce28ba234")
version("2.44.2", sha256="f0655e81c5ecfeef7440aa4fcffa1c1a77eaccf764d6fe29579e9a06eac2cd04")
version("2.43.5", sha256="324c3b85d668e6afe571b3502035848e4b349dead35188e2b8ab1b96c0cd45ff")
@ -99,6 +101,8 @@ class Git(AutotoolsPackage):
depends_on("c", type="build") # generated
for _version, _sha256_manpage in {
"2.47.0": "1a6f1e775dfe324a9b521793cbd2b3bba546442cc2ac2106d4df33dea9005038",
"2.46.2": "4bc3774ee4597098977befa4ec30b0f2cbed3b59b756e7cbb59ce1738682d43a",
"2.45.2": "48c1e2e3ecbb2ce9faa020a19fcdbc6ce64ea25692111b5930686bc0bb4f0e7f",
"2.45.1": "d9098fd93a3c0ef242814fc856a99886ce31dae2ba457afc416ba4e92af8f8f5",
"2.44.2": "ee6a7238d5ede18fe21c0cc2131c7fbff1f871c25e2848892ee864d40baf7218",

2
var/spack/repos/builtin/packages/glab/package.py
View File

@ -16,6 +16,7 @@ class Glab(GoPackage):
license("MIT")
version("1.48.0", sha256="45410de23a7bad37feeae18f47f3c0113d81133ad9bb97c8f0b8afc5409272c7")
version("1.46.1", sha256="935f732ddacc6e54fc83d06351fc25454ac8a58c465c3efa43e066ea226257c2")
version("1.36.0", sha256="8d6c759ebfe9c6942fcdb7055a4a5c7209a3b22beb25947f906c9aef3bc067e8")
version("1.35.0", sha256="7ed31c7a9b425fc15922f83c5dd8634a2758262a4f25f92583378655fcad6303")
@ -40,6 +41,7 @@ class Glab(GoPackage):
depends_on("go@1.22.4:", type="build", when="@1.42:")
depends_on("go@1.22.5:", type="build", when="@1.44:")
depends_on("go@1.23:", type="build", when="@1.46:")
depends_on("go@1.23.2:", type="build", when="@1.48:")
build_directory = "cmd/glab"

1
var/spack/repos/builtin/packages/justbuild/package.py
View File

@ -24,6 +24,7 @@ class Justbuild(Package):
license("Apache-2.0")
version("master", branch="master")
version("1.4.0", tag="v1.4.0", commit="562bddf70175a602f896397f41ee5f5e07e834eb")
version("1.3.2", tag="v1.3.2", commit="27a56845398b07471f8185648a79a63f97851659")
version("1.3.1", tag="v1.3.1", commit="b248838ed0f01bc5824caee3a555e7fd22d5ad10")
version("1.3.0", tag="v1.3.0", commit="a7be2417f358049e6a0e28e01bc4020d8de2fdc5")

27
var/spack/repos/builtin/packages/libunwind/package.py
View File

@ -11,25 +11,23 @@ class Libunwind(AutotoolsPackage):
the call-chain of a program."""
homepage = "https://www.nongnu.org/libunwind/"
url = "http://download.savannah.gnu.org/releases/libunwind/libunwind-1.1.tar.gz"
url = "https://github.com/libunwind/libunwind/releases/download/v0.0.0/libunwind-0.0.0.tar.gz"
git = "https://github.com/libunwind/libunwind"
maintainers("mwkrentel")
license("MIT")
version("master", branch="master")
version("1.8-stable", branch="v1.8-stable")
version("1.8.1", sha256="ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157")
version("1.7-stable", branch="v1.7-stable")
version("1.7.2", sha256="a18a6a24307443a8ace7a8acc2ce79fbbe6826cd0edf98d6326d0225d6a5d6e6")
version("1.6-stable", branch="v1.6-stable")
version("1.6.2", sha256="4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976")
version("1.5-stable", branch="v1.5-stable")
version("1.5.0", sha256="90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017")
version("1.4.0", sha256="df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435")
version("1.3.1", sha256="43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8")
version("1.2.1", sha256="3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb")
version(
"1.1",
sha256="9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a",
deprecated=True,
)
depends_on("c", type="build") # generated
depends_on("cxx", type="build") # generated
@ -83,7 +81,7 @@ class Libunwind(AutotoolsPackage):
# The libunwind releases contain the autotools generated files,
# but the git repo snapshots do not.
reconf_versions = "@master,1.5-stable,1.6-stable"
reconf_versions = "@master,1.6-stable,1.7-stable,1.8-stable"
depends_on("autoconf", type="build", when=reconf_versions)
depends_on("automake", type="build", when=reconf_versions)
depends_on("libtool", type="build", when=reconf_versions)
@ -94,8 +92,21 @@ class Libunwind(AutotoolsPackage):
conflicts("platform=darwin", msg="Non-GNU libunwind needs ELF libraries Darwin does not have")
# Introduced in https://github.com/libunwind/libunwind/pull/555, fixed in
# https://github.com/libunwind/libunwind/pull/723
conflicts("target=ppc64:", when="@1.8")
conflicts("target=ppc64le:", when="@1.8")
conflicts("target=aarch64:", when="@1.8:")
provides("unwind")
def url_for_version(self, version):
if version == Version("1.5.0"):
return f"https://github.com/libunwind/libunwind/releases/download/v{version.up_to(2)}/libunwind-{version}.tar.gz"
else:
return super().url_for_version(version)
def flag_handler(self, name, flags):
wrapper_flags = []

46
var/spack/repos/builtin/packages/libva/package.py Normal file
View File

@ -0,0 +1,46 @@
# Copyright 2013-2024 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.package import *
class Libva(AutotoolsPackage):
"""Libva is an implementation for VA-API (Video Acceleration API).
VA-API is an open-source library and API specification, which provides
access to graphics hardware acceleration capabilities for video
processing. It consists of a main library and driver-specific
acceleration backends for each supported hardware vendor."""
homepage = "https://github.com/intel/libva"
url = "https://github.com/intel/libva/archive/refs/tags/2.22.0.tar.gz"
version("2.22.0", sha256="467c418c2640a178c6baad5be2e00d569842123763b80507721ab87eb7af8735")
depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("autoconf", type="build")
depends_on("automake", type="build")
depends_on("libtool", type="build")
depends_on("m4", type="build")
depends_on("pkgconfig", type="build")
depends_on("libdrm")
depends_on("libx11", when="^[virtuals=gl] glx")
depends_on("libxext", when="^[virtuals=gl] glx")
def autoreconf(self, spec, prefix):
autogen = Executable("./autogen.sh")
autogen()
def configure_args(self):
spec = self.spec
args = ["--disable-x11", "--disable-wayland", "--disable-glx", "--enable-libdrm"]
if spec.satisfies("^[virtuals=gl] glx"):
args.append("--enable-x11")
else:
args.append("--disable-x11")
return args

1
var/spack/repos/builtin/packages/llvm-amdgpu/package.py
View File

@ -78,6 +78,7 @@ class LlvmAmdgpu(CMakePackage, CompilerPackage):
depends_on("z3", type="link")
depends_on("zlib-api", type="link")
depends_on("ncurses+termlib", type="link")
depends_on("libxml2", type="link")
depends_on("pkgconfig", type="build")
# This flavour of LLVM doesn't work on MacOS, so we should ensure that it

60
var/spack/repos/builtin/packages/openmpi/package.py
View File

@ -452,11 +452,7 @@ class Openmpi(AutotoolsPackage, CudaPackage):
patch("pmix_getline_pmix_version.patch", when="@5.0.0:5.0.3")
patch("pmix_getline_pmix_version-prte.patch", when="@5.0.3")
variant(
"fabrics",
values=disjoint_sets(
("auto",),
(
FABRICS = (
"psm",
"psm2",
"verbs",
@ -469,16 +465,21 @@ class Openmpi(AutotoolsPackage, CudaPackage):
"xpmem",
"cma",
"knem",
), # shared memory transports
)
variant(
"fabrics",
values=disjoint_sets(
("auto",), FABRICS # shared memory transports
).with_non_feature_values("auto", "none"),
description="List of fabrics that are enabled; " "'auto' lets openmpi determine",
)
SCHEDULERS = ("alps", "lsf", "tm", "slurm", "sge", "loadleveler")
variant(
"schedulers",
values=disjoint_sets(
("auto",), ("alps", "lsf", "tm", "slurm", "sge", "loadleveler")
).with_non_feature_values("auto", "none"),
values=disjoint_sets(("auto",), SCHEDULERS).with_non_feature_values("auto", "none"),
description="List of schedulers for which support is enabled; "
"'auto' lets openmpi determine",
)
@ -574,6 +575,24 @@ class Openmpi(AutotoolsPackage, CudaPackage):
variant("openshmem", default=False, description="Enable building OpenSHMEM")
variant("debug", default=False, description="Make debug build", when="build_system=autotools")
variant(
"two_level_namespace",
default=False,
description="""Build shared libraries and programs
built with the mpicc/mpifort/etc. compiler wrappers
with '-Wl,-commons,use_dylibs' and without
'-Wl,-flat_namespace'.""",
)
# Patch to allow two-level namespace on a MacOS platform when building
# openmpi. Unfortuntately, the openmpi configure command has flat namespace
# hardwired in. In spack, this only works for openmpi up to versions 4,
# because for versions 5+ autoreconf is triggered (see below) and this
# patch needs to be applied (again) AFTER autoreconf ran.
@when("+two_level_namespace platform=darwin")
def patch(self):
filter_file(r"-flat_namespace", "-commons,use_dylibs", "configure")
provides("mpi@:2.0", when="@:1.2")
provides("mpi@:2.1", when="@1.3:1.7.2")
provides("mpi@:2.2", when="@1.7.3:1.7.4")
@ -806,24 +825,26 @@ def determine_variants(cls, exes, version):
variants.append("~pmi")
# fabrics
fabrics = get_options_from_variant(cls, "fabrics")
used_fabrics = []
for fabric in fabrics:
for fabric in cls.FABRICS:
match = re.search(r"\bMCA (?:mtl|btl|pml): %s\b" % fabric, output)
if match:
used_fabrics.append(fabric)
if used_fabrics:
variants.append("fabrics=" + ",".join(used_fabrics))
else:
variants.append("fabrics=none")
# schedulers
schedulers = get_options_from_variant(cls, "schedulers")
used_schedulers = []
for scheduler in schedulers:
for scheduler in cls.SCHEDULERS:
match = re.search(r"\bMCA (?:prrte|ras): %s\b" % scheduler, output)
if match:
used_schedulers.append(scheduler)
if used_schedulers:
variants.append("schedulers=" + ",".join(used_schedulers))
else:
variants.append("schedulers=none")
# Get the appropriate compiler
match = re.search(r"\bC compiler absolute: (\S+)", output)
@ -994,11 +1015,15 @@ def die_without_fortran(self):
def autoreconf(self, spec, prefix):
perl = which("perl")
perl("autogen.pl")
if spec.satisfies("+two_level_namespace platform=darwin"):
filter_file(r"-flat_namespace", "-commons,use_dylibs", "configure")
@when("@5.0.0:5.0.1")
def autoreconf(self, spec, prefix):
perl = which("perl")
perl("autogen.pl", "--force")
if spec.satisfies("+two_level_namespace platform=darwin"):
filter_file(r"-flat_namespace", "-commons,use_dylibs", "configure")
def configure_args(self):
spec = self.spec
@ -1412,12 +1437,3 @@ def is_enabled(text):
if text in set(["t", "true", "enabled", "yes", "1"]):
return True
return False
# This code gets all the fabric names from the variants list
# Idea taken from the AutotoolsPackage source.
def get_options_from_variant(self, name):
values = self.variants[name][0].values
if getattr(values, "feature_values", None):
values = values.feature_values
return values

3
var/spack/repos/builtin/packages/openssh/package.py
View File

@ -25,12 +25,15 @@ class Openssh(AutotoolsPackage):
license("SSH-OpenSSH")
version("9.9p1", sha256="b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02")
version("9.8p1", sha256="dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3")
version("9.7p1", sha256="490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd")
version("9.6p1", sha256="910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c")
version("9.5p1", sha256="f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b")
version("9.4p1", sha256="3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85")
version("9.3p1", sha256="e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8")
with default_args(deprecated=True):
# https://nvd.nist.gov/vuln/detail/CVE-2023-38408
version("9.2p1", sha256="3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46")
version("9.1p1", sha256="19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288")
version("9.0p1", sha256="03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a")

1
var/spack/repos/builtin/packages/osu-micro-benchmarks/package.py
View File

@ -20,6 +20,7 @@ class OsuMicroBenchmarks(AutotoolsPackage, CudaPackage, ROCmPackage):
maintainers("natshineman", "harisubramoni", "MatthewLieber")
version("7.5", sha256="1cf84ac5419456202757a757c5f9a4f5c6ecd05c65783c7976421cfd6020b3b3")
version("7.4", sha256="1edd0c2efa61999409bfb28740a7f39689a5b42b1a1b4c66d1656e5637f7cefc")
version("7.3", sha256="8fa25b8aaa34e4b07ab3a4f30b7690ab46b038b08d204a853a9b6aa7bdb02f2f")
version("7.2", sha256="1a4e1f2aab0e65404b3414e23bd46616184b69b6231ce9313d9c630bd6e633c1")

18
var/spack/repos/builtin/packages/parsec/package.py
View File

@ -15,7 +15,7 @@ class Parsec(CMakePackage, CudaPackage):
parallel execution of micro-tasks on distributed, heterogeneous systems.
"""
homepage = "https://icl.utk.edu/dte"
homepage = "https://github.com/icldisco/parsec"
git = "https://github.com/icldisco/parsec.git"
url = "https://github.com/ICLDisco/parsec/archive/refs/tags/parsec-3.0.2012.tar.gz"
list_url = "https://github.com/ICLDisco/parsec/tags"
@ -27,20 +27,12 @@ class Parsec(CMakePackage, CudaPackage):
license("BSD-3-Clause-Open-MPI")
version("master", branch="master")
version(
"3.0.2209",
sha256="67d383d076991484cb2a265f56420abdea7cc1f329c63ac65a3e96fbfb6cc295",
url="https://bitbucket.org/icldistcomp/parsec/get/parsec-3.0.2209.tar.bz2",
)
version(
"3.0.2012",
sha256="f565bcfffe106be8237b6aea3e83a5770607b7236606414b6f270244fa6ec3bc",
url="https://bitbucket.org/icldistcomp/parsec/get/parsec-3.0.2012.tar.bz2",
)
version("3.0.2209", sha256="67d383d076991484cb2a265f56420abdea7cc1f329c63ac65a3e96fbfb6cc295")
version("3.0.2012", sha256="7a8403ca67305738f3974cbc7a51b64c4ec353ae9170f2468262a9a52035eff6")
version(
"1.1.0",
sha256="d2928033c121000ae0a554f1e7f757c1f22274a8b74457ecd52744ae1f70b95a",
url="https://bitbucket.org/icldistcomp/parsec/get/v1.1.0.tar.bz2",
sha256="d1e038713f2c1cd7db6765c891408d85648c46ee23e780fbd5e941b53c9eef85",
url="https://github.com/ICLDisco/parsec/archive/refs/tags/v1.1.0.tar.gz",
)
variant(

37
var/spack/repos/builtin/packages/pixman/package.py
View File

@ -18,6 +18,7 @@ class Pixman(AutotoolsPackage):
license("MIT")
version("0.44.0", sha256="89a4c1e1e45e0b23dffe708202cb2eaffde0fe3727d7692b2e1739fec78a7dac")
version("0.42.2", sha256="ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e")
version("0.42.0", sha256="07f74c8d95e4a43eb2b08578b37f40b7937e6c5b48597b3a0bb2c13a53f46c13")
version("0.40.0", sha256="6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc")
@ -26,11 +27,19 @@ class Pixman(AutotoolsPackage):
version("0.34.0", sha256="21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e")
version("0.32.6", sha256="3dfed13b8060eadabf0a4945c7045b7793cc7e3e910e748a8bb0f0dc3e794904")
depends_on("c", type="build") # generated
build_system(
conditional("autotools", when="@:0.42"),
conditional("meson", when="@0.38:"),
default="meson",
)
depends_on("c", type="build")
with when("build_system=meson"):
depends_on("meson@0.52:", type="build")
depends_on("pkgconfig", type="build")
depends_on("flex", type="build")
depends_on("bison@3:", type="build")
depends_on("libpng")
variant("shared", default=True, description="Build shared library")
@ -68,6 +77,32 @@ def libs(self):
"libpixman-1", self.prefix, shared=self.spec.satisfies("+shared"), recursive=True
)
class MesonBuilder(spack.build_systems.meson.MesonBuilder):
def meson_args(self):
args = ["-Dlibpng=enabled", "-Dgtk=disabled", "-Db_staticpic=true"]
if sys.platform == "darwin":
args += ["-Dmmx=disabled"]
# From homebrew, see:
# https://gitlab.freedesktop.org/pixman/pixman/-/issues/59
# https://gitlab.freedesktop.org/pixman/pixman/-/issues/69
if self.spec.target.family == "aarch64":
args.append("-Da64-neon=disabled")
# The Fujitsu compiler does not support assembler macros.
if self.spec.satisfies("%fj"):
args.append("-Da64-neon=disabled")
args.append(
"-Ddefault_library=" + ("shared" if self.spec.satisfies("+shared") else "static")
)
return args
class AutotoolsBuilder(spack.build_systems.autotools.AutotoolsBuilder):
def configure_args(self):
args = ["--enable-libpng", "--disable-gtk", "--with-pic"]

3
var/spack/repos/builtin/packages/prometheus/package.py
View File

@ -15,6 +15,7 @@ class Prometheus(MakefilePackage):
license("Apache-2.0")
version("2.55.1", sha256="f48251f5c89eea6d3b43814499d558bacc4829265419ee69be49c5af98f79573")
version("2.19.2", sha256="d4e84cae2fed6761bb8a80fcc69b6e0e9f274d19dffc0f38fb5845f11da1bbc3")
version("2.19.1", sha256="b72b9b6bdbae246dcc29ef354d429425eb3c0a6e1596fc8b29b502578a4ce045")
version("2.18.2", sha256="a26c106c97d81506e3a20699145c11ea2cce936427a0e96eb2fd0dc7cd1945ba")
@ -26,6 +27,7 @@ class Prometheus(MakefilePackage):
depends_on("go", type="build")
depends_on("node-js@11.10.1:", type="build")
depends_on("yarn", type="build")
depends_on("npm", type="build", when="@2.55.1:")
def build(self, spec, prefix):
make("build", parallel=False)
@ -34,5 +36,6 @@ def install(self, spec, prefix):
mkdirp(prefix.bin)
install("prometheus", prefix.bin)
install("promtool", prefix.bin)
if spec.satisfies("@:2.19.2"):
install("tsdb/tsdb", prefix.bin)
install_tree("documentation", prefix.documentation)

5
var/spack/repos/builtin/packages/py-alive-progress/package.py
View File

@ -16,12 +16,15 @@ class PyAliveProgress(PythonPackage):
license("MIT")
version("3.2.0", sha256="ede29d046ff454fe56b941f686f89dd9389430c4a5b7658e445cb0b80e0e4deb")
version("2.4.1", sha256="089757c8197f27ad972ba27e1060f6db92368d83c736884e159034fd74865323")
version("1.6.2", sha256="642e1ce98becf226c8c36bf24e10221085998c5465a357a66fb83b7dc618b43e")
depends_on("python@2.7:3", type=("build", "run"))
depends_on("python@3.6:3", type=("build", "run"), when="@2:")
depends_on("python@3.7:3", type=("build", "run"), when="@2.2:")
depends_on("python@3.9:3", type=("build", "run"), when="@3.2:")
depends_on("py-setuptools", type="build")
depends_on("py-about-time@3.1.1", type=("build", "run"), when="@2.4.1:")
depends_on("py-about-time@3.1.1", type=("build", "run"), when="@2.4.1")
depends_on("py-about-time@4.2.1", type=("build", "run"), when="@3:")
depends_on("py-grapheme@0.6.0", type=("build", "run"), when="@2.4.1:")

43
var/spack/repos/builtin/packages/py-bakta/package.py
View File

@ -18,21 +18,42 @@ class PyBakta(PythonPackage):
license("GPL-3.0-only")
version("1.9.4", sha256="10330a10e459144dc78daa26f3a73674799706e2e1653e080366b1bbb9e5a5d9")
version("1.5.1", sha256="36781612c4eaa99e6e24a00e8ab5b27dadf21c98ae6d16432f3e78c96a4adb5d")
depends_on("python@3.8:", type=("build", "run"))
variant("deepsig", default=True, description="builds with deepsig to predict signal peptides")
depends_on("python@3.8:3.10", type=("build", "run"))
depends_on("py-setuptools", type=("build", "run"))
depends_on("py-biopython@1.78:", type=("build", "run"))
depends_on("py-xopen@1.1.0:", type=("build", "run"))
depends_on("py-xopen@1.5.0:", when="@1.8.2:", type=("build", "run"))
depends_on("py-xopen@1.1.0:", when="@:1.8.1", type=("build", "run"))
depends_on("py-requests@2.25.1:", type=("build", "run"))
depends_on("py-alive-progress@1.6.2", type=("build", "run"))
depends_on("trnascan-se@2.0.8:", type=("build", "run"))
depends_on("aragorn@1.2.38:", type=("build", "run"))
depends_on("py-alive-progress@3.0.1:", when="@1.7.0:", type=("build", "run"))
depends_on("py-alive-progress@1.6.2", when="@:1.6.1", type=("build", "run"))
depends_on("py-pyyaml@6.0:", when="@1.6.0:", type=("build", "run"))
depends_on("trnascan-se@2.0.11:", when="@1.6.0:", type=("build", "run"))
depends_on("trnascan-se@2.0.8:", when="@:1.5.1", type=("build", "run"))
depends_on("aragorn@1.2.41:", when="@1.7.0:", type=("build", "run"))
depends_on("aragorn@1.2.38:", when="@:1.6.1", type=("build", "run"))
depends_on("infernal@1.1.4:", type=("build", "run"))
depends_on("pilercr@1.06:", type=("build", "run"))
depends_on("prodigal@2.6.3:", type=("build", "run"))
depends_on("hmmer@3.3.2:", type=("build", "run"))
depends_on("diamond@2.0.14:", type=("build", "run"))
depends_on("blast-plus@2.12.0:", type=("build", "run"))
depends_on("amrfinder@3.10.23:", type=("build", "run"))
depends_on("py-deepsig-biocomp@1.2.5:", type=("build", "run"))
depends_on("py-pyrodigal@3.1.0:", when="@1.9.0:", type=("build", "run"))
depends_on("py-pyrodigal@2.1.0:", when="@1.7.0:1.8.2", type=("build", "run"))
depends_on("py-pyrodigal@2.0.2:", when="@1.6.0:1.6.1", type=("build", "run"))
depends_on("prodigal@2.6.3:", when="@:1.5.1", type=("build", "run"))
depends_on("hmmer@3.3.2:", when="@:1.8.1", type=("build", "run"))
depends_on("py-pyhmmer@0.10.4:", when="@1.9.4:", type=("build", "run"))
depends_on("py-pyhmmer@0.10.0:", when="@1.8.2:1.9.3", type=("build", "run"))
# known bug with diamond v2.1.9
# see https://github.com/oschwengers/bakta/issues/290
depends_on("diamond@2.1.8,2.1.10:", when="@1.9.0:", type=("build", "run"))
depends_on("diamond@2.0.14:", when="@:1.8.2", type=("build", "run"))
depends_on("blast-plus@2.14.0:", when="@1.9.0:", type=("build", "run"))
depends_on("blast-plus@2.12.0:", when="@:1.8.2", type=("build", "run"))
depends_on("amrfinder@3.11.26:", when="@1.9.0:", type=("build", "run"))
depends_on("amrfinder@3.10.23:", when="@1.5.1", type=("build", "run"))
depends_on("circos@0.69.8:", when="@1.6.0:", type=("build", "run"))
depends_on("py-deepsig-biocomp@1.2.5:", when="+deepsig", type=("build", "run"))
conflicts("platform=darwin", when="+deepsig")

2
var/spack/repos/builtin/packages/py-constantly/package.py
View File

@ -14,6 +14,8 @@ class PyConstantly(PythonPackage):
license("MIT")
version("23.10.4", sha256="aa92b70a33e2ac0bb33cd745eb61776594dc48764b06c35e0efd050b7f1c7cbd")
version("15.1.0", sha256="586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35")
depends_on("py-setuptools", type="build")
depends_on("py-versioneer+toml@0.29", type="build", when="@23.10.4:")

10
var/spack/repos/builtin/packages/py-cryptography/package.py
View File

@ -15,6 +15,7 @@ class PyCryptography(PythonPackage):
license("Apache-2.0")
version("43.0.3", sha256="315b9001266a492a6ff443b61238f956b214dbec9910a081ba5b6646a055a805")
version("42.0.8", sha256="8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2")
version("41.0.7", sha256="13f93ce9bea8016c253b34afc6bd6a75993e5c40672ed5405a9c832f0d4a00bc")
version("41.0.3", sha256="6d192741113ef5e30d89dcb5b956ef4e1578f304708701b8b73d38e3e1461f34")
@ -41,7 +42,14 @@ class PyCryptography(PythonPackage):
depends_on("py-setuptools@40.6:", when="@2.7:36", type="build")
depends_on("py-setuptools@18.5:", when="@2.2:2.6", type="build")
depends_on("py-setuptools@11.3:", when="@:2.1", type="build")
depends_on("py-setuptools-rust@1.7.0:", when="@42:", type=("build", "run"))
with when("@43:"):
depends_on("py-maturin@1", type="build")
conflicts(
"^py-setuptools@74.0.0,74.1.0,74.1.1,74.1.2,74.1.3,75.0.0,75.1.0,75.2.0",
msg="some setuptools version are incompatible",
)
with when("@:42"):
depends_on("py-setuptools-rust@1.7.0:", when="@42", type=("build", "run"))
depends_on("py-setuptools-rust@0.11.4:", when="@3.4.2:", type="build")
depends_on("py-setuptools-rust@0.11.4:", when="@3.4:3.4.1", type=("build", "run"))
depends_on("rust@1.56:", when="@41:", type="build")

6
var/spack/repos/builtin/packages/py-deepsig-biocomp/package.py
View File

@ -19,11 +19,11 @@ class PyDeepsigBiocomp(PythonPackage):
version("1.2.5", sha256="e954b815d63c221c564c7d3fe27123d7cd2c39b191d6107369ab095d506496e0")
depends_on("python@3.8", type=("build", "run"))
depends_on("python@3.8:", type=("build", "run"))
depends_on("py-setuptools", type="build")
depends_on("py-biopython@1.78:", type=("build", "run"))
depends_on("py-keras@2.4.3", type=("build", "run"))
depends_on("py-tensorflow@2.2.0", type=("build", "run"))
depends_on("py-keras@2.4.3:", type=("build", "run"))
depends_on("py-tensorflow@2.2.0:", type=("build", "run"))
depends_on("py-tensorboard", type=("build", "run"))
@run_after("install")

26
var/spack/repos/builtin/packages/py-fsspec-xrootd/package.py Normal file
View File

@ -0,0 +1,26 @@
# Copyright 2013-2024 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.package import *
class PyFsspecXrootd(PythonPackage):
"""An XRootD implementation for fsspec."""
homepage = "https://coffeateam.github.io/fsspec-xrootd/"
pypi = "fsspec_xrootd/fsspec_xrootd-0.4.0.tar.gz"
maintainers("wdconinc")
license("BSD-3-Clause", checked_by="wdconinc")
version("0.4.0", sha256="d7f124430d26ab9139d33bc50fa8abfde3624db5dcaa5c18f56af9bf17f16f13")
depends_on("python@3.8:", type=("build", "run"))
depends_on("py-setuptools@42:", type="build")
depends_on("py-setuptools-scm@3.4:+toml", type="build")
depends_on("py-fsspec", type=("build", "run"))

5
var/spack/repos/builtin/packages/py-non-regression-test-tools/package.py
View File

@ -18,8 +18,9 @@ class PyNonRegressionTestTools(PythonPackage):
version("develop", branch="develop")
version("main", branch="main")
version("1.1.2", tag="v1.1.2", preferred=True)
version("1.1.4", tag="v1.1.4")
version("1.1.2", tag="v1.1.2")
depends_on("py-numpy", type="run")
depends_on("python@3.10:", type="run")
depends_on("py-setuptools", type="build")
depends_on("py-setuptools@69.2.0:", type="build")

25
var/spack/repos/builtin/packages/py-pyee/package.py Normal file
View File

@ -0,0 +1,25 @@
# Copyright 2013-2024 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.package import *
class PyPyee(PythonPackage):
"""A rough port of Node.js's EventEmitter to Python
with a few tricks of its own."""
homepage = "https://github.com/jfhbrook/pyee"
pypi = "pyee/pyee-12.0.0.tar.gz"
license("MIT", checked_by="wdconinc")
version("12.0.0", sha256="c480603f4aa2927d4766eb41fa82793fe60a82cbfdb8d688e0d08c55a534e145")
version("11.1.1", sha256="82e1eb1853f8497c4ff1a0c7fa26b9cd2f1253e2b6ffb93b4700fda907017302")
depends_on("python@3.8:", type=("build", "run"))
depends_on("py-setuptools", type="build")
depends_on("py-setuptools-scm", type="build")
depends_on("py-wheel", type="build")
depends_on("py-typing-extensions", type=("build", "run"))

27
var/spack/repos/builtin/packages/py-pyhmmer/package.py Normal file
View File

@ -0,0 +1,27 @@
# Copyright 2013-2024 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.package import *
class PyPyhmmer(PythonPackage):
"""HMMER is a biological sequence analysis tool that uses profile hidden
Markov models to search for sequence homologs. HMMER3 is developed and
maintained by the Eddy/Rivas Laboratory at Harvard University. pyhmmer
is a Python package, implemented using the Cython language, that provides
bindings to HMMER3."""
homepage = "https://github.com/althonos/pyhmmer"
pypi = "pyhmmer/pyhmmer-0.10.14.tar.gz"
license("MIT", checked_by="luke-dt")
version("0.10.15", sha256="bf8e97ce8da6fb5850298f3074640f3e998d5a655877f865c1592eb057dc7921")
version("0.10.14", sha256="eb50bdfdf67a3b1fecfe877d7ca6d9bade9a9f3dea3ad60c959453bbb235573d")
depends_on("python@3.6:", type=("build", "run"))
depends_on("py-setuptools@46.4:", type="build")
depends_on("py-cython@3.0", type="build")
depends_on("py-psutil@5.8:", type=("build", "run"))

29
var/spack/repos/builtin/packages/py-pyppeteer/package.py Normal file
View File

@ -0,0 +1,29 @@
# Copyright 2013-2024 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.package import *
class PyPyppeteer(PythonPackage):
"""Headless chrome/chromium automation library
(unofficial port of puppeteer)."""
homepage = "https://github.com/pyppeteer/pyppeteer"
pypi = "pyppeteer/pyppeteer-2.0.0.tar.gz"
license("MIT")
version("2.0.0", sha256="4af63473ff36a746a53347b2336a49efda669bcd781e400bc1799b81838358d9")
depends_on("py-poetry-core", type="build")
depends_on("python@3.8:", type=("build", "run"))
depends_on("py-appdirs@1.4.3:1", type=("build", "run"))
depends_on("py-importlib-metadata@1.4:", type=("build", "run"))
depends_on("py-pyee@11", type=("build", "run"))
depends_on("py-tqdm@4.42.1:4", type=("build", "run"))
depends_on("py-urllib3@1.25.8:1", type=("build", "run"))
depends_on("py-websockets@10", type=("build", "run"))
depends_on("py-certifi@2023:", type=("build", "run"))

25
var/spack/repos/builtin/packages/py-pyrodigal/package.py Normal file
View File

@ -0,0 +1,25 @@
# Copyright 2013-2024 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.package import *
class PyPyrodigal(PythonPackage):
"""Cython bindings and Python interface to Prodigal, an ORF finder for
genomes and metagenomes"""
homepage = "https://github.com/althonos/pyrodigal"
pypi = "pyrodigal/pyrodigal-3.5.2.tar.gz"
license("GPL-3.0", checked_by="luke-dt")
version("3.5.2", sha256="2a40eb6113e720ada51c326958b295944cdc33ecee9f25d5bad4e9a8e6e6f7f5")
depends_on("c", type="build")
depends_on("python@3.6:", type=("build", "run"))
depends_on("py-setuptools@46.4:", type="build")
depends_on("py-archspec@0.2.0:", type="build")
depends_on("py-cython@3.0:", type=("build", "run"))

2
var/spack/repos/builtin/packages/rocdecode/package.py
View File

@ -33,6 +33,8 @@ class Rocdecode(CMakePackage):
sticky=True,
)
depends_on("libva", type="build", when="@6.2:")
for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1"]:
depends_on(f"hip@{ver}", when=f"@{ver}")

686
var/spack/repos/builtin/packages/rocm-validation-suite/009-replacing-rocm-path-with-package-path-6.2.1.patch Normal file
View File

@ -0,0 +1,686 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7867e3a..7268387 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,14 +74,18 @@ endif(rocblas_FOUND)
# Making ROCM_PATH, CMAKE_INSTALL_PREFIX, CPACK_PACKAGING_INSTALL_PREFIX as CACHE
# variables since we will pass them as cmake params appropriately, and
# all find_packages relevant to this build will be in ROCM path hence appending it to CMAKE_PREFIX_PATH
-set(ROCM_PATH "/opt/rocm" CACHE PATH "ROCM install path")
-set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "CMAKE installation directory")
-set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/rocm" CACHE PATH "Prefix used in built packages")
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
list(APPEND CMAKE_PREFIX_PATH "${ROCM_PATH}")
-set(ROCR_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime" FORCE)
-set(ROCR_LIB_DIR "${ROCM_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime" FORCE)
-set(HIP_INC_DIR "${ROCM_PATH}" CACHE PATH "Contains header files exported by ROC Runtime")
-set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk" FORCE)
+set(ROCR_INC_DIR "${HSA_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime")
+set(ROCR_LIB_DIR "${HSA_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime")
+set(HIP_INC_DIR "${HIP_PATH}" CACHE PATH "Contains header files exported by ROC Runtime")
+set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk")
+set(HIPRAND_INC_DIR "${HIPRAND_DIR}/include" CACHE PATH "Contains header files exported by ROC Trunk")
+set(HIPRAND_LIB_DIR "${HIPRAND_DIR}/lib" CACHE PATH "Contains header files exported by ROC Trunk")
+set(ROCRAND_INC_DIR "${ROCRAND_DIR}/include" CACHE PATH "Contains header files exported by ROC Trunk")
+set(ROCRAND_LIB_DIR "${ROCRAND_DIR}/lib" CACHE PATH "Contains header files exported by ROC Trunk")
add_definitions(-DROCM_PATH="${ROCM_PATH}")
if(FETCH_ROCMPATH_FROM_ROCMCORE)
@@ -443,15 +447,18 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/rvs_smi-build/librocm_smi64.so
endif() # if (RVS_ROCMSMI EQUAL 1)
-set(HIPRAND_INC_DIR "${ROCM_PATH}/include")
-set(HIPRAND_LIB_DIR "${ROCM_PATH}/lib")
+set(HIPRAND_INC_DIR "${HIPRAND_DIR}/include")
+set(HIPRAND_LIB_DIR "${HIPRAND_DIR}/lib")
+
+set(ROCRAND_INC_DIR "${ROCRAND_DIR}/include")
+set(ROCRAND_LIB_DIR "${ROCRAND_DIR}/lib")
if (RVS_ROCBLAS EQUAL 1)
set(ROCBLAS_INC_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install")
set(ROCBLAS_LIB_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install/lib/")
else()
- set(ROCBLAS_INC_DIR "${ROCM_PATH}/include")
- set(ROCBLAS_LIB_DIR "${ROCM_PATH}/lib")
+ set(ROCBLAS_INC_DIR "${ROCBLAS_DIR}/include")
+ set(ROCBLAS_LIB_DIR "${ROCBLAS_DIR}/lib")
endif()
if (RVS_ROCMSMI EQUAL 1)
@@ -466,8 +473,8 @@ else()
set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/rocm_smi/lib")
else()
message( STATUS "ROCBLAS REORG Enabled Version: ${RVS_ROCBLAS_VERSION_FLAT}" )
- set(ROCM_SMI_INC_DIR "${ROCM_PATH}/include")
- set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/lib")
+ set(ROCM_SMI_INC_DIR "${ROCM_SMI_DIR}/include")
+ set(ROCM_SMI_LIB_DIR "${ROCM_SMI_DIR}/lib")
endif()
endif()
set(ROCM_SMI_LIB "rocm_smi64" CACHE STRING "rocm_smi library name")
diff --git a/babel.so/CMakeLists.txt b/babel.so/CMakeLists.txt
index 54a0e3a..c9ddeaa 100644
--- a/babel.so/CMakeLists.txt
+++ b/babel.so/CMakeLists.txt
@@ -109,13 +109,13 @@ set(HIP_HCC_LIB "amdhip64")
add_compile_options(-DRVS_ROCBLAS_VERSION_FLAT=${RVS_ROCBLAS_VERSION_FLAT})
# Determine Roc Runtime header files are accessible
-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime.h)
- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR})
+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime.h)
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime_api.h)
- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR})
+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime_api.h)
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
@@ -135,16 +135,16 @@ if(DEFINED RVS_ROCMSMI)
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so")
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${HIP_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HIP_PATH}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## additional libraries
set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
@@ -156,7 +156,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
set_target_properties(${RVS_TARGET} PROPERTIES
SUFFIX .so.${LIB_VERSION_STRING}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB})
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
add_dependencies(${RVS_TARGET} rvslib)
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
diff --git a/cmake_modules/tests_unit.cmake b/cmake_modules/tests_unit.cmake
index 9760b72..d585f8b 100644
--- a/cmake_modules/tests_unit.cmake
+++ b/cmake_modules/tests_unit.cmake
@@ -27,7 +27,7 @@
## define additional unit testing include directories
include_directories(${UT_INC})
## define additional unit testing lib directories
-link_directories(${UT_LIB} ${RVS_LIB_DIR})
+link_directories(${UT_LIB} ${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
file(GLOB TESTSOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/test*.cpp )
#message ( "TESTSOURCES: ${TESTSOURCES}" )
@@ -46,6 +46,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES})
add_dependencies(${TEST_NAME} rvs_gtest_target)
target_link_libraries(${TEST_NAME}
${UT_LINK_LIBS} rvslibut rvslib gtest_main gtest pthread pci
+ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so
)
target_compile_definitions(${TEST_NAME} PUBLIC RVS_UNIT_TEST)
if(DEFINED tcd.${TEST_NAME})
diff --git a/edp.so/CMakeLists.txt b/edp.so/CMakeLists.txt
index 7dd34ea..41c8493 100644
--- a/edp.so/CMakeLists.txt
+++ b/edp.so/CMakeLists.txt
@@ -128,17 +128,17 @@ if(DEFINED RVS_ROCMSMI)
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set (SOURCES src/rvs_module.cpp src/action.cpp src/edp_worker.cpp )
@@ -148,7 +148,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
set_target_properties(${RVS_TARGET} PROPERTIES
SUFFIX .so.${LIB_VERSION_STRING}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB})
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${HIPRAND_LIB} ${ROCRAND_LIB})
add_dependencies(${RVS_TARGET} rvslib)
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
diff --git a/gm.so/CMakeLists.txt b/gm.so/CMakeLists.txt
index d3caa84..94a06be 100644
--- a/gm.so/CMakeLists.txt
+++ b/gm.so/CMakeLists.txt
@@ -118,11 +118,11 @@ if(DEFINED RVS_ROCMSMI)
endif()
## define include directories
-include_directories(./ ../ ${ROCM_SMI_INC_DIR})
+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${YAML_CPP_INCLUDE_DIRS})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp)
@@ -133,7 +133,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
set_target_properties(${RVS_TARGET} PROPERTIES
SUFFIX .so.${LIB_VERSION_STRING}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCM_SMI_LIB})
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS})
add_dependencies(${RVS_TARGET} rvslib)
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
@@ -149,7 +149,7 @@ install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib${RVS}.so"
# TEST SECTION
if (RVS_BUILD_TESTS)
- add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
+ B_add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
COMMAND ln -fs ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib${RVS}.so.${VERSION_MAJOR} ${RVS_BINTEST_FOLDER}/lib${RVS}.so WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
)
include(${CMAKE_CURRENT_SOURCE_DIR}/tests.cmake)
diff --git a/gm.so/tests.cmake b/gm.so/tests.cmake
index b360065..172e97c 100644
--- a/gm.so/tests.cmake
+++ b/gm.so/tests.cmake
@@ -30,11 +30,11 @@ set(CORE_RUNTIME_NAME "hsa-runtime")
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
set(UT_LINK_LIBS libpthread.so libpci.so libm.so libdl.so "lib${ROCM_SMI_LIB}.so"
- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB}
+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} "lib${HIPRAND_LIB}.so" "lib${ROCRAND_LIB}.so"
)
# Add directories to look for library files to link
-link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR})
+link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
set (UT_SOURCES src/action.cpp src/worker.cpp
)
diff --git a/gpup.so/CMakeLists.txt b/gpup.so/CMakeLists.txt
index 43d337a..c92d8ba 100644
--- a/gpup.so/CMakeLists.txt
+++ b/gpup.so/CMakeLists.txt
@@ -109,11 +109,11 @@ else()
endif()
## define include directories
-include_directories(./ ../ include ../include)
+include_directories(./ ../ include ../include ${YAML_CPP_INCLUDE_DIRS})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp)
diff --git a/gpup.so/tests.cmake b/gpup.so/tests.cmake
index 9a1f7ed..3649ae4 100644
--- a/gpup.so/tests.cmake
+++ b/gpup.so/tests.cmake
@@ -25,12 +25,13 @@
set(ROCBLAS_LIB "rocblas")
set(HIPRAND_LIB "hiprand")
+set(ROCRAND_LIB "rocrand")
set(ROC_THUNK_NAME "hsakmt")
set(CORE_RUNTIME_NAME "hsa-runtime")
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
set(UT_LINK_LIBS libpthread.so libm.so libdl.so ${ROCM_SMI_LIB}
- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB})
+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${ROCRAND_LIB})
# Add directories to look for library files to link
link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR})
diff --git a/gst.so/CMakeLists.txt b/gst.so/CMakeLists.txt
index fd346ce..7e17a68 100644
--- a/gst.so/CMakeLists.txt
+++ b/gst.so/CMakeLists.txt
@@ -137,17 +137,17 @@ if(DEFINED RVS_ROCMSMI)
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_DIR} ${ROCRAND_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp src/gst_worker.cpp)
diff --git a/iet.so/CMakeLists.txt b/iet.so/CMakeLists.txt
index 002c03c..604b86b 100644
--- a/iet.so/CMakeLists.txt
+++ b/iet.so/CMakeLists.txt
@@ -145,7 +145,7 @@ if(DEFINED RVS_ROCMSMI)
endif()
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
@@ -160,11 +160,11 @@ if(DEFINED RVS_ROCMSMI)
endif()
## define include directories
-include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so )
set(SOURCES src/rvs_module.cpp src/action.cpp src/iet_worker.cpp )
@@ -173,7 +173,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
set_target_properties(${RVS_TARGET} PROPERTIES
SUFFIX .so.${LIB_VERSION_STRING}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCM_SMI_LIB})
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_INC_DIR}/lib/ ${HIP_HCC_LIB} ${ROCBLAS_LIB})
add_dependencies(${RVS_TARGET} rvslib)
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
diff --git a/mem.so/CMakeLists.txt b/mem.so/CMakeLists.txt
index 5133337..3ba941f 100644
--- a/mem.so/CMakeLists.txt
+++ b/mem.so/CMakeLists.txt
@@ -134,18 +134,18 @@ if(DEFINED RVS_ROCMSMI)
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp src/rvs_memtest.cpp src/rvs_memworker.cpp)
diff --git a/pbqt.so/CMakeLists.txt b/pbqt.so/CMakeLists.txt
index 5ae675a..873a1e8 100644
--- a/pbqt.so/CMakeLists.txt
+++ b/pbqt.so/CMakeLists.txt
@@ -136,11 +136,11 @@ if(NOT EXISTS ${ROCR_LIB_DIR}/${CORE_RUNTIME_LIBRARY}.so)
endif()
## define include directories
-include_directories(./ ../ pci ${ROCR_INC_DIR})
+include_directories(./ ../ pci ${ROCR_INC_DIR} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp
diff --git a/pebb.so/CMakeLists.txt b/pebb.so/CMakeLists.txt
index c4e2964..41a45f5 100644
--- a/pebb.so/CMakeLists.txt
+++ b/pebb.so/CMakeLists.txt
@@ -137,11 +137,11 @@ if(NOT EXISTS ${ROCR_LIB_DIR}/${CORE_RUNTIME_LIBRARY}.so)
endif()
## define include directories
-include_directories(./ ../ pci ${ROCR_INC_DIR})
+include_directories(./ ../ pci ${ROCR_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR}/.. ${ROCRAND_LIB_DIR}/..)
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp
diff --git a/peqt.so/CMakeLists.txt b/peqt.so/CMakeLists.txt
index ead507d..d83c9e5 100644
--- a/peqt.so/CMakeLists.txt
+++ b/peqt.so/CMakeLists.txt
@@ -107,11 +107,11 @@ else()
endif()
## define include directories
-include_directories(./ ../)
+include_directories(./ ../ ${HSA_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp)
@@ -121,7 +121,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
set_target_properties(${RVS_TARGET} PROPERTIES
SUFFIX .so.${LIB_VERSION_STRING}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} )
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
add_dependencies(${RVS_TARGET} rvslib)
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
diff --git a/perf.so/CMakeLists.txt b/perf.so/CMakeLists.txt
index 518dac9..dfe05f5 100644
--- a/perf.so/CMakeLists.txt
+++ b/perf.so/CMakeLists.txt
@@ -137,17 +137,17 @@ if(DEFINED RVS_ROCMSMI)
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp src/perf_worker.cpp)
@@ -157,7 +157,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES})
set_target_properties(${RVS_TARGET} PROPERTIES
SUFFIX .so.${LIB_VERSION_STRING}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB})
+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS})
add_dependencies(${RVS_TARGET} rvslib)
add_custom_command(TARGET ${RVS_TARGET} POST_BUILD
diff --git a/pesm.so/CMakeLists.txt b/pesm.so/CMakeLists.txt
index 1f27f34..502c1c8 100644
--- a/pesm.so/CMakeLists.txt
+++ b/pesm.so/CMakeLists.txt
@@ -107,11 +107,11 @@ else()
endif()
## define include directories
-include_directories(./ ../ pci)
+include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_DIR} ${ROCRAND_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp)
diff --git a/pesm.so/tests.cmake b/pesm.so/tests.cmake
index 2c72658..c6acbf4 100644
--- a/pesm.so/tests.cmake
+++ b/pesm.so/tests.cmake
@@ -30,11 +30,11 @@ set(CORE_RUNTIME_NAME "hsa-runtime")
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
set(UT_LINK_LIBS libpthread.so libpci.so libm.so libdl.so "lib${ROCM_SMI_LIB}.so"
- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB}
+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} "lib${HIPRAND_LIB}.so" "lib${ROCRAND_LIB}.so"
)
# Add directories to look for library files to link
-link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR})
+link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
set (UT_SOURCES test/unitactionbase.cpp
)
diff --git a/rcqt.so/CMakeLists.txt b/rcqt.so/CMakeLists.txt
index c0099ab..fcc82f3 100644
--- a/rcqt.so/CMakeLists.txt
+++ b/rcqt.so/CMakeLists.txt
@@ -108,11 +108,11 @@ else()
endif()
## define include directories
-include_directories(./ ../)
+include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ASAN_LIB_PATH} ${HSAKMT_LIB_DIR} ${ROCM_SMI_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib)
+set (PROJECT_LINK_LIBS rvslib ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES
diff --git a/rvs/CMakeLists.txt b/rvs/CMakeLists.txt
index fc0118e..04c9abf 100644
--- a/rvs/CMakeLists.txt
+++ b/rvs/CMakeLists.txt
@@ -34,6 +34,7 @@ set ( RVS "rvs" )
set ( RVS_PACKAGE "rvs-roct" )
set ( RVS_COMPONENT "lib${RVS}" )
set ( RVS_TARGET "${RVS}" )
+set ( YAML_CPP_LIBRARIES "${YAML_CPP_LIB_PATH}")
project ( ${RVS_TARGET} )
@@ -115,20 +116,22 @@ endif()
## define include directories
include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS})
## define lib directories
-link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_PATH})
+link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR} ${RVS_LIB_DIR}/.. ${YAML_CPP_LIBRARIES})
## additional libraries
-set(ROCBLAS_LIB "rocblas")
-set(ROC_THUNK_NAME "hsakmt")
-set(CORE_RUNTIME_NAME "hsa-runtime")
-set(HIPRAND_LIB "hiprand")
-set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
-set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so ${YAML_CPP_LIBRARIES})
+set(ROCBLAS_LIB "${ROCBLAS_LIB_DIR}/librocblas.so")
+set(ROC_THUNK_NAME "${HSAKMT_LIB_DIR}/libhsakmt.a")
+set(CORE_RUNTIME_NAME "${HSA_PATH}/lib/libhsa-runtime64.so")
+set(YAML_CPP_LIB "${YAML_CPP_LIBRARIES}/libyaml-cpp.a")
+set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}")
+set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so)
+set(HIPRAND_LIB "${HIPRAND_LIB_DIR}/libhiprand.so")
+set(ROCRAND_LIB "${ROCRAND_LIB_DIR}/librocrand.so")
## define target
add_executable(${RVS_TARGET} src/rvs.cpp)
target_link_libraries(${RVS_TARGET} rvslib
- ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${PROJECT_LINK_LIBS} ${HIPRAND_LIB})
+ ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${PROJECT_LINK_LIBS} ${HIPRAND_LIB} ${YAML_CPP_LIB} ${ROCRAND_LIB})
add_dependencies(${RVS_TARGET} rvslib)
install(TARGETS ${RVS_TARGET}
diff --git a/rvs/tests.cmake b/rvs/tests.cmake
index c519482..64a4ad0 100644
--- a/rvs/tests.cmake
+++ b/rvs/tests.cmake
@@ -32,17 +32,18 @@
set(ROCBLAS_LIB "rocblas")
set(HIPRAND_LIB "hiprand")
+set(ROCRAND_LIB "rocrand")
set(ROC_THUNK_NAME "hsakmt")
set(CORE_RUNTIME_NAME "hsa-runtime")
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
## define lib directories
-link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${HIPRAND_LIB_DIR})
+link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
## define target for "test-to-fail"
add_executable(${RVS_TARGET}fail src/rvs.cpp)
target_link_libraries(${RVS_TARGET}fail rvslib rvslibut ${PROJECT_LINK_LIBS}
- ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${ROCM_CORE} ${CORE_RUNTIME_TARGET} ${HIPRAND_LIB})
+ ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${ROCM_CORE} ${CORE_RUNTIME_TARGET} ${HIPRAND_LIB} ${ROCRAND_LIB})
target_compile_definitions(${RVS_TARGET}fail PRIVATE RVS_INVERT_RETURN_STATUS)
set_target_properties(${RVS_TARGET}fail PROPERTIES
@@ -211,7 +212,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES})
${PROJECT_LINK_LIBS}
${PROJECT_TEST_LINK_LIBS}
rvslib rvslibut gtest_main gtest pthread
- ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${HIPRAND_LIB}
+ ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${HIPRAND_LIB} ${ROCRAND_LIB}
)
add_dependencies(${TEST_NAME} rvs_gtest_target)
diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt
index 8d29590..18eb9f4 100644
--- a/rvslib/CMakeLists.txt
+++ b/rvslib/CMakeLists.txt
@@ -116,7 +116,7 @@ endif()
## define include directories
include_directories(./ ../ ../rvs
- ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
+ ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_PATH} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR})
link_directories(${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
diff --git a/smqt.so/CMakeLists.txt b/smqt.so/CMakeLists.txt
index 042586f..285cb17 100644
--- a/smqt.so/CMakeLists.txt
+++ b/smqt.so/CMakeLists.txt
@@ -106,11 +106,11 @@ else()
endif()
## define include directories
-include_directories(./ ../ pci)
+include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
## define source files
set(SOURCES src/rvs_module.cpp src/action.cpp)
diff --git a/smqt.so/tests.cmake b/smqt.so/tests.cmake
index 76766de..804441a 100644
--- a/smqt.so/tests.cmake
+++ b/smqt.so/tests.cmake
@@ -30,11 +30,11 @@ set(CORE_RUNTIME_NAME "hsa-runtime")
set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64")
set(UT_LINK_LIBS libpthread.so libpci.so libm.so libdl.so "lib${ROCM_SMI_LIB}.so"
- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB}
+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} "lib${HIPRAND_LIB}.so" "lib${HIPRAND_LIB}.so"
)
# Add directories to look for library files to link
-link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR})
+link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR})
set (UT_SOURCES src/action.cpp test/unitsmqt.cpp
)
diff --git a/testif.so/CMakeLists.txt b/testif.so/CMakeLists.txt
index 4cba0f9..691534a 100644
--- a/testif.so/CMakeLists.txt
+++ b/testif.so/CMakeLists.txt
@@ -108,11 +108,11 @@ endif()
## define include directories
-include_directories(./ ../ pci)
+include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
## additional libraries
-set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so)
## define source files
## set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp)
diff --git a/tst.so/CMakeLists.txt b/tst.so/CMakeLists.txt
index 1a1a8b0..c6e46da 100644
--- a/tst.so/CMakeLists.txt
+++ b/tst.so/CMakeLists.txt
@@ -140,7 +140,7 @@ if(DEFINED RVS_ROCMSMI)
endif()
endif()
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so")
message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
RETURN()
endif()
@@ -155,11 +155,11 @@ if(DEFINED RVS_ROCMSMI)
endif()
## define include directories
-include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR}/.. ${ROCRAND_LIB_DIR}/..)
## additional libraries
-set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so)
+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so)
set(SOURCES src/rvs_module.cpp src/action.cpp src/tst_worker.cpp )

28
var/spack/repos/builtin/packages/rocm-validation-suite/package.py
View File

@ -58,7 +58,8 @@ class RocmValidationSuite(CMakePackage):
# It expects rocm components headers and libraries in /opt/rocm
# It doesn't find package to include the library and include path without this patch.
patch("009-replacing-rocm-path-with-package-path.patch", when="@6.0")
patch("009-replacing-rocm-path-with-package-path-6.1.patch", when="@6.1")
patch("009-replacing-rocm-path-with-package-path-6.1.patch", when="@6.1:6.2.0")
patch("009-replacing-rocm-path-with-package-path-6.2.1.patch", when="@6.2.1")
depends_on("cmake@3.5:", type="build")
depends_on("zlib-api", type="link")
depends_on("yaml-cpp~shared")
@ -94,6 +95,9 @@ def setup_build_environment(self, build_env):
depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}")
for ver in ["6.2.1"]:
depends_on(f"hiprand@{ver}", when=f"@{ver}")
depends_on(f"rocrand@{ver}", when=f"@{ver}")
def patch(self):
if self.spec.satisfies("@5.2:5.4"):
@ -104,7 +108,7 @@ def patch(self):
filter_file(
r"@ROCM_PATH@/rvs", self.spec.prefix.rvs, "rvs/conf/deviceid.sh.in", string=True
)
elif self.spec.satisfies("@6.0:"):
elif self.spec.satisfies("@6.0:6.1"):
filter_file(
"@ROCM_PATH@/rvs", self.spec.prefix.bin, "rvs/conf/deviceid.sh.in", string=True
)
@ -119,6 +123,9 @@ def cmake_args(self):
self.define("YAML_CPP_INCLUDE_DIRS", self.spec["yaml-cpp"].prefix.include),
self.define("UT_INC", self.spec["googletest"].prefix.include),
]
if self.spec.satisfies("@6.2.1:"):
args.append(self.define("HIPRAND_DIR", self.spec["hiprand"].prefix)),
args.append(self.define("ROCRAND_DIR", self.spec["rocrand"].prefix)),
libloc = self.spec["googletest"].prefix.lib64
if not os.path.isdir(libloc):
libloc = self.spec["googletest"].prefix.lib
@ -131,20 +138,5 @@ def cmake_args(self):
if not os.path.isdir(libloc):
libloc = self.spec["yaml-cpp"].prefix.lib
args.append(self.define("YAML_CPP_LIB_PATH", libloc))
if self.spec.satisfies("@6.2:"):
args.append(
self.define(
"CMAKE_CXX_FLAGS",
f"-I{self.spec['rocm-smi-lib'].prefix.include} "
f"-I{self.spec['rocblas'].prefix.include} "
f"-I{self.spec['yaml-cpp'].prefix.include} "
f"-L{self.spec['hip'].prefix.lib} "
f"-L{self.spec['hsa-rocr-dev'].prefix.lib} "
f"-L{self.spec['hsakmt-roct'].prefix.lib} "
f"-L{self.spec['rocm-smi-lib'].prefix.lib} "
f"-L{self.spec['rocblas'].prefix.lib} "
f"{libloc}/libyaml-cpp.a ",
)
)
args.append(self.define("CPACK_PACKAGING_INSTALL_PREFIX", self.spec.prefix))
return args

21
var/spack/repos/builtin/packages/rsyslog/package.py
View File

@ -10,13 +10,22 @@ class Rsyslog(AutotoolsPackage):
"""The rocket-fast Syslog Server."""
homepage = "https://www.rsyslog.com/"
url = "https://github.com/rsyslog/rsyslog/archive/v8.2006.0.tar.gz"
url = "https://github.com/rsyslog/rsyslog/archive/refs/tags/v8.2006.0.tar.gz"
license("Apache-2.0 AND GPL-3.0-or-later AND LGPL-3.0-or-later", checked_by="tgamblin")
version("8.2006.0", sha256="dc30a2ec02d5fac91d3a4f15a00641e0987941313483ced46592ab0b0d68f324")
version("8.2004.0", sha256="b56b985fec076a22160471d389b7ff271909dfd86513dad31e401a775a6dfdc2")
version("8.2002.0", sha256="b31d56311532335212ef2ea7be4501508224cb21f1bef9d262c6d78e21959ea1")
version("8.2410.0", sha256="0e4e6fcb1d72a1cb65438d85dd2bbf37a8f82115d7e271788535d1e7fbcf6838")
with default_args(deprecated=True):
# https://nvd.nist.gov/vuln/detail/CVE-2022-24903
version(
"8.2006.0", sha256="dc30a2ec02d5fac91d3a4f15a00641e0987941313483ced46592ab0b0d68f324"
)
version(
"8.2004.0", sha256="b56b985fec076a22160471d389b7ff271909dfd86513dad31e401a775a6dfdc2"
)
version(
"8.2002.0", sha256="b31d56311532335212ef2ea7be4501508224cb21f1bef9d262c6d78e21959ea1"
)
depends_on("c", type="build") # generated
@ -24,6 +33,7 @@ class Rsyslog(AutotoolsPackage):
depends_on("automake", type="build")
depends_on("libtool", type="build")
depends_on("m4", type="build")
depends_on("pkgconfig", type="build")
depends_on("libestr")
depends_on("libfastjson")
depends_on("zlib-api")
@ -36,6 +46,9 @@ class Rsyslog(AutotoolsPackage):
def setup_run_environment(self, env):
env.prepend_path("PATH", self.prefix.sbin)
def autoreconf(self, spec, prefix):
Executable("./autogen.sh")()
def configure_args(self):
args = ["--with-systemdsystemunitdir=" + self.spec["rsyslog"].prefix.lib.systemd.system]
return args

1
var/spack/repos/builtin/packages/scitokens-cpp/package.py
View File

@ -17,6 +17,7 @@ class ScitokensCpp(CMakePackage):
license("Apache-2.0")
version("1.1.2", sha256="07d33cb51a3ccd8460f2acebb15b35393aeccfc70e3554a73c9e5cffed6edb39")
version("1.1.1", sha256="a9091b888fc778282caf2a6808c86f685d2411557673152d58fe53932a6c7212")
version("1.1.0", sha256="9c4afd6638e94855ede52ecfc3d4f05082f2bdf151a9ab8dafcc2bb7cd4d9039")
version("1.0.2", sha256="cdc1e80e0cba9ca0e16de2efa10ec5e38765792bf5107024bfb66ddad5a16a85")

56
var/spack/repos/builtin/packages/soqt/package.py Normal file
View File

@ -0,0 +1,56 @@
# Copyright 2013-2024 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.package import *
class Soqt(CMakePackage):
"""Old Coin GUI binding for Qt, replaced by Quarter"""
homepage = "https://github.com/coin3d/soqt/"
url = "https://github.com/coin3d/soqt/releases/download/v1.6.3/soqt-1.6.3-src.tar.gz"
git = "https://github.com/coin3d/soqt/"
depends_on("cxx", type="build")
depends_on("cmake@3:", type="build")
license("BSD-3-Clause", checked_by="paulgessinger")
version("1.6.3", sha256="79342e89290783457c075fb6a60088aad4a48ea072ede06fdf01985075ef46bd")
version("1.6.2", sha256="fb483b20015ab827ba46eb090bd7be5bc2f3d0349c2f947c3089af2b7003869c")
version("1.6.1", sha256="80289d9bd49ffe709ab85778c952573f43f1c725ea958c6d5969b2e9c77bb3ba")
depends_on("coin3d")
depends_on("opengl")
variant(
"static_defaults",
default=True,
description="Enable statically linked in default materials",
)
variant("spacenav", default=True, description="Enable Space Navigator support")
variant("tests", default=False, description="Build small test programs.")
variant("iv", default=True, description="Enable extra Open Inventor extensions")
depends_on("qmake")
with when("^[virtuals=qmake] qt"):
depends_on("qt@5 +gui +opengl")
with when("^[virtuals=qmake] qt-base"):
depends_on("qt-base@6 +gui +opengl +widgets")
def cmake_args(self):
args = [
self.define_from_variant("COIN_IV_EXTENSIONS", "iv"),
self.define_from_variant("WITH_STATIC_DEFAULTS", "static_defaults"),
self.define_from_variant("HAVE_SPACENAV_SUPPORT", "spacenav"),
self.define_from_variant("SOQT_BUILD_TESTS", "tests"),
]
if self.spec.satisfies("^[virtuals=qmake] qt"):
args.append(self.define("SOQT_USE_QT5", True))
args.append(self.define("SOQT_USE_QT6", False))
if self.spec.satisfies("^[virtuals=qmake] qt-base"):
args.append(self.define("SOQT_USE_QT5", False))
args.append(self.define("SOQT_USE_QT6", True))
return args

4
var/spack/repos/builtin/packages/superlu-dist/package.py
View File

@ -16,10 +16,12 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage):
tags = ["e4s"]
maintainers("xiaoye", "gchavez2", "balay", "pghysels", "liuyangzhuan")
maintainers("xiaoyeli", "gchavez2", "balay", "pghysels", "liuyangzhuan")
version("develop", branch="master")
version("amd", branch="amd")
version("9.1.0", sha256="1cb2c6dc7e8231b2ec30c1266e55e440ffca9f55527771d8df28f900dd179f9d")
version("9.0.0", sha256="aa43d33d4b1b0f5f7b5ad7685e9a6bc25088832c6c74d2ab8f75a2c9f4e9e955")
version("8.2.1", sha256="b77d065cafa6bc1a1dcc15bf23fd854f54b05762b165badcffc195835ad2bddf")
version("8.2.0", sha256="d53573e5a399b2b4ab1fcc36e8421c1b6fab36345c0af14f8fa20326e3365f1f")
version("8.1.2", sha256="7b16c442bb01ea8b298c0aab9a2584aa4615d09786aac968cb2f3118c058206b")

1
var/spack/repos/builtin/packages/thrift/package.py
View File

@ -65,6 +65,7 @@ class Thrift(Package):
depends_on("ant", when="+java")
extends("python", when="+python")
depends_on("python@:3.11.9", when="+python")
depends_on("py-setuptools", type=("build", "run"), when="+python")
depends_on("py-six@1.7.2:", type=("build", "run"), when="@0.10.0:+python")
depends_on("py-tornado", type=("build", "run"), when="+python")

9
var/spack/repos/builtin/packages/varnish-cache/package.py
View File

@ -10,10 +10,13 @@ class VarnishCache(AutotoolsPackage):
"""This is Varnish Cache, the high-performance HTTP accelerator."""
homepage = "https://www.varnish-cache.org/"
url = "https://github.com/varnishcache/varnish-cache/archive/varnish-6.4.0.tar.gz"
url = "https://github.com/varnishcache/varnish-cache/archive/refs/tags/varnish-6.4.0.tar.gz"
license("BSD-2-Clause")
version("7.6.1", sha256="6cfa30d761fa5edf33322048564cda3ee99de93ee57732c10f720d98d12f1899")
with default_args(deprecated=True):
# https://nvd.nist.gov/vuln/detail/CVE-2022-23959
version("6.4.0", sha256="d9702c2c689c5d4ecd911886f769ddf22f46ac0722e275bee4033928cab09243")
version("6.3.2", sha256="e50f3dd4e26d5669c5b73657cdb0d5ddac7dcc3cfa1761a983afa24b659f3785")
version("6.3.1", sha256="8cc57360c1db36e8c77fc51304a935803a06247f6d6120fa47e8345efadf17a9")
@ -26,7 +29,9 @@ class VarnishCache(AutotoolsPackage):
depends_on("automake", type="build")
depends_on("libtool", type="build")
depends_on("m4", type="build")
depends_on("pcre")
depends_on("pkgconfig", type="build")
depends_on("pcre2", when="@7:")
depends_on("pcre", when="@:6")
depends_on("readline")
depends_on("python", type=("build", "run"))
depends_on("py-sphinx", type=("build", "run"))

6
var/spack/repos/builtin/packages/vtk-m/package.py
View File

@ -185,6 +185,12 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
when="@1.6.0:2.1 +cuda ^cuda@12.5:",
)
def flag_handler(self, name, flags):
if name == "cxxflags":
if self.spec.satisfies("@:2.2.0 %oneapi@2025:"):
flags.append("-Wno-error=missing-template-arg-list-after-template-kw")
return (flags, None, None)
def cmake_args(self):
spec = self.spec
options = []

5
var/spack/repos/builtin/packages/vtk/package.py
View File

@ -54,8 +54,9 @@ class Vtk(CMakePackage):
version("6.3.0", sha256="92a493354c5fa66bea73b5fc014154af5d9f3f6cee8d20a826f4cd5d4b0e8a5e")
version("6.1.0", sha256="bd7df10a479606d529a8b71f466c44a2bdd11fd534c62ce0aa44fad91883fa34")
depends_on("c", type="build") # generated
depends_on("cxx", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("pkgconfig", type="build", when="platform=linux")
# VTK7 defaults to OpenGL2 rendering backend
variant("opengl2", default=True, description="Enable OpenGL2 backend")

3
var/spack/repos/builtin/packages/xerces-c/package.py
View File

@ -20,7 +20,10 @@ class XercesC(AutotoolsPackage):
license("Apache-2.0")
version("3.3.0", sha256="ef752578587e26013a933f16d76305c9b43ca32f869e3d3426986e03efb01d64")
version("3.2.5", sha256="1db4028c9b7f1f778efbf4a9462d65e13f9938f2c22f9e9994e12c49ba97e252")
with default_args(deprecated=True):
# https://nvd.nist.gov/vuln/detail/CVE-2018-1311
version("3.2.4", sha256="74aa626fc71e729ee227602870dd29a5a01cd8c9c1c7330837a51da2eb5722cc")
version("3.2.3", sha256="45c2329e684405f2b8854ecbddfb8d5b055cdf0fe4d35736cc352c504989bbb6")
version("3.2.2", sha256="1f2a4d1dbd0086ce0f52b718ac0fa4af3dc1ce7a7ff73a581a05fbe78a82bce0")

4
var/spack/repos/builtin/packages/xfsprogs/package.py
View File

@ -14,6 +14,7 @@ class Xfsprogs(AutotoolsPackage):
license("LGPL-2.1-or-later")
version("6.11.0", sha256="dae3bb432196f7b183b2e6bd5dc44bf33edbd7d0e85bd37d25c235df81b8100a")
version("5.11.0", sha256="0e9c390fcdbb8a79e1b8f5e6e25fd529fc9f9c2ef8f2d5e647b3556b82d1b353")
version("5.8.0", sha256="8ef46ed9e6bb927f407f541dc4324857c908ddf1374265edc910d23724048c6b")
version("5.7.0", sha256="8f2348a68a686a3f4491dda5d62dd32d885fbc52d32875edd41e2c296e7b4f35")
@ -25,6 +26,7 @@ class Xfsprogs(AutotoolsPackage):
depends_on("libinih")
depends_on("gettext")
depends_on("gettext@:0.21.1", when="@:6.3")
depends_on("uuid")
depends_on("util-linux")
@ -32,7 +34,7 @@ def flag_handler(self, name, flags):
if name == "cflags":
if self.spec.satisfies("@:5.4.0 %gcc@10:"):
flags.append("-fcommon")
elif name == "ldlibs":
elif name == "ldlibs" or name == "ldflags":
if "intl" in self.spec["gettext"].libs.names:
flags.append("-lintl")
return build_system_flags(name, flags)

1
var/spack/repos/builtin/packages/xtrans/package.py
View File

@ -19,6 +19,7 @@ class Xtrans(AutotoolsPackage, XorgPackage):
maintainers("wdconinc")
version("1.5.2", sha256="23031301f10fef5eaa55b438610fbd29294a70d2fa189355343bf0186bff8374")
version("1.5.0", sha256="a806f8a92f879dcd0146f3f1153fdffe845f2fc0df9b1a26c19312b7b0a29c86")
version("1.4.0", sha256="48ed850ce772fef1b44ca23639b0a57e38884045ed2cbb18ab137ef33ec713f9")
version("1.3.5", sha256="b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d")