Compare commits

..

1 Commits

Author SHA1 Message Date
Gregory Becker
6cb5700b1c try using nosearch to deprioritize api docs in search 2024-03-01 13:47:15 -08:00
16 changed files with 19 additions and 192 deletions

View File

@@ -43,7 +43,7 @@ jobs:
. share/spack/setup-env.sh
$(which spack) audit packages
$(which spack) audit externals
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # @v2.1.0
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # @v2.1.0
if: ${{ inputs.with_coverage == 'true' }}
with:
flags: unittests,audits

View File

@@ -91,7 +91,7 @@ jobs:
UNIT_TEST_COVERAGE: ${{ matrix.python-version == '3.11' }}
run: |
share/spack/qa/run-unit-tests
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1
with:
flags: unittests,linux,${{ matrix.concretizer }}
# Test shell integration
@@ -122,7 +122,7 @@ jobs:
COVERAGE: true
run: |
share/spack/qa/run-shell-tests
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1
with:
flags: shelltests,linux
@@ -181,7 +181,7 @@ jobs:
SPACK_TEST_SOLVER: clingo
run: |
share/spack/qa/run-unit-tests
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # @v2.1.0
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # @v2.1.0
with:
flags: unittests,linux,clingo
# Run unit tests on MacOS
@@ -216,6 +216,6 @@ jobs:
$(which spack) solve zlib
common_args=(--dist loadfile --tx '4*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python' -x)
$(which spack) unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml "${common_args[@]}"
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1
with:
flags: unittests,macos

View File

@@ -33,7 +33,7 @@ jobs:
./share/spack/qa/validate_last_exit.ps1
coverage combine -a
coverage xml
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1
with:
flags: unittests,windows
unit-tests-cmd:
@@ -57,7 +57,7 @@ jobs:
./share/spack/qa/validate_last_exit.ps1
coverage combine -a
coverage xml
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1
with:
flags: unittests,windows
build-abseil:

View File

@@ -59,6 +59,7 @@ upload:
apidoc:
sphinx-apidoc -f -T -o . ../spack
sphinx-apidoc -f -T -o . ../llnl
./nosearch-api-docs # set :nosearch: at top of each file
help:
@echo "Please use \`make <target>' where <target> is one of"

View File

@@ -0,0 +1,6 @@
#!/bin/sh
# Set :nosearch: at top of each api doc file
for filename in {spack,llnl}.*.rst; do
$(echo ":nosearch:"; cat $filename) > $filename
done

View File

@@ -101,7 +101,7 @@ class Bazel(Package):
patch("cppcompileaction-0.3.2.patch", when="@:6 +nodepfail")
# https://github.com/bazelbuild/bazel/issues/17956
patch("apple-clang-14.0.3.patch", when="@:4.2.3,5:6.1.1")
patch("apple-clang-14.0.3.patch", when="@:5.4.0,6.0:6.1.1")
# https://github.com/bazelbuild/bazel/issues/17958
patch(

View File

@@ -93,7 +93,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage):
depends_on("legion+shared", when="backend=legion @:1")
depends_on("legion+hdf5", when="backend=legion +hdf5 @:1")
depends_on("legion build_type=Debug", when="backend=legion +debug_backend")
depends_on("legion@master", when="backend=legion @:1")
depends_on("legion@cr", when="backend=legion @:1")
depends_on("hpx@1.4.1 cxxstd=17 malloc=system max_cpu_count=128", when="backend=hpx @:1")
depends_on("hpx build_type=Debug", when="backend=hpx +debug_backend")
depends_on("googletest@1.8.1+gmock", when="@:1")
@@ -113,7 +113,7 @@ class Flecsi(CMakePackage, CudaPackage, ROCmPackage):
depends_on("kokkos +cuda +cuda_constexpr +cuda_lambda", when="+kokkos +cuda @2.0:")
depends_on("kokkos +rocm", when="+kokkos +rocm @2.0:")
depends_on("kokkos +openmp", when="+kokkos +openmp @2.0:")
depends_on("legion@master", when="backend=legion @2.0:")
depends_on("legion@cr", when="backend=legion @2.0:")
depends_on("legion+shared", when="backend=legion +shared @2.0:")
depends_on("legion+hdf5", when="backend=legion +hdf5 @2.0:")
depends_on("legion+kokkos", when="backend=legion +kokkos @2.0:")

View File

