From f1145d8b94bc9823ceceafc183de6305187d0095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=9D=8E?= Date: Thu, 21 Mar 2024 14:15:07 +0800 Subject: [PATCH] update --- Dockerfile | 23 ++- packages/antlr4-cpp-runtime/package.py | 2 +- packages/cutlass/package.py | 58 ------- packages/hpcx/package.py | 91 ---------- packages/hpl-2_fermi/package.py | 111 ------------ packages/m4/checks-198.sysval.1.patch | 27 --- packages/m4/checks-198.sysval.2.patch | 31 ---- packages/m4/gnulib-pgi.patch | 195 --------------------- packages/m4/nvhpc-1.4.19.patch | 14 -- packages/m4/nvhpc-long-width.patch | 17 -- packages/m4/nvhpc.patch | 34 ---- packages/m4/oneapi.patch | 18 -- packages/m4/package.py | 137 --------------- packages/m4/pgi.patch | 10 -- packages/m4/secure_snprintf.patch | 15 -- packages/m4/test/hello.m4 | 4 - packages/m4/test/hello.out | 3 - packages/mibench-automotive/package.py | 83 --------- packages/mibench-consumer/package.py | 78 --------- packages/mibench-network/package.py | 69 -------- packages/mibench-office/package.py | 94 ---------- packages/mibench-security/package.py | 87 ---------- packages/mibench-telecomm/package.py | 84 --------- packages/py-vl-convert-python/package.py | 3 +- packages/rodinia/package.py | 210 ----------------------- packages/sysu-lang/package.py | 4 +- 26 files changed, 24 insertions(+), 1478 deletions(-) delete mode 100644 packages/cutlass/package.py delete mode 100644 packages/hpcx/package.py delete mode 100644 packages/hpl-2_fermi/package.py delete mode 100644 packages/m4/checks-198.sysval.1.patch delete mode 100644 packages/m4/checks-198.sysval.2.patch delete mode 100644 packages/m4/gnulib-pgi.patch delete mode 100644 packages/m4/nvhpc-1.4.19.patch delete mode 100644 packages/m4/nvhpc-long-width.patch delete mode 100644 packages/m4/nvhpc.patch delete mode 100644 packages/m4/oneapi.patch delete mode 100644 packages/m4/package.py delete mode 100644 packages/m4/pgi.patch delete mode 100644 packages/m4/secure_snprintf.patch delete mode 100644 packages/m4/test/hello.m4 delete mode 100644 packages/m4/test/hello.out delete mode 100644 packages/mibench-automotive/package.py delete mode 100644 packages/mibench-consumer/package.py delete mode 100644 packages/mibench-network/package.py delete mode 100644 packages/mibench-office/package.py delete mode 100644 packages/mibench-security/package.py delete mode 100644 packages/mibench-telecomm/package.py delete mode 100644 packages/rodinia/package.py diff --git a/Dockerfile b/Dockerfile index 934adac..cce9301 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1.4 ARG BASE_IMAGE=debian:bookworm-slim -FROM ${BASE_IMAGE} -COPY . /root/sysu-scc-spack-repo-latest -ENV SCC_SETUP_ENV=/root/sysu-scc-spack-repo-latest/share/sysu-scc-spack-repo/setup-env.sh +FROM ${BASE_IMAGE} as builder +COPY . /root/opt/sysu-scc-spack-repo-latest +ENV SCC_SETUP_ENV=/root/opt/sysu-scc-spack-repo-latest/share/sysu-scc-spack-repo/setup-env.sh RUN < -Date: Sat, 29 May 2021 06:51:53 -0500 -Subject: doc: Minor formatting tweak. - -* doc/m4.texi (Sysval): Fix overfull /hbox. ---- - doc/m4.texi | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/doc/m4.texi b/doc/m4.texi -index 94ac851d..247f2be5 100644 ---- a/doc/m4.texi -+++ b/doc/m4.texi -@@ -6756,7 +6756,8 @@ ifdef(`__unix__', , - ')m4exit(`77')')dnl - changequote(`[', `]') - @result{} --syscmd([/bin/sh -c 'kill -9 $$'; st=$?; test $st = 137 || test $st = 265]) -+syscmd([/bin/sh -c 'kill -9 $$'; st=$?; -+test $st = 137 || test $st = 265]) - @result{} - ifelse(sysval, [0], , [errprint([ skipping: shell does not send signal 9 - ])m4exit([77])])dnl --- -cgit v1.2.1 - diff --git a/packages/m4/checks-198.sysval.2.patch b/packages/m4/checks-198.sysval.2.patch deleted file mode 100644 index e71273e..0000000 --- a/packages/m4/checks-198.sysval.2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cd7f4d153ccccf601751e9fa82424412f6ecfc96 Mon Sep 17 00:00:00 2001 -From: Eric Blake -Date: Tue, 1 Jun 2021 08:10:51 -0500 -Subject: tests: Fix 198.sysval - -In my attempt to avoid test failures on Haiku, I caused test failures -on platforms where sh is noisy when reporting a killed sub-process. - -* doc/m4.texi (Sysval): Avoid stderr noise during test. -Fixes: 17011ea76a (tests: Skip signal detection on Haiku) -Fixes: https://lists.gnu.org/archive/html/bug-m4/2021-05/msg00029.html ---- - doc/m4.texi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/m4.texi b/doc/m4.texi -index 247f2be5..3b833b2a 100644 ---- a/doc/m4.texi -+++ b/doc/m4.texi -@@ -6756,7 +6756,7 @@ ifdef(`__unix__', , - ')m4exit(`77')')dnl - changequote(`[', `]') - @result{} --syscmd([/bin/sh -c 'kill -9 $$'; st=$?; -+syscmd([@{ /bin/sh -c 'kill -9 $$'; @} 2>/dev/null; st=$?; - test $st = 137 || test $st = 265]) - @result{} - ifelse(sysval, [0], , [errprint([ skipping: shell does not send signal 9 --- -cgit v1.2.1 - diff --git a/packages/m4/gnulib-pgi.patch b/packages/m4/gnulib-pgi.patch deleted file mode 100644 index 059d897..0000000 --- a/packages/m4/gnulib-pgi.patch +++ /dev/null @@ -1,195 +0,0 @@ -Port to PGI 16.10 x86-64 - -This patch fixes one real bug in gl_anylinked_list2.h, along with some minor -glitches that are not bugs. It does not silence PGI's thousands of bogus -warnings when compiling test-intprops.c. Fortunately, the warnings do not -cause a failure. - -* lib/c-ctype.h (_C_CTYPE_LOWER_A_THRU_F_N, _C_CTYPE_LOWER_N): Rename parameter - to avoid PGI warning about '#define f(n) 'n''. My goodness, PGI goes back a - long ways - this predates C89! -* lib/gl_anylinked_list2.h (ASYNCSAFE): Fix bug caught by PGI. For example, - ASYNCSAFE (const void *) should expand to 'const void *volatile', not to - 'volatile const void *'. -* lib/spawn.in.h (POSIX_SPAWN_USEVFORK): Don't define if already defined. -* lib/verify.h (verify) [!__GNUC__]: Use shorter albeit meaningless string to - bypass silly compiler limits. -* tests/infinity.h (Infinityf, Infinityd, Infinityl) [__PGI]: -* tests/nan.h (NaNf, NaNd, NaNl): Use static functions to avoid misguided - compiler diagnostics. Is there some reason we don’t use static functions - on all platforms? - -diff --git a/lib/c-ctype.h b/lib/c-ctype.h -index bdca1f1..ec6a3a0 100644 ---- a/lib/c-ctype.h -+++ b/lib/c-ctype.h -@@ -115,16 +115,16 @@ extern "C" { - - /* Cases for lowercase hex letters, and lowercase letters, all offset by N. */ - --#define _C_CTYPE_LOWER_A_THRU_F_N(n) \ -- case 'a' + (n): case 'b' + (n): case 'c' + (n): case 'd' + (n): \ -- case 'e' + (n): case 'f' + (n) --#define _C_CTYPE_LOWER_N(n) \ -- _C_CTYPE_LOWER_A_THRU_F_N(n): \ -- case 'g' + (n): case 'h' + (n): case 'i' + (n): case 'j' + (n): \ -- case 'k' + (n): case 'l' + (n): case 'm' + (n): case 'n' + (n): \ -- case 'o' + (n): case 'p' + (n): case 'q' + (n): case 'r' + (n): \ -- case 's' + (n): case 't' + (n): case 'u' + (n): case 'v' + (n): \ -- case 'w' + (n): case 'x' + (n): case 'y' + (n): case 'z' + (n) -+#define _C_CTYPE_LOWER_A_THRU_F_N(N) \ -+ case 'a' + (N): case 'b' + (N): case 'c' + (N): case 'd' + (N): \ -+ case 'e' + (N): case 'f' + (N) -+#define _C_CTYPE_LOWER_N(N) \ -+ _C_CTYPE_LOWER_A_THRU_F_N(N): \ -+ case 'g' + (N): case 'h' + (N): case 'i' + (N): case 'j' + (N): \ -+ case 'k' + (N): case 'l' + (N): case 'm' + (N): case 'n' + (N): \ -+ case 'o' + (N): case 'p' + (N): case 'q' + (N): case 'r' + (N): \ -+ case 's' + (N): case 't' + (N): case 'u' + (N): case 'v' + (N): \ -+ case 'w' + (N): case 'x' + (N): case 'y' + (N): case 'z' + (N) - - /* Cases for hex letters, digits, lower, punct, and upper. */ - -diff --git a/lib/gl_anylinked_list2.h b/lib/gl_anylinked_list2.h -index c249f31..4545da9 100644 ---- a/lib/gl_anylinked_list2.h -+++ b/lib/gl_anylinked_list2.h -@@ -29,7 +29,7 @@ - and we use 'volatile' assignments to prevent the compiler from reordering - such assignments. */ - #ifdef SIGNAL_SAFE_LIST --# define ASYNCSAFE(type) *(volatile type *)& -+# define ASYNCSAFE(type) *(type volatile *)& - #else - # define ASYNCSAFE(type) - #endif -diff --git a/lib/spawn.in.h b/lib/spawn.in.h -index e8116f9..b4b9197 100644 ---- a/lib/spawn.in.h -+++ b/lib/spawn.in.h -@@ -142,7 +142,8 @@ typedef struct - # endif - #endif - /* A GNU extension. Use the next free bit position. */ --#define POSIX_SPAWN_USEVFORK \ -+#ifndef POSIX_SPAWN_USEVFORK -+# define POSIX_SPAWN_USEVFORK \ - ((POSIX_SPAWN_RESETIDS | (POSIX_SPAWN_RESETIDS - 1) \ - | POSIX_SPAWN_SETPGROUP | (POSIX_SPAWN_SETPGROUP - 1) \ - | POSIX_SPAWN_SETSIGDEF | (POSIX_SPAWN_SETSIGDEF - 1) \ -@@ -152,6 +153,7 @@ typedef struct - | POSIX_SPAWN_SETSCHEDULER \ - | (POSIX_SPAWN_SETSCHEDULER > 0 ? POSIX_SPAWN_SETSCHEDULER - 1 : 0)) \ - + 1) -+#endif - #if !GNULIB_defined_verify_POSIX_SPAWN_USEVFORK_no_overlap - typedef int verify_POSIX_SPAWN_USEVFORK_no_overlap - [(((POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP -diff --git a/lib/verify.h b/lib/verify.h -index dcaf7ca..dcba9c8 100644 ---- a/lib/verify.h -+++ b/lib/verify.h -@@ -248,7 +248,12 @@ template - /* Verify requirement R at compile-time, as a declaration without a - trailing ';'. */ - --#define verify(R) _GL_VERIFY (R, "verify (" #R ")") -+#ifdef __GNUC__ -+# define verify(R) _GL_VERIFY (R, "verify (" #R ")") -+#else -+/* PGI barfs if R is long. Play it safe. */ -+# define verify(R) _GL_VERIFY (R, "verify (...)") -+#endif - - #ifndef __has_builtin - # define __has_builtin(x) 0 -diff --git a/tests/infinity.h b/tests/infinity.h -index 431f700..ef5d3bd 100644 ---- a/tests/infinity.h -+++ b/tests/infinity.h -@@ -18,8 +18,9 @@ - /* Infinityf () returns a 'float' +Infinity. */ - - /* The Microsoft MSVC 9 compiler chokes on the expression 1.0f / 0.0f. -- The IBM XL C compiler on z/OS complains. */ --#if defined _MSC_VER || (defined __MVS__ && defined __IBMC__) -+ The IBM XL C compiler on z/OS complains. -+ PGI 16.10 complains. */ -+#if defined _MSC_VER || (defined __MVS__ && defined __IBMC__) || defined __PGI - static float - Infinityf () - { -@@ -34,8 +35,9 @@ Infinityf () - /* Infinityd () returns a 'double' +Infinity. */ - - /* The Microsoft MSVC 9 compiler chokes on the expression 1.0 / 0.0. -- The IBM XL C compiler on z/OS complains. */ --#if defined _MSC_VER || (defined __MVS__ && defined __IBMC__) -+ The IBM XL C compiler on z/OS complains. -+ PGI 16.10 complains. */ -+#if defined _MSC_VER || (defined __MVS__ && defined __IBMC__) || defined __PGI - static double - Infinityd () - { -@@ -50,8 +52,9 @@ Infinityd () - /* Infinityl () returns a 'long double' +Infinity. */ - - /* The Microsoft MSVC 9 compiler chokes on the expression 1.0L / 0.0L. -- The IBM XL C compiler on z/OS complains. */ --#if defined _MSC_VER || (defined __MVS__ && defined __IBMC__) -+ The IBM XL C compiler on z/OS complains. -+ PGI 16.10 complains. */ -+#if defined _MSC_VER || (defined __MVS__ && defined __IBMC__) || defined __PGI - static long double - Infinityl () - { -diff --git a/tests/nan.h b/tests/nan.h -index 48236b5..b5a0f29 100644 ---- a/tests/nan.h -+++ b/tests/nan.h -@@ -25,8 +25,11 @@ - /* NaNf () returns a 'float' not-a-number. */ - - /* The Compaq (ex-DEC) C 6.4 compiler and the Microsoft MSVC 9 compiler choke -- on the expression 0.0 / 0.0. The IBM XL C compiler on z/OS complains. */ --#if defined __DECC || defined _MSC_VER || (defined __MVS__ && defined __IBMC__) -+ on the expression 0.0 / 0.0. The IBM XL C compiler on z/OS complains. -+ PGI 16.10 complains. */ -+#if (defined __DECC || defined _MSC_VER \ -+ || (defined __MVS__ && defined __IBMC__) \ -+ || defined __PGI) - static float - NaNf () - { -@@ -41,8 +44,11 @@ NaNf () - /* NaNd () returns a 'double' not-a-number. */ - - /* The Compaq (ex-DEC) C 6.4 compiler and the Microsoft MSVC 9 compiler choke -- on the expression 0.0 / 0.0. The IBM XL C compiler on z/OS complains. */ --#if defined __DECC || defined _MSC_VER || (defined __MVS__ && defined __IBMC__) -+ on the expression 0.0 / 0.0. The IBM XL C compiler on z/OS complains. -+ PGI 16.10 complains. */ -+#if (defined __DECC || defined _MSC_VER \ -+ || (defined __MVS__ && defined __IBMC__) \ -+ || defined __PGI) - static double - NaNd () - { -@@ -59,14 +65,15 @@ NaNd () - /* On Irix 6.5, gcc 3.4.3 can't compute compile-time NaN, and needs the - runtime type conversion. - The Microsoft MSVC 9 compiler chokes on the expression 0.0L / 0.0L. -- The IBM XL C compiler on z/OS complains. */ -+ The IBM XL C compiler on z/OS complains. -+ PGI 16.10 complains. */ - #ifdef __sgi - static long double NaNl () - { - double zero = 0.0; - return zero / zero; - } --#elif defined _MSC_VER || (defined __MVS__ && defined __IBMC__) -+#elif defined _MSC_VER || (defined __MVS__ && defined __IBMC__) || defined __PGI - static long double - NaNl () - { diff --git a/packages/m4/nvhpc-1.4.19.patch b/packages/m4/nvhpc-1.4.19.patch deleted file mode 100644 index ee9398b..0000000 --- a/packages/m4/nvhpc-1.4.19.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/lib/intprops.h -+++ b/lib/intprops.h -@@ -232,9 +232,9 @@ - (A, B, P) work when P is non-null. */ - /* __builtin_{add,sub}_overflow exists but is not reliable in GCC 5.x and 6.x, - see . */ --#if 7 <= __GNUC__ && !defined __ICC -+#if 7 <= __GNUC__ && !defined __ICC && !defined __NVCOMPILER - # define _GL_HAS_BUILTIN_ADD_OVERFLOW 1 --#elif defined __has_builtin -+#elif defined __has_builtin && !defined __NVCOMPILER - # define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow) - #else - # define _GL_HAS_BUILTIN_ADD_OVERFLOW 0 diff --git a/packages/m4/nvhpc-long-width.patch b/packages/m4/nvhpc-long-width.patch deleted file mode 100644 index 1dceb3a..0000000 --- a/packages/m4/nvhpc-long-width.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/lib/regex_internal.h -+++ b/lib/regex_internal.h -@@ -39,6 +39,14 @@ - #include - #include - -+#ifndef __LONG_WIDTH__ -+#if LONG_WIDTH -+#define __LONG_WIDTH__ LONG_WIDTH -+#else -+#define __LONG_WIDTH__ __WORDSIZE -+#endif -+#endif -+ - #if defined DEBUG && DEBUG != 0 - # include - # define DEBUG_ASSERT(x) assert (x) diff --git a/packages/m4/nvhpc.patch b/packages/m4/nvhpc.patch deleted file mode 100644 index 2fc74f4..0000000 --- a/packages/m4/nvhpc.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/lib/xalloc-oversized.h 2020-08-07 11:04:56.154698639 -0700 -+++ b/lib/xalloc-oversized.h 2020-08-07 11:06:11.667997389 -0700 -@@ -46,13 +46,13 @@ - positive and N must be nonnegative. This is a macro, not a - function, so that it works correctly even when SIZE_MAX < N. */ - --#if 7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p) -+#if ((7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)) && !defined __NVCOMPILER) - # define xalloc_oversized(n, s) \ - __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) - #elif ((5 <= __GNUC__ \ - || (__has_builtin (__builtin_mul_overflow) \ - && __has_builtin (__builtin_constant_p))) \ -- && !__STRICT_ANSI__) -+ && !__STRICT_ANSI__ && !defined __NVCOMPILER) - # define xalloc_oversized(n, s) \ - (__builtin_constant_p (n) && __builtin_constant_p (s) \ - ? __xalloc_oversized (n, s) \ ---- a/lib/intprops.h 2020-08-07 11:06:15.508012580 -0700 -+++ b/lib/intprops.h 2020-08-07 11:07:54.379403731 -0700 -@@ -242,11 +242,11 @@ - - /* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ - #define _GL_HAS_BUILTIN_OVERFLOW \ -- (5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)) -+ ((5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)) && !defined __NVCOMPILER) - - /* True if __builtin_add_overflow_p (A, B, C) works. */ - #define _GL_HAS_BUILTIN_OVERFLOW_P \ -- (7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)) -+ ((7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)) && !defined __NVCOMPILER) - - /* The _GL*_OVERFLOW macros have the same restrictions as the - *_RANGE_OVERFLOW macros, except that they do not assume that operands diff --git a/packages/m4/oneapi.patch b/packages/m4/oneapi.patch deleted file mode 100644 index d659c1e..0000000 --- a/packages/m4/oneapi.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/lib/xalloc-oversized.h 2020-08-07 11:04:56.154698639 -0700 -+++ b/lib/xalloc-oversized.h 2020-08-07 11:06:11.667997389 -0700 -@@ -46,13 +46,13 @@ - positive and N must be nonnegative. This is a macro, not a - function, so that it works correctly even when SIZE_MAX < N. */ - --#if 7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p) -+#if ((7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)) && !defined __INTEL_LLVM_COMPILER) - # define xalloc_oversized(n, s) \ - __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) - #elif ((5 <= __GNUC__ \ - || (__has_builtin (__builtin_mul_overflow) \ - && __has_builtin (__builtin_constant_p))) \ -- && !__STRICT_ANSI__) -+ && !__STRICT_ANSI__ && !defined __INTEL_LLVM_COMPILER) - # define xalloc_oversized(n, s) \ - (__builtin_constant_p (n) && __builtin_constant_p (s) \ - ? __xalloc_oversized (n, s) \ diff --git a/packages/m4/package.py b/packages/m4/package.py deleted file mode 100644 index 7e4097d..0000000 --- a/packages/m4/package.py +++ /dev/null @@ -1,137 +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) - -import os -import re - -from spack.package import * - - -class M4(AutotoolsPackage, GNUMirrorPackage): - """GNU M4 is an implementation of the traditional Unix macro processor.""" - - homepage = "https://www.gnu.org/software/m4/m4.html" - gnu_mirror_path = "m4/m4-1.4.18.tar.gz" - - license("GPL-3.0-or-later") - - version("1.4.19", sha256="3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70") - version("1.4.18", sha256="ab2633921a5cd38e48797bf5521ad259bdc4b979078034a3b790d7fec5493fab") - version("1.4.17", sha256="3ce725133ee552b8b4baca7837fb772940b25e81b2a9dc92537aeaf733538c9e") - - patch("gnulib-pgi.patch", when="@1.4.18") - patch("pgi.patch", when="@1.4.17") - # The NVIDIA compilers do not currently support some GNU builtins. - # Detect this case and use the fallback path. - patch("nvhpc.patch", when="@1.4.18 %nvhpc") - patch("nvhpc-1.4.19.patch", when="@1.4.19 %nvhpc") - # Workaround bug where __LONG_WIDTH__ is not defined - patch("nvhpc-long-width.patch", when="@1.4.19 %nvhpc") - patch("oneapi.patch", when="@1.4.18 %oneapi") - # from: https://github.com/Homebrew/homebrew-core/blob/master/Formula/m4.rb - # Patch credit to Jeremy Huddleston Sequoia - patch("secure_snprintf.patch", when="@:1.4.18 os=highsierra") - patch("secure_snprintf.patch", when="@:1.4.18 os=mojave") - patch("secure_snprintf.patch", when="@:1.4.18 os=catalina") - patch("secure_snprintf.patch", when="@:1.4.18 os=bigsur") - # https://bugzilla.redhat.com/show_bug.cgi?id=1573342 - patch( - "https://src.fedoraproject.org/rpms/m4/raw/5d147168d4b93f38a4833f5dd1d650ad88af5a8a/f/m4-1.4.18-glibc-change-work-around.patch", - sha256="fc9b61654a3ba1a8d6cd78ce087e7c96366c290bc8d2c299f09828d793b853c8", - when="@1.4.18", - ) - # from: https://www.mail-archive.com/m4-patches@gnu.org/msg01208.html - # tests: Fix failing test checks/198.sysval with upstream patch for doc/m4.texi - patch("checks-198.sysval.1.patch", when="@1.4.19") - patch("checks-198.sysval.2.patch", when="@1.4.19") - - variant("sigsegv", default=True, description="Build the libsigsegv dependency") - - depends_on("diffutils", type="build") - depends_on("libsigsegv", when="+sigsegv") - - build_directory = "spack-build" - - tags = ["build-tools"] - - executables = ["^g?m4$"] - - @when("@1.4.19") - def patch(self): - """skip texinfo of m4.info for patched m4.texi (patched only a test in it)""" - timestamp = os.path.getmtime("doc/m4.info") - os.utime("doc/m4.texi", (timestamp, timestamp)) - - @classmethod - def determine_version(cls, exe): - # Output on macOS: - # GNU M4 1.4.6 - # Output on Linux: - # m4 (GNU M4) 1.4.18 - output = Executable(exe)("--version", output=str, error=str) - match = re.search(r"GNU M4\)?\s+(\S+)", output) - return match.group(1) if match else None - - def setup_dependent_build_environment(self, env, dependent_spec): - # Inform autom4te if it wasn't built correctly (some external - # installations such as homebrew). See - # https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html - env.set("M4", self.prefix.bin.m4) - - def setup_build_environment(self, env): - # The default optimization level for icx/icpx is "-O2", - # but building m4 with this level breaks the build of dependents. - # So we set it explicitely to "-O0". - if self.spec.satisfies("%intel") or self.spec.satisfies("%oneapi"): - env.append_flags("CFLAGS", "-O0") - - def setup_run_environment(self, env): - env.set("M4", self.prefix.bin.m4) - - def configure_args(self): - spec = self.spec - args = ["--enable-c++"] - - if spec.satisfies("%cce@9:"): - args.append("LDFLAGS=-rtlib=compiler-rt") - - if ( - spec.satisfies("@:1.4.18%clang") - or spec.satisfies("%aocc") - or spec.satisfies("%arm") - or spec.satisfies("%fj") - ) and not spec.satisfies("platform=darwin"): - args.append("LDFLAGS=-rtlib=compiler-rt") - - if spec.satisfies("%intel@:18"): - args.append("CFLAGS=-no-gcc") - - if "+sigsegv" in spec: - args.append("--with-libsigsegv-prefix={0}".format(spec["libsigsegv"].prefix)) - else: - args.append("--without-libsigsegv-prefix") - - # https://lists.gnu.org/archive/html/bug-m4/2016-09/msg00002.html - arch = spec.architecture - if arch.platform == "darwin" and arch.os == "sierra" and "%gcc" in spec: - args.append("ac_cv_type_struct_sched_param=yes") - - return args - - def test_version(self): - """ensure m4 version matches installed spec""" - m4 = which(self.prefix.bin.m4) - out = m4("--version", output=str.split, error=str.split) - assert str(self.spec.version) in out - - def test_hello(self): - """ensure m4 hello example runs""" - test_data_dir = self.test_suite.current_test_data_dir - hello_file = test_data_dir.join("hello.m4") - m4 = which(self.prefix.bin.m4) - out = m4(hello_file, output=str.split, error=str.split) - - expected = get_escaped_text_output(test_data_dir.join("hello.out")) - check_outputs(expected, out) diff --git a/packages/m4/pgi.patch b/packages/m4/pgi.patch deleted file mode 100644 index 1ad63e2..0000000 --- a/packages/m4/pgi.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lib/config.hin -+++ b/lib/config.hin -@@ -1510,6 +1510,7 @@ - ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ - : (199901L <= __STDC_VERSION__ \ - && !defined __HP_cc \ -+ && !defined __PGI \ - && !(defined __SUNPRO_C && __STDC__))) \ - && !defined _GL_EXTERN_INLINE_APPLE_BUG) - # define _GL_INLINE inline diff --git a/packages/m4/secure_snprintf.patch b/packages/m4/secure_snprintf.patch deleted file mode 100644 index da3ae5b..0000000 --- a/packages/m4/secure_snprintf.patch +++ /dev/null @@ -1,15 +0,0 @@ -With format string strictness, High Sierra also enforces that %n isn't used -in dynamic format strings, but we should just disable its use on darwin in -general. - ---- a/lib/vasnprintf.c.orig 2017-06-22 15:19:15.000000000 -0700 -+++ b/lib/vasnprintf.c 2017-06-22 15:20:20.000000000 -0700 -@@ -4869,7 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; diff --git a/packages/m4/test/hello.m4 b/packages/m4/test/hello.m4 deleted file mode 100644 index 6132c41..0000000 --- a/packages/m4/test/hello.m4 +++ /dev/null @@ -1,4 +0,0 @@ -define(NAME, World) -dnl This line should not show up -// macro is ifdef(`NAME', , not)defined -Hello, NAME! diff --git a/packages/m4/test/hello.out b/packages/m4/test/hello.out deleted file mode 100644 index c8d3be7..0000000 --- a/packages/m4/test/hello.out +++ /dev/null @@ -1,3 +0,0 @@ - -// macro is defined -Hello, World! diff --git a/packages/mibench-automotive/package.py b/packages/mibench-automotive/package.py deleted file mode 100644 index bc5d7f6..0000000 --- a/packages/mibench-automotive/package.py +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -# ---------------------------------------------------------------------------- -# If you submit this package back to Spack as a pull request, -# please first remove this boilerplate and all FIXME comments. -# -# This is a template package file for Spack. We've put "FIXME" -# next to all the things you'll want to change. Once you've handled -# them, you can save this file and test your package like this: -# -# spack install automotive -# -# You can edit this file again by typing: -# -# spack edit automotive -# -# See the Spack documentation for more information on packaging. -# ---------------------------------------------------------------------------- - -from hashlib import sha256 - -from spack import * - - -class MibenchAutomotive(MakefilePackage): - """FIXME: Put a proper description of your package here.""" - - # FIXME: Add a proper url for your package's homepage here. - homepage = "https://vhosts.eecs.umich.edu/mibench/" - url = "https://vhosts.eecs.umich.edu/mibench/automotive.tar.gz" - - # FIXME: Add a list of GitHub accounts to - # notify when the package is updated. - # maintainers = ['github_user1', 'github_user2'] - - # FIXME: Add proper versions and checksums here. - # version('1.2.3', '0123456789abcdef0123456789abcdef') - version("1.0", sha256="d63e8dc1f15d93d1b7ee59aed4dfb38659cb78819ce94bd26f8ceaf4d149fad9") - - # FIXME: Add dependencies if required. - - def edit(self, spec, prefix): - # FIXME: Edit the Makefile if necessary - # FIXME: If not needed delete this function - makefiles = [ - "./basicmath/Makefile", - "./bitcount/Makefile", - "./qsort/Makefile", - "./susan/Makefile", - ] - for mf in makefiles: - makefile = FileFilter(mf) - makefile.filter("gcc", "cc -Wl,--emit-relocs") - makefile.filter("-static", "") - - with open("Makefile", "w") as mf: - mf.write( - """ -all: - make -C basicmath - make -C bitcount - make -C qsort - make -C susan -""" - ) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - bins = [ - "basicmath/basicmath_small", - "basicmath/basicmath_large", - "bitcount/bitcnts", - "qsort/qsort_small", - "qsort/qsort_large", - "susan/susan", - ] - for b in bins: - install(b, prefix.bin) - mkdirp(join_path(prefix, "data")) - install_tree(".", join_path(prefix, "data")) diff --git a/packages/mibench-consumer/package.py b/packages/mibench-consumer/package.py deleted file mode 100644 index 319c784..0000000 --- a/packages/mibench-consumer/package.py +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -# ---------------------------------------------------------------------------- -# If you submit this package back to Spack as a pull request, -# please first remove this boilerplate and all FIXME comments. -# -# This is a template package file for Spack. We've put "FIXME" -# next to all the things you'll want to change. Once you've handled -# them, you can save this file and test your package like this: -# -# spack install automotive -# -# You can edit this file again by typing: -# -# spack edit automotive -# -# See the Spack documentation for more information on packaging. -# ---------------------------------------------------------------------------- - -from hashlib import sha256 - -from spack import * - - -class MibenchConsumer(MakefilePackage): - """FIXME: Put a proper description of your package here.""" - - # FIXME: Add a proper url for your package's homepage here. - homepage = "https://vhosts.eecs.umich.edu/mibench/" - url = "https://vhosts.eecs.umich.edu/mibench/consumer.tar.gz" - - # FIXME: Add a list of GitHub accounts to - # notify when the package is updated. - # maintainers = ['github_user1', 'github_user2'] - - # FIXME: Add proper versions and checksums here. - # version('1.2.3', '0123456789abcdef0123456789abcdef') - version("1.0", sha256="86d76a66fa567953c7b814a6c6e816c6af0afab59610160acb8036899d03d1f9") - - # FIXME: Add dependencies if required. - depends_on("libmad", type="run") - depends_on("libtiff", type="run") - depends_on("lame", type="run") - - def edit(self, spec, prefix): - # FIXME: Edit the Makefile if necessary - # FIXME: If not needed delete this function - makefiles = [ - "./jpeg/jpeg-6a/Makefile", - "./lame/lame3.70/Makefile", - "./typeset/lout-3.24/Makefile", - ] - for mf in makefiles: - makefile = FileFilter(mf) - makefile.filter("gcc", "cc -Wl,--emit-relocs") - makefile.filter("-static", "") - makefile.filter("-lncurses", "") - makefile.filter("-DBRHIST", "") - - with open("Makefile", "w") as mf: - mf.write( - """ -all: - make -C jpeg/jpeg-6a - make -C typeset/lout-3.24 -""" - ) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - bins = ["jpeg/jpeg-6a/cjpeg", "jpeg/jpeg-6a/djpeg", "typeset/lout-3.24/lout"] - for b in bins: - install(b, prefix.bin) - mkdirp(join_path(prefix, "data")) - install_tree(".", join_path(prefix, "data")) diff --git a/packages/mibench-network/package.py b/packages/mibench-network/package.py deleted file mode 100644 index 2a384fc..0000000 --- a/packages/mibench-network/package.py +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -# ---------------------------------------------------------------------------- -# If you submit this package back to Spack as a pull request, -# please first remove this boilerplate and all FIXME comments. -# -# This is a template package file for Spack. We've put "FIXME" -# next to all the things you'll want to change. Once you've handled -# them, you can save this file and test your package like this: -# -# spack install automotive -# -# You can edit this file again by typing: -# -# spack edit automotive -# -# See the Spack documentation for more information on packaging. -# ---------------------------------------------------------------------------- - -from hashlib import sha256 - -from spack import * - - -class MibenchNetwork(MakefilePackage): - """FIXME: Put a proper description of your package here.""" - - # FIXME: Add a proper url for your package's homepage here. - homepage = "https://vhosts.eecs.umich.edu/mibench/" - url = "https://vhosts.eecs.umich.edu/mibench/network.tar.gz" - - # FIXME: Add a list of GitHub accounts to - # notify when the package is updated. - # maintainers = ['github_user1', 'github_user2'] - - # FIXME: Add proper versions and checksums here. - # version('1.2.3', '0123456789abcdef0123456789abcdef') - version("1.0", sha256="e23b6b744ad3056a0e6f4674c9a867007d99a1bb11306e3803813c0734cdcae2") - - # FIXME: Add dependencies if required. - - def edit(self, spec, prefix): - # FIXME: Edit the Makefile if necessary - # FIXME: If not needed delete this function - makefiles = ["./dijkstra/Makefile", "./patricia/Makefile"] - for mf in makefiles: - makefile = FileFilter(mf) - makefile.filter("gcc", "cc -Wl,--emit-relocs") - makefile.filter("-static", "") - - with open("Makefile", "w") as mf: - mf.write( - """ -all: - make -C patricia - make -C dijkstra -""" - ) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - bins = ["patricia/patricia", "dijkstra/dijkstra_large", "dijkstra/dijkstra_small"] - for b in bins: - install(b, prefix.bin) - mkdirp(join_path(prefix, "data")) - install_tree(".", join_path(prefix, "data")) diff --git a/packages/mibench-office/package.py b/packages/mibench-office/package.py deleted file mode 100644 index 84de4ed..0000000 --- a/packages/mibench-office/package.py +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -# ---------------------------------------------------------------------------- -# If you submit this package back to Spack as a pull request, -# please first remove this boilerplate and all FIXME comments. -# -# This is a template package file for Spack. We've put "FIXME" -# next to all the things you'll want to change. Once you've handled -# them, you can save this file and test your package like this: -# -# spack install automotive -# -# You can edit this file again by typing: -# -# spack edit automotive -# -# See the Spack documentation for more information on packaging. -# ---------------------------------------------------------------------------- - -import glob -from hashlib import sha256 - -from spack import * - - -class MibenchOffice(MakefilePackage): - """FIXME: Put a proper description of your package here.""" - - # FIXME: Add a proper url for your package's homepage here. - homepage = "https://vhosts.eecs.umich.edu/mibench/" - url = "https://vhosts.eecs.umich.edu/mibench/office.tar.gz" - - # FIXME: Add a list of GitHub accounts to - # notify when the package is updated. - # maintainers = ['github_user1', 'github_user2'] - - # FIXME: Add proper versions and checksums here. - # version('1.2.3', '0123456789abcdef0123456789abcdef') - version("1.0", sha256="e8bd0229346b8926dd61cfa8a377e9ce8751381dc669e062acc1b89df58eff4b") - - # FIXME: Add dependencies if required. - depends_on("ghostscript", type="run") - - def edit(self, spec, prefix): - # FIXME: Edit the Makefile if necessary - # FIXME: If not needed delete this function - makefiles = ["./ghostscript/src/Makefile", "./ghostscript/src/gcc-head.mak"] - for mf in makefiles: - makefile = FileFilter(mf) - makefile.filter("gcc", "cc -Wl,--emit-relocs") - makefile.filter("-static", "") - - makefiles = ["./ispell/Makefile", "./stringsearch/Makefile"] - for mf in makefiles: - makefile = FileFilter(mf) - makefile.filter("gcc", "cc -Wl,--emit-relocs") - makefile.filter("-static", "") - - for mf in glob.glob("./ghostscript/src/**/*.h", recursive=True) + glob.glob( - "./ghostscript/src/**/*.c", recursive=True - ): - makefile = FileFilter(mf) - makefile.filter("dprintf", "dbgprintf") - - for mf in ["./ispell/correct.c", "./ispell/ispell.h"]: - makefile = FileFilter(mf) - makefile.filter("getline", "mygetline") - - for mf in ["./ghostscript/src/time_.h"]: - makefile = FileFilter(mf) - makefile.filter( - "#ifdef HAVE_SYS_TIME_H", - "#include \n#include \n#ifdef HAVE_SYS_TIME_H", - ) - - with open("Makefile", "w") as mf: - mf.write( - """ -all: - make -C ispell - make -C stringsearch -""" - ) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - bins = ["ispell/ispell", "stringsearch/search_small", "stringsearch/search_large"] - for b in bins: - install(b, prefix.bin) - mkdirp(join_path(prefix, "data")) - install_tree(".", join_path(prefix, "data")) diff --git a/packages/mibench-security/package.py b/packages/mibench-security/package.py deleted file mode 100644 index 25568ac..0000000 --- a/packages/mibench-security/package.py +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -# ---------------------------------------------------------------------------- -# If you submit this package back to Spack as a pull request, -# please first remove this boilerplate and all FIXME comments. -# -# This is a template package file for Spack. We've put "FIXME" -# next to all the things you'll want to change. Once you've handled -# them, you can save this file and test your package like this: -# -# spack install automotive -# -# You can edit this file again by typing: -# -# spack edit automotive -# -# See the Spack documentation for more information on packaging. -# ---------------------------------------------------------------------------- - -from hashlib import sha256 - -from spack import * - - -class MibenchSecurity(MakefilePackage): - """FIXME: Put a proper description of your package here.""" - - # FIXME: Add a proper url for your package's homepage here. - homepage = "https://vhosts.eecs.umich.edu/mibench/" - url = "https://vhosts.eecs.umich.edu/mibench/security.tar.gz" - - # FIXME: Add a list of GitHub accounts to - # notify when the package is updated. - # maintainers = ['github_user1', 'github_user2'] - - # FIXME: Add proper versions and checksums here. - # version('1.2.3', '0123456789abcdef0123456789abcdef') - version("1.0", sha256="866f4a36d53e285824a2b9f513f125d4aaaffef3eb2cd264a9cb675eaa554222") - - # FIXME: Add dependencies if required. - - def edit(self, spec, prefix): - # FIXME: Edit the Makefile if necessary - # FIXME: If not needed delete this function - makefiles = [ - "./blowfish/Makefile", - "./pgp/src/Makefile", - "./rijndael/Makefile", - "./sha/Makefile", - ] - for mf in makefiles: - makefile = FileFilter(mf) - makefile.filter("^CC.*=.*", "") - makefile.filter("gcc", "cc -Wl,--emit-relocs") - makefile.filter("-static", "") - - makefile = FileFilter("./rijndael/aesxam.c") - makefile.filter("\(char\)flen", "flen.__pos") - - with open("Makefile", "w") as mf: - mf.write( - """ -all: - make -C blowfish - make -C pgp/src - make -C rijndael - make -C sha -""" - ) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - bins = [ - "blowfish/bftest", - "blowfish/bfspeed", - "blowfish/bf", - "pgp/src/pgp", - "rijndael/rijndael", - "sha/sha", - ] - for b in bins: - install(b, prefix.bin) - mkdirp(join_path(prefix, "data")) - install_tree(".", join_path(prefix, "data")) diff --git a/packages/mibench-telecomm/package.py b/packages/mibench-telecomm/package.py deleted file mode 100644 index 7fb476f..0000000 --- a/packages/mibench-telecomm/package.py +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -# ---------------------------------------------------------------------------- -# If you submit this package back to Spack as a pull request, -# please first remove this boilerplate and all FIXME comments. -# -# This is a template package file for Spack. We've put "FIXME" -# next to all the things you'll want to change. Once you've handled -# them, you can save this file and test your package like this: -# -# spack install automotive -# -# You can edit this file again by typing: -# -# spack edit automotive -# -# See the Spack documentation for more information on packaging. -# ---------------------------------------------------------------------------- - -from hashlib import sha256 - -from spack import * - - -class MibenchTelecomm(MakefilePackage): - """FIXME: Put a proper description of your package here.""" - - # FIXME: Add a proper url for your package's homepage here. - homepage = "https://vhosts.eecs.umich.edu/mibench/" - url = "https://vhosts.eecs.umich.edu/mibench/telecomm.tar.gz" - - # FIXME: Add a list of GitHub accounts to - # notify when the package is updated. - # maintainers = ['github_user1', 'github_user2'] - - # FIXME: Add proper versions and checksums here. - # version('1.2.3', '0123456789abcdef0123456789abcdef') - version("1.0", sha256="cdcdc9bfa8ef7c78a91b9b682ad611ce762920e06a3b39140c22ded0e2e634aa") - - # FIXME: Add dependencies if required. - - def edit(self, spec, prefix): - # FIXME: Edit the Makefile if necessary - # FIXME: If not needed delete this function - makefiles = [ - "./FFT/Makefile", - "./CRC32/Makefile", - "./adpcm/src/Makefile", - "./gsm/Makefile", - ] - for mf in makefiles: - makefile = FileFilter(mf) - makefile.filter("gcc", "cc -Wl,--emit-relocs") - makefile.filter("-static", "") - - with open("Makefile", "w") as mf: - mf.write( - """ -all: - make -C FFT - make -C CRC32 - make -C adpcm/src - make -C gsm -""" - ) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - bins = [ - "adpcm/src/rawcaudio", - "adpcm/src/rawdaudio", - "adpcm/src/timing", - "CRC32/crc", - "FFT/fft", - "gsm/bin/toast", - "gsm/bin/untoast", - ] - for b in bins: - install(b, prefix.bin) - mkdirp(join_path(prefix, "data")) - install_tree(".", join_path(prefix, "data")) diff --git a/packages/py-vl-convert-python/package.py b/packages/py-vl-convert-python/package.py index 3dcd671..3553f66 100644 --- a/packages/py-vl-convert-python/package.py +++ b/packages/py-vl-convert-python/package.py @@ -9,9 +9,10 @@ class PyVlConvertPython(PythonPackage): """Convert Vega-Lite chart specifications to SVG, PNG, or Vega""" - homepage = "https://github.com/jonmmease/vl-convert" + homepage = "https://github.com/vega/vl-convert" pypi = "vl_convert_python/vl_convert_python-0.13.1.tar.gz" + version("1.3.0", sha256="de1462151dfbba7b2a17881dac1d2269662012c252f1e9d1537a4daed5e36067") version("0.13.1", sha256="d70a608257dd6b5b782d96cccebfe7289992e522e47a8bebb7d928253ca8b396") depends_on("python@3.7:", type=("build", "run")) diff --git a/packages/rodinia/package.py b/packages/rodinia/package.py deleted file mode 100644 index aaedcc7..0000000 --- a/packages/rodinia/package.py +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack import * - - -class Rodinia(MakefilePackage, CudaPackage): - """Rodinia: Accelerating Compute-Intensive Applications with - Accelerators""" - - homepage = "https://rodinia.cs.virginia.edu/doku.php" - url = "https://www.cs.virginia.edu/~kw5na/lava/Rodinia/Packages/Current/rodinia_3.1.tar.bz2" - - version("3.1", sha256="faebac7c11ed8f8fcf6bf2d7e85c3086fc2d11f72204d6dfc28dc5b2e8f2acfd") - - depends_on("cuda") - depends_on("freeglut") - depends_on("glew") - depends_on("gl") - depends_on("glu") - - conflicts("~cuda") - - build_targets = ["CUDA"] - - variant( - "cudart", - default="default", - description="build with nvcc --cudart shared to be used with gpgpu-sim", - values=("default", "shared", "static", "none"), - multi=False, - ) - - def edit(self, spec, prefix): - # set cuda paths - filter_file( - "CUDA_DIR = /usr/local/cuda", - "CUDA_DIR = {0}".format(self.spec["cuda"].prefix), - "common/make.config", - string=True, - ) - - filter_file( - "SDK_DIR = /usr/local/cuda-5.5/samples/", - "SDK_DIR = {0}/samples".format(self.spec["cuda"].prefix), - "common/make.config", - string=True, - ) - - filter_file( - "nvcc", "nvcc -I../hybridsort", "cuda/cfd/Makefile", string=True # fix helper_cuda.h - ) - - # fix broken makefile rule - filter_file("%.o: %.[ch]", "%.o: %.c", "cuda/kmeans/Makefile", string=True) - - # fix missing include for lseek(), read() - filter_file( - "#include ", - "#include \n#include ", - "cuda/mummergpu/src/suffix-tree.cpp", - string=True, - ) - - makefiles = [ # find . -name *akefile - "common/common.mk", - "cuda/huffman/Makefile", - "cuda/heartwall/AVI/makefile", - "cuda/heartwall/Makefile", - "cuda/cfd/Makefile", - "cuda/pathfinder/Makefile", - "cuda/nn/Makefile", - "cuda/myocyte/Makefile", - "cuda/hotspot/Makefile", - "cuda/hybridsort/Makefile", - "cuda/bfs/Makefile", - "cuda/lavaMD/makefile", - "cuda/gaussian/Makefile", - "cuda/lud/tools/Makefile", - "cuda/lud/cuda/Makefile", - "cuda/lud/base/Makefile", - "cuda/lud/Makefile", - "cuda/nw/Makefile", - "cuda/streamcluster/Makefile", - "cuda/mummergpu/src/Makefile", - "cuda/mummergpu/Makefile", - "cuda/leukocyte/meschach_lib/makefile", - "cuda/leukocyte/meschach_lib/MACHINES/Linux/makefile", - "cuda/leukocyte/meschach_lib/MACHINES/Cray/makefile", - "cuda/leukocyte/meschach_lib/MACHINES/OS2/makefile", - "cuda/leukocyte/meschach_lib/MACHINES/RS6000/makefile", - "cuda/leukocyte/meschach_lib/MACHINES/GCC/makefile", - "cuda/leukocyte/meschach_lib/MACHINES/SGI/makefile", - "cuda/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile", - "cuda/leukocyte/meschach_lib/MACHINES/SPARC/makefile", - "cuda/leukocyte/CUDA/Makefile", - "cuda/leukocyte/Makefile", - "cuda/particlefilter/Makefile", - "cuda/dwt2d/Makefile", - "cuda/backprop/Makefile", - "cuda/srad/srad_v1/makefile", - "cuda/srad/srad_v2/Makefile", - "cuda/srad/Makefile", - "cuda/b+tree/Makefile", - "cuda/hotspot3D/Makefile", - "cuda/kmeans/Makefile", - "others/rng/rng/latex/Makefile", - "openmp/heartwall/makefile", - "openmp/heartwall/AVI/makefile", - "openmp/cfd/makefile", - "openmp/pathfinder/Makefile", - "openmp/nn/Makefile", - "openmp/myocyte/Makefile", - "openmp/hotspot/Makefile", - "openmp/bfs/Makefile", - "openmp/lavaMD/makefile", - "openmp/lud/tools/Makefile", - "openmp/lud/omp/Makefile", - "openmp/lud/base/Makefile", - "openmp/lud/Makefile", - "openmp/nw/Makefile", - "openmp/streamcluster/Makefile", - "openmp/mummergpu/src/Makefile", - "openmp/mummergpu/Makefile", - "openmp/leukocyte/meschach_lib/makefile", - "openmp/leukocyte/meschach_lib/MACHINES/Linux/makefile", - "openmp/leukocyte/meschach_lib/MACHINES/Cray/makefile", - "openmp/leukocyte/meschach_lib/MACHINES/OS2/makefile", - "openmp/leukocyte/meschach_lib/MACHINES/RS6000/makefile", - "openmp/leukocyte/meschach_lib/MACHINES/GCC/makefile", - "openmp/leukocyte/meschach_lib/MACHINES/SGI/makefile", - "openmp/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile", - "openmp/leukocyte/meschach_lib/MACHINES/SPARC/makefile", - "openmp/leukocyte/OpenMP/Makefile", - "openmp/leukocyte/Makefile", - "openmp/particlefilter/Makefile", - "openmp/backprop/Makefile", - "openmp/srad/srad_v1/makefile", - "openmp/srad/srad_v2/Makefile", - "openmp/srad/Makefile", - "openmp/b+tree/Makefile", - "openmp/hotspot3D/Makefile", - "openmp/kmeans/kmeans_serial/Makefile", - "openmp/kmeans/Makefile", - "openmp/kmeans/kmeans_openmp/Makefile", - "Makefile", - "opencl/heartwall/makefile", - "opencl/cfd/Makefile", - "opencl/pathfinder/makefile", - "opencl/nn/Makefile", - "opencl/myocyte/Makefile", - "opencl/hotspot/Makefile", - "opencl/hybridsort/Makefile", - "opencl/bfs/Makefile", - "opencl/lavaMD/makefile", - "opencl/gaussian/Makefile", - "opencl/lud/ocl/makefile", - "opencl/lud/tools/Makefile", - "opencl/lud/base/Makefile", - "opencl/lud/Makefile", - "opencl/nw/Makefile", - "opencl/streamcluster/Makefile", - "opencl/leukocyte/meschach_lib/makefile", - "opencl/leukocyte/meschach_lib/MACHINES/Linux/makefile", - "opencl/leukocyte/meschach_lib/MACHINES/Cray/makefile", - "opencl/leukocyte/meschach_lib/MACHINES/OS2/makefile", - "opencl/leukocyte/meschach_lib/MACHINES/RS6000/makefile", - "opencl/leukocyte/meschach_lib/MACHINES/GCC/makefile", - "opencl/leukocyte/meschach_lib/MACHINES/SGI/makefile", - "opencl/leukocyte/meschach_lib/MACHINES/MicroSoft/makefile", - "opencl/leukocyte/meschach_lib/MACHINES/SPARC/makefile", - "opencl/leukocyte/OpenCL/Makefile", - "opencl/leukocyte/Makefile", - "opencl/particlefilter/Makefile", - "opencl/dwt2d/Makefile", - "opencl/backprop/Makefile", - "opencl/srad/makefile", - "opencl/b+tree/Makefile", - "opencl/hotspot3D/Makefile", - "opencl/kmeans/Makefile", - "data/nn/inputGen/Makefile", - "data/hotspot/inputGen/Makefile", - "data/bfs/inputGen/Makefile", - "data/kmeans/inpuGen/Makefile", - ] - - for makefile in makefiles: - filter_file("-arch sm_[0-9]+", "", makefile) - filter_file("-arch=sm_[0-9]+", "", makefile) - filter_file("--gpu-name sm_[0-9]+", "", makefile) - filter_file("--gpu-architecture=compute_[0-9]+", "", makefile) - filter_file("--gpu-code=compute_[0-9]+", "", makefile) - filter_file( - "nvcc", - "nvcc -arch=sm_{0}".format(spec.variants["cuda_arch"].value[0]) - + ( - "" - if "cudart=default" in self.spec - else " --cudart " + spec.variants["cudart"].value - ), - makefile, - ) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - install_tree("bin/linux/cuda", prefix.bin) - mkdirp(join_path(prefix, "data")) - install_tree("data", join_path(prefix, "data")) diff --git a/packages/sysu-lang/package.py b/packages/sysu-lang/package.py index 7c878df..09f8eb4 100644 --- a/packages/sysu-lang/package.py +++ b/packages/sysu-lang/package.py @@ -30,10 +30,10 @@ class SysuLang(CMakePackage): depends_on("flex", type="build") depends_on("bison", type="build") - depends_on("antlr4-complete", type=["build", "run"], when="@2404.0.0.20240115:") + depends_on("antlr4-complete", type=["build"], when="@2404.0.0.20240115:") depends_on("antlr4-cpp-runtime", type=["build", "run"], when="@2404.0.0.20240115:") depends_on("libuuid", type=["build", "link"], when="^antlr4-cpp-runtime@:4.10.1") - depends_on("llvm@11.0.0:+clang", type="link") + depends_on("llvm@11.0.0:+clang", type=["link", "run"]) depends_on("python@3.8.0:", type="run") def cmake_args(self):