From 95995abfb84c84e6cd00aef8c447a70de5d1c277 Mon Sep 17 00:00:00 2001 From: Nicole Marsaglia Date: Fri, 2 Aug 2024 23:01:58 +0000 Subject: [PATCH] add ranks filter (cherry picked from commit dd72250e89f3850281d80367b22bcb66530082dc) --- .../runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp | 1 + .../runtimes/flow_filters/ascent_runtime_vtkh_filters.hpp | 1 + src/tests/ascent/CMakeLists.txt | 6 +++--- src/tests/ascent/t_ascent_mpi_add_ranks.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libs/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp b/src/libs/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp index ecf945e63..b7a8dc901 100644 --- a/src/libs/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp +++ b/src/libs/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.cpp @@ -1222,6 +1222,7 @@ VTKHAddRanks::verify_params(const conduit::Node ¶ms, std::vector valid_paths; valid_paths.push_back("output"); valid_paths.push_back("topology"); + std::string surprises = surprise_check(valid_paths, params); if(surprises != "") diff --git a/src/libs/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.hpp b/src/libs/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.hpp index 5903b6559..42521eec1 100644 --- a/src/libs/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.hpp +++ b/src/libs/ascent/runtimes/flow_filters/ascent_runtime_vtkh_filters.hpp @@ -153,6 +153,7 @@ class ASCENT_API VTKHAddDomains : public ::flow::Filter VTKHAddDomains(); virtual ~VTKHAddDomains(); + virtual void declare_interface(conduit::Node &i); virtual bool verify_params(const conduit::Node ¶ms, conduit::Node &info); diff --git a/src/tests/ascent/CMakeLists.txt b/src/tests/ascent/CMakeLists.txt index 35ca8d588..64c66f14f 100644 --- a/src/tests/ascent/CMakeLists.txt +++ b/src/tests/ascent/CMakeLists.txt @@ -69,8 +69,8 @@ set(BASIC_TESTS t_ascent_smoke t_ascent_triggers t_ascent_blueprint_reductions t_ascent_sampling - t_ascent_uniform_grid - t_ascent_mir + t_ascent_uniform_grid + t_ascent_mir t_ascent_hola) set(DEVICE_TESTS t_ascent_execution_policies @@ -99,7 +99,7 @@ set(MPI_TESTS t_ascent_mpi_smoke t_ascent_mpi_slice t_ascent_mpi_uniform_grid t_ascent_mpi_vtk_file_extract - t_ascent_mpi_add_ranks + t_ascent_mpi_add_ranks t_ascent_mpi_unique_ids) # t_ascent_hola_mpi uses 8 mpi tasks, so its added manually diff --git a/src/tests/ascent/t_ascent_mpi_add_ranks.cpp b/src/tests/ascent/t_ascent_mpi_add_ranks.cpp index 55c665e0f..ec13241e7 100644 --- a/src/tests/ascent/t_ascent_mpi_add_ranks.cpp +++ b/src/tests/ascent/t_ascent_mpi_add_ranks.cpp @@ -36,7 +36,7 @@ using namespace ascent; int NUM_DOMAINS = 8; //----------------------------------------------------------------------------- -TEST(ascent_mpi_add_mpi_ranks_2d, test_mpi_add_mpi_ranks_2d) +TEST(ascent_mpi_add_mpi_ranks, test_mpi_add_mpi_ranks) { // //Set Up MPI