summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Uphoff <carsten.uphoff@intel.com>2024-07-04 03:08:45 +0200
committerGitHub <noreply@github.com>2024-07-03 19:08:45 -0600
commit0eca86f64f936d7fa447daae1f76e31a3b46ea98 (patch)
tree35507a55d7b372f839d215f0b2ba9b6ea72df6f4
parent50027d76a59b95359e70ea03ce2857e0ed331f6e (diff)
downloadspack-0eca86f64f936d7fa447daae1f76e31a3b46ea98.tar.gz
spack-0eca86f64f936d7fa447daae1f76e31a3b46ea98.tar.bz2
spack-0eca86f64f936d7fa447daae1f76e31a3b46ea98.tar.xz
spack-0eca86f64f936d7fa447daae1f76e31a3b46ea98.zip
tiny-tensor-compiler: fix missing dependencies (#44465)
* tiny-tensor-compiler: fix missing dependencies * tiny-tensor-compiler: Remove dependency type for opencl c headers * Re2c@3.1 has a mandatory Python interpreter dependency * Remove re2c@3.1 --------- Signed-off-by: Carsten Uphoff <carsten.uphoff@intel.com>
-rw-r--r--var/spack/repos/builtin/packages/re2c/package.py5
-rw-r--r--var/spack/repos/builtin/packages/tiny-tensor-compiler/package.py3
2 files changed, 8 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/re2c/package.py b/var/spack/repos/builtin/packages/re2c/package.py
index 399e62eb80..6d4c458433 100644
--- a/var/spack/repos/builtin/packages/re2c/package.py
+++ b/var/spack/repos/builtin/packages/re2c/package.py
@@ -17,6 +17,10 @@ class Re2c(Package):
license("Public-Domain")
+ # Python 3.7 is required for re2c@3.1, but the clingo bootstrap on OpenSUSE Leap uses
+ # the system Python 3.6 such that the bootstrap fails with an UnsatisfiableVersionSpecError
+ # version("3.1", sha256="0ac299ad359e3f512b06a99397d025cfff81d3be34464ded0656f8a96676c029")
+ version("3.0", sha256="b3babbbb1461e13fe22c630a40c43885efcfbbbb585830c6f4c0d791cf82ba0b")
version("2.2", sha256="0fc45e4130a8a555d68e230d1795de0216dfe99096b61b28e67c86dfd7d86bda")
version("2.1.1", sha256="036ee264fafd5423141ebd628890775aa9447a4c4068a6307385d7366fe711f8")
version("2.1", sha256="8cba0d95c246c670de8f97f57def83a9c0f2113eaa6f7e4867a941f48f633540")
@@ -33,6 +37,7 @@ class Re2c(Package):
depends_on("gmake", when="platform=linux")
depends_on("gmake", when="platform=darwin")
depends_on("gmake", when="platform=freebsd")
+ # depends_on("python@3:", when="@3.1:", type="build")
@property
def make_tool(self):
diff --git a/var/spack/repos/builtin/packages/tiny-tensor-compiler/package.py b/var/spack/repos/builtin/packages/tiny-tensor-compiler/package.py
index bd459d78b1..5c155b1626 100644
--- a/var/spack/repos/builtin/packages/tiny-tensor-compiler/package.py
+++ b/var/spack/repos/builtin/packages/tiny-tensor-compiler/package.py
@@ -31,7 +31,10 @@ class TinyTensorCompiler(CMakePackage):
depends_on("cmake@3.23.0:", type="build")
depends_on("double-batched-fft-library ~sycl ~level-zero ~opencl@0.5.1:", type="link")
depends_on("oneapi-level-zero@1.13:", when="+level-zero")
+ depends_on("opencl-c-headers@2022.01.04:", when="+opencl")
depends_on("opencl-icd-loader@2022.01.04:", when="+opencl", type="link")
+ depends_on("re2c@3.0:", type="build")
+ depends_on("bison@3.8.2:", type="build")
def cmake_args(self):
cxx_compiler = os.path.basename(self.compiler.cxx)