vtk-m: change smoke test (#29113)

var/spack/repos/builtin/packages/vtk-m/package.py

@@ -5,7 +5,6 @@
 
 
 import os
-import shutil
 import sys
 
 from spack.package import *
@@ -26,6 +25,8 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
     git      = "https://gitlab.kitware.com/vtk/vtk-m.git"
     tags     = ['e4s']
 
+    test_requires_compiler = True
+
     version('master', branch='master')
     version('release', branch='release')
     version('1.8.0-rc1', sha256="99e344c89ecb84b04cc0f0b9fdf042b9a4ae3144bb4deeca8e90f098ab8a569b")
@@ -42,6 +43,7 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
     version('1.3.0', sha256="f88c1b0a1980f695240eeed9bcccfa420cc089e631dc2917c9728a2eb906df2e")
     version('1.2.0', sha256="607272992e05f8398d196f0acdcb4af025a4a96cd4f66614c6341f31d4561763")
     version('1.1.0', sha256="78618c81ca741b1fbba0853cb5d7af12c51973b514c268fc96dfb36b853cdb18")
+
     # use release, instead of release with debug symbols b/c vtkm libs
     # can overwhelm compilers with too many symbols
     variant('build_type', default='Release', description='CMake build type',
@@ -59,6 +61,7 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
             description="enable 64 bits ids")
     variant("testlib", default=False, description="build test library")
     variant("fpic", default=False, description="build fpic support")
+    variant("examples", default=True, when='@1.8:', description="Install builtin examples")
 
     # Device variants
     # CudaPackage provides cuda variant
@@ -239,172 +242,36 @@ def cmake_args(self):
             else:
                 options.append("-DVTKm_ENABLE_TBB:BOOL=OFF")
 
+            # Install examples
+            if "+examples" in spec:
+                options.append("-DVTKm_INSTALL_EXAMPLES:BOOL=ON")
+            else:
+                options.append("-DVTKm_INSTALL_EXAMPLES:BOOL=OFF")
+
             return options
 
+    # Delegate in the vtk-m built smoke test
     def smoke_test(self):
-        print("Checking VTK-m installation...")
         spec = self.spec
-        checkdir = "spack-check"
-        with working_dir(checkdir, create=True):
-            source = r"""
-#include <vtkm/cont/Algorithm.h>
-#include <vtkm/cont/ArrayHandle.h>
-#include <vtkm/cont/Initialize.h>
 
-#include <iostream>
+        if "+examples" not in spec:
-#include <vector>
+            raise RuntimeError("Examples needed for smoke test missing",
+                               "reinstall with `+examples` variant")
 
-struct NoArgKernel {
+        testdir = "smoke_test_build"
-    VTKM_EXEC void operator()(vtkm::Id) const {}
+        with working_dir(testdir, create=True):
+            cmake = Executable(spec['cmake'].prefix.bin.cmake)
+            ctest = Executable(spec['cmake'].prefix.bin.ctest)
+            cmakeExampleDir = spec['vtk-m'].prefix.share.doc.VTKm.examples.smoke_test
 
-    void SetErrorMessageBuffer(
+            cmake(*([cmakeExampleDir, "-DVTKm_ROOT=" + spec['vtk-m'].prefix]))
-        const vtkm::exec::internal::ErrorMessageBuffer &errorMessage) {
-      this->ErrorMessage = errorMessage;
-    }
-
-    vtkm::exec::internal::ErrorMessageBuffer ErrorMessage;
-};
-
-template <typename PortalType> struct FillArrayKernel {
-    using ValueType = typename PortalType::ValueType;
-
-    FillArrayKernel(const PortalType &array, ValueType fill)
-        : Array(array), FillValue(fill) {}
-
-    VTKM_EXEC void operator()(vtkm::Id index) const {
-      this->Array.Set(index, this->FillValue);
-    }
-    void SetErrorMessageBuffer(
-        const vtkm::exec::internal::ErrorMessageBuffer &) {
-    }
-
-    PortalType Array;
-    ValueType FillValue;
-};
-
-
-int main() {
-    vtkm::cont::Initialize();
-
-    constexpr vtkm::Id size = 1000000;
-#if defined(VTKM_ENABLE_KOKKOS)
-    constexpr vtkm::cont::DeviceAdapterTagKokkos desired_device;
-#elif defined(VTKM_ENABLE_CUDA)
-    constexpr vtkm::cont::DeviceAdapterTagCuda desired_device;
-#elif defined(VTKM_ENABLE_TBB)
-    constexpr vtkm::cont::DeviceAdapterTagTBB desired_device;
-#elif defined(VTKM_ENABLE_OPENMP)
-    constexpr vtkm::cont::DeviceAdapterTagOpenMP desired_device;
-#else
-    #error "No VTK-m Device Adapter enabled"
-#endif
-
-    std::cout << "-------------------------------------------\n";
-    std::cout << "Testing No Argument Kernel" << std::endl;
-    vtkm::cont::Algorithm::Schedule(desired_device, NoArgKernel(), size);
-
-    vtkm::cont::ArrayHandle<vtkm::Id> handle;
-    {
-    std::cout << "-------------------------------------------\n";
-    std::cout << "Testing Kernel + ArrayHandle PrepareForOutput" << std::endl;
-    vtkm::cont::Token token;
-    auto portal = handle.PrepareForOutput(size, desired_device, token);
-    vtkm::cont::Algorithm::Schedule(desired_device,
-        FillArrayKernel<decltype(portal)>{portal, 1}, size);
-    }
-
-    {
-    std::cout << "-------------------------------------------\n";
-    std::cout << "Testing Kernel + ArrayHandle PrepareForInPlace" << std::endl;
-    vtkm::cont::Token token;
-    auto portal = handle.PrepareForInPlace(desired_device, token);
-    vtkm::cont::Algorithm::Schedule(desired_device,
-        FillArrayKernel<decltype(portal)>{portal, 2}, size);
-    }
-
-    std::cout << "-------------------------------------------\n";
-    std::cout << "Ran tests on: " << desired_device.GetName() << std::endl;
-
-    return 0;
-}
-"""
-
-            cmakelists = r"""
-##============================================================================
-##  Copyright (c) Kitware, Inc.
-##  All rights reserved.
-##  See LICENSE.txt for details.
-##
-##  This software is distributed WITHOUT ANY WARRANTY; without even
-##  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-##  PURPOSE.  See the above copyright notice for more information.
-##============================================================================
-cmake_minimum_required(VERSION 3.12...3.18 FATAL_ERROR)
-project(VTKmSmokeTest CXX)
-
-#Find the VTK-m package
-find_package(VTKm REQUIRED QUIET)
-
-add_executable(VTKmSmokeTest main.cxx)
-target_link_libraries(VTKmSmokeTest PRIVATE vtkm_cont)
-vtkm_add_target_information(VTKmSmokeTest
-                            DROP_UNUSED_SYMBOLS MODIFY_CUDA_FLAGS
-                            DEVICE_SOURCES main.cxx)
-"""
-
-            with open("main.cxx", 'w') as f:
-                f.write(source)
-            with open("CMakeLists.txt", 'w') as f:
-                f.write(cmakelists)
-            builddir = "build"
-            with working_dir(builddir, create=True):
-                cmake = Executable(spec['cmake'].prefix.bin + "/cmake")
-                cmakefiledir = spec['vtk-m'].prefix.lib + "/cmake"
-                cmakefiledir = cmakefiledir + "/" + os.listdir(cmakefiledir)[0]
-                cmake(*(["..", "-DVTKm_DIR=" + cmakefiledir]))
             cmake(*(["--build", "."]))
-                try:
+            ctest(*(["--verbose"]))
-                    test = Executable('./VTKmSmokeTest')
-                    output = test(output=str)
-                except ProcessError:
-                    output = ""
-                print(output)
-                if "+cuda_native" in spec:
-                    expected_device = 'Cuda'
-                elif "+kokkos" in spec:
-                    expected_device = 'Kokkos'
-                elif "+tbb" in spec:
-                    expected_device = 'TBB'
-                elif "+openmp" in spec:
-                    expected_device = 'OpenMP'
-                expected = """\
--------------------------------------------
-Testing No Argument Kernel
--------------------------------------------
-Testing Kernel + ArrayHandle PrepareForOutput
--------------------------------------------
-Testing Kernel + ArrayHandle PrepareForInPlace
--------------------------------------------
-Ran tests on: """ + expected_device + "\n"
-                success = output == expected
-                if success:
-                    print("Test success")
-                if not success:
-                    print("Produced output does not match expected output.")
-                    print("Expected output:")
-                    print('-' * 80)
-                    print(expected)
-                    print('-' * 80)
-                    print("Produced output:")
-                    print('-' * 80)
-                    print(output)
-                    print('-' * 80)
-                    raise RuntimeError("VTK-m install check failed")
-        shutil.rmtree(checkdir)
 
     @run_after('install')
     @on_package_attributes(run_tests=True)
-    def check_install(self):
+    def build_test(self):
-        spec = self.spec
+        self.smoke_test()
-        if "@master" in spec:
+
+    def test(self):
         self.smoke_test()