Skip to content

Commit 1d3e822

Browse files
committed
Updating viskores uberenv config to point to the right versions
1 parent c857aec commit 1d3e822

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

hashes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
viskores branch='master' commit='cfe6b34dfbfdf5b5ced30a743d1fcf2af78d7b2a'
1+
viskores branch='master' commit='82b25a885abc046b653992801e6c63b6621b2049'
22
blt branch='main' commit='fb4246b8bae74c3d7291bef9698fd38863844680'

scripts/uberenv_configs/packages/viskores/package.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,19 @@ class Viskores(CMakePackage, CudaPackage, ROCmPackage):
2121
homepage = "https://m.vtk.org/"
2222
maintainers("kmorel", "vicentebolea")
2323

24-
url = "https://github.com/Viskores/viskores/archive/refs/tags/v1.0.0.tar.gz"
2524
git = "https://github.com/Viskores/viskores"
2625
tags = ["e4s"]
2726

2827
test_requires_compiler = True
2928

30-
version("master", branch="master")
29+
version("main", branch="main")
3130
version("release", branch="release")
32-
version("1.0.0", sha256="")
31+
version(
32+
"1.0.0",
33+
tag="v1.0.0",
34+
commit="82b25a885abc046b653992801e6c63b6621b2049",
35+
preferred=True,
36+
)
3337

3438
variant("shared", default=False, description="build shared libs")
3539

@@ -102,7 +106,6 @@ class Viskores(CMakePackage, CudaPackage, ROCmPackage):
102106
# not overwritten.
103107
conflicts("+rocm", when="+cuda")
104108
conflicts("+rocm", when="~kokkos", msg="Viskores does not support HIP without Kokkos")
105-
conflicts("+rocm", when="+virtuals", msg="Viskores does not support virtual functions with ROCm")
106109

107110
# Viskores uses the Kokkos SYCL backend.
108111
# If Kokkos provides multiple backends, the SYCL backend may or
@@ -151,7 +154,6 @@ def cmake_args(self):
151154
self.define_from_variant("Viskores_ENABLE_TBB", "tbb"),
152155
self.define_from_variant("Viskores_ENABLE_TESTING_LIBRARY", "testlib"),
153156
self.define_from_variant("Viskores_INSTALL_EXAMPLES", "examples"),
154-
self.define_from_variant("Viskores_NO_DEPRECATED_VIRTUAL", "virtuals"),
155157
self.define_from_variant("Viskores_USE_64BIT_IDS", "64bitids"),
156158
self.define_from_variant("Viskores_USE_DOUBLE_PRECISION", "doubleprecision"),
157159
self.define(

0 commit comments

Comments
 (0)