@@ -27,8 +27,6 @@ class Legion(CMakePackage, ROCmPackage):
maintainers("pmccormick", "streichler", "elliottslaughter")
tags = ["e4s"]
version("23.12.0", tag="legion-23.12.0", commit="8fea67ee694a5d9fb27232a7976af189d6c98456")
version("23.09.0", tag="legion-23.09.0", commit="7304dfcf9b69005dd3e65e9ef7d5bd49122f9b49")
version("23.06.0", tag="legion-23.06.0", commit="7b5ff2fb9974511c28aec8d97b942f26105b5f6d")
version("23.03.0", tag="legion-23.03.0", commit="12f6051c9d75229d00ac0b31d6be1ff2014f7e6a")
version("22.12.0", tag="legion-22.12.0", commit="9ed6f4d6b579c4f17e0298462e89548a4f0ed6e5")
@@ -41,6 +39,7 @@ class Legion(CMakePackage, ROCmPackage):
version("21.03.0", tag="legion-21.03.0", commit="0cf9ddd60c227c219c8973ed0580ddc5887c9fb2")
version("stable", branch="stable")
version("master", branch="master")
version("cr", branch="control_replication")
depends_on("cmake@3.16:", type="build")
# TODO: Need to spec version of MPI v3 for use of the low-level MPI transport
@@ -75,7 +74,7 @@ class Legion(CMakePackage, ROCmPackage):
# https://github.com/spack/spack/issues/37232#issuecomment-1553376552
patch("hip-offload-arch.patch", when="@23.03.0 +rocm")
patch("update-hip-path-legion-23.06.0.patch", when="@23.06.0:23.12.0 ^hip@6.0 +rocm")
patch("update-hip-path-legion-23.06.0.patch", when="@23.06.0 ^hip@6.0 +rocm")
def patch(self):
if "network=gasnet conduit=ofi-slingshot11 ^cray-mpich+wrappers" in self.spec:

View File

@@ -17,7 +17,6 @@ class Nccl(MakefilePackage, CudaPackage):
maintainers("adamjstewart")
libraries = ["libnccl.so"]
version("2.20.3-1", sha256="19456bd63ca7d23a8319cbbdbaaf6c25949dd51161a9f8809f6b7453282983dd")
version("2.19.3-1", sha256="1c5474553afedb88e878c772f13d6f90b9226b3f2971dfa6f873adb9443100c2")
version("2.18.5-1", sha256="16ac98f3e926c024ce48e10ab220e19ce734adc48c423cfd55ad6f509bd1179f")
version("2.18.3-1", sha256="6477d83c9edbb34a0ebce6d751a1b32962bc6415d75d04972b676c6894ceaef9")

View File

@@ -1,32 +0,0 @@
# Copyright 2013-2023 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 Ncvis(CMakePackage):
"""A NetCDF file viewer. ncvis is inspired by David Pierce's
most excellent ncview utility."""
homepage = "https://github.com/SEATStandards/ncvis"
url = "https://github.com/SEATStandards/ncvis/archive/refs/tags/2022.08.28.tar.gz"
git = "https://github.com/SEATStandards/ncvis.git"
maintainers("vanderwb")
version(
"2022.08.28", sha256="a522926739b2a05ef0b436fe67a2014557f9e5fecf3b7d7700964e9006a4bf3e"
)
depends_on("cmake", type="build")
depends_on("netcdf-c", type="link")
depends_on("wxwidgets+opengl", type="link")
@run_after("install")
def install_resources(self):
install_tree("resources", self.prefix.resources)
def setup_run_environment(self, env):
env.set("NCVIS_RESOURCE_DIR", self.prefix.resources)

View File

@@ -351,24 +351,6 @@ def cmake_args(self):
base_cmake_args.append(self.define("NC_FIND_SHARED_LIBS", False))
return base_cmake_args
@run_after("install")
def patch_hdf5_pkgconfigcmake(self):
"""
Incorrect hdf5 library names are put in the package config and config.cmake files
due to incorrectly using hdf5 target names
https://github.com/spack/spack/pull/42878
"""
pkgconfig_file = find(self.prefix, "netcdf.pc", recursive=True)
cmakeconfig_file = find(self.prefix, "netCDFTargets.cmake", recursive=True)
ncconfig_file = find(self.prefix, "nc-config", recursive=True)
settingsconfig_file = find(self.prefix, "libnetcdf.settings", recursive=True)
files = pkgconfig_file + cmakeconfig_file + ncconfig_file + settingsconfig_file
filter_file("hdf5-shared", "hdf5", *files, ignore_absent=True)
filter_file("hdf5_hl-shared", "hdf5_hl", *files, ignore_absent=True)
class AutotoolsBuilder(BaseBuilder, autotools.AutotoolsBuilder):
@property

View File

