2020 12 update vtkm (#194)

* merge camp's changes

* suppress deprecation warning

* suppress deprecation warning

* 2021 01 update vtkm update contour tree (#192)

* Fixed a bug in the Contour tree code.

* Added the contour tree test app to the cmake test list.

Co-authored-by: David Camp <dcamp@tracy.lbl.gov>

* remove include

* fix deprecation warnings

* update vtkm hash

* dash vs non dash drama

* add path for scaling bounding box annotations

* python 3 fix

* enable tests (change needed b/c of new spack pkg)

* bring vim along for the ride

* dont break things due to vim

* fixing type list

* try j 2

* restore option to enable or disable contour tree

* adding correct ifdefs and compile flags

Co-authored-by: David-Camp <57725641+David-Camp@users.noreply.github.com>
Co-authored-by: David Camp <dcamp@tracy.lbl.gov>
Co-authored-by: Cyrus Harrison <cyrush@llnl.gov>

hashes.txt

@@ -1,2 +1,2 @@
 blt  branch='develop' commit='86a7d6b5ee93d8b7b3233a3e54a4f06f8d8308d3'
-vtkm branch='master' commit='a3b8525ef97d94996ae843db0dd4f675c38e8b1e'
+vtkm branch='master' commit='bbba2a1967b271cc393abd043716d957bca97972'

package.py

@@ -69,7 +69,7 @@ def create_package(output_file,version):
     if not version is None:
         cmd += "-" + version
     cmd +=  " " + output_file
-    print "[exe: %s]" % cmd
+    print("[exe: {0}]".format(cmd))
     subprocess.call(cmd,shell=True)
 
 

scripts/uberenv/packages/uberenv-vtkh/package.py → scripts/uberenv/packages/uberenv-vtk-h/package.py

@@ -49,11 +49,10 @@
 import platform
 from os.path import join as pjoin
 
-#import importlib
-#vtkh = importlib.import_module("vtk-h")
-from .vtkh import Vtkh
 
-class UberenvVtkh(Vtkh):
+from spack.pkg.builtin.vtk_h import VtkH
+
+class UberenvVtkH(VtkH):
     """Spack Based Uberenv Build for VTK-h Thirdparty Libs """
 
     homepage = "http://github.com/alpine-DAV/vtk-h"
@@ -68,7 +67,7 @@ class UberenvVtkh(Vtkh):
 
     def url_for_version(self, version):
         dummy_tar_path =  os.path.abspath(pjoin(os.path.split(__file__)[0]))
-        dummy_tar_path = pjoin(dummy_tar_path,"uberenv-vtkh.tar.gz")
+        dummy_tar_path = pjoin(dummy_tar_path,"uberenv-vtk-h.tar.gz")
         url      = "file://" + dummy_tar_path
         return url