@@ -1,27 +0,0 @@
# 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 PerlTestLongstring(PerlPackage):
"""Tests strings for equality, with more helpful failures"""
homepage = "https://metacpan.org/pod/Test::LongString"
url = "https://cpan.metacpan.org/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz"
maintainers("EbiArnie")
license("Artistic-1.0-Perl OR GPL-1.0-or-later")
version("0.17", sha256="abc4349eaf04d1bec1e464166a3018591ea846d8f3c5c9c8af4ac4905d3e974f")
def test_use(self):
"""Test 'use module'"""
options = ["-we", 'use strict; use Test::LongString; print("OK\n")']
perl = self.spec["perl"].command
out = perl(*options, output=str.split, error=str.split)
assert "OK" in out

View File

@@ -1,34 +0,0 @@
# 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 PerlTestXmlSimple(PerlPackage):
"""Easy testing for XML"""
homepage = "https://metacpan.org/pod/Test::XML::Simple"
url = "https://cpan.metacpan.org/authors/id/M/MC/MCMAHON/Test-XML-Simple-1.05.tar.gz"
maintainers("EbiArnie")
license("Artistic-1.0")
version("1.05", sha256="c60801a3459e7bdad4cd8007a3c94aede818a829d74e70261e6c2758b227bd53")
depends_on("perl-test-longstring", type=("build", "run", "test"))
depends_on("perl-xml-libxml@1.99:", type=("build", "run", "test"))
# The test suite from upstream is failing, so we just skip the tests
def check(self):
pass
def test_use(self):
"""Test 'use module'"""
options = ["-we", 'use strict; use Test::XML::Simple; print("OK\n")']
perl = self.spec["perl"].command
out = perl(*options, output=str.split, error=str.split)
assert "OK" in out

View File

@@ -1,31 +0,0 @@
# 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 PerlTestXml(PerlPackage):
"""Compare XML in perl tests"""
homepage = "https://metacpan.org/pod/Test::XML"
url = "https://cpan.metacpan.org/authors/id/S/SE/SEMANTICO/Test-XML-0.08.tar.gz"
maintainers("EbiArnie")
license("Artistic-1.0-Perl OR GPL-1.0-or-later")
version("0.08", sha256="eb54cc23cdec860d3ad8ac8a697cbf038d0dec95229912d975c301890ca83ee2")
depends_on("perl@5.6.0:", type=("build", "link", "run", "test"))
depends_on("perl-xml-parser@2.34:", type=("build", "run", "test"))
depends_on("perl-xml-semanticdiff@0.95:", type=("build", "run", "test"))
def test_use(self):
"""Test 'use module'"""
options = ["-we", 'use strict; use Test::XML; print("OK\n")']
perl = self.spec["perl"].command
out = perl(*options, output=str.split, error=str.split)
assert "OK" in out

View File

@@ -1,30 +0,0 @@
# 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 PerlXmlSemanticdiff(PerlPackage):
"""Perl extension for comparing XML documents."""
homepage = "https://metacpan.org/pod/XML::SemanticDiff"
url = "https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN/XML-SemanticDiff-1.0007.tar.gz"
maintainers("EbiArnie")
license("Artistic-1.0-Perl OR GPL-1.0-or-later")
version("1.0007", sha256="05fdefefbbc3f6b62fc7c9b5fabafb6b695ed68f0a3d958577251d1f0402a0f5")
depends_on("perl@5.8.0:", type=("build", "link", "run", "test"))
depends_on("perl-xml-parser", type=("build", "run", "test"))
def test_use(self):
"""Test 'use module'"""
options = ["-we", 'use strict; use XML::SemanticDiff; print("OK\n")']
perl = self.spec["perl"].command
out = perl(*options, output=str.split, error=str.split)
assert "OK" in out

View File

@@ -29,13 +29,10 @@ class Wxwidgets(AutotoolsPackage):
version("3.0.2", sha256="346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d")
version("3.0.1", sha256="bd671b79ec56af8fb3844e11cafceac1a4276fb02c79404d06b91b6c19d2c5f5")
variant("opengl", default=False, description="Enable OpenGL support")
patch("math_include.patch", when="@3.0.1:3.0.2")
depends_on("pkgconfig", type="build")
depends_on("gtkplus")
depends_on("mesa-glu", when="+opengl")
@when("@:3.0.2")
def build(self, spec, prefix):
@@ -45,9 +42,6 @@ def configure_args(self):
spec = self.spec
options = ["--enable-unicode", "--disable-precomp-headers"]
if self.spec.satisfies("+opengl"):
options.append("--with-opengl")
# see https://trac.wxwidgets.org/ticket/17639
if spec.satisfies("@:3.1.0") and sys.platform == "darwin":
options.extend(["--disable-qtkit", "--disable-mediactrl"])