From a0458f4add8f9405dfc528f88d8b77445ac2488b Mon Sep 17 00:00:00 2001 From: Nicole Marsaglia Date: Fri, 2 Aug 2024 23:52:40 +0000 Subject: [PATCH] Revert "addRanks vtkh filter" This reverts commit 0353a74b54df489309bfb63e24c25f67769b2b3f. --- .../flow_filters/ascent_runtime_filters.cpp | 2 - .../ascent_runtime_vtkh_filters.cpp | 108 ------------ .../ascent_runtime_vtkh_filters.hpp | 28 ---- .../tout_mpi_add_ranks100.png | Bin 397491 -> 0 bytes src/tests/ascent/CMakeLists.txt | 1 - src/tests/ascent/t_ascent_mpi_add_ranks.cpp | 155 ------------------ 6 files changed, 294 deletions(-) delete mode 100644 src/tests/_baseline_images/tout_mpi_add_ranks100.png delete mode 100644 src/tests/ascent/t_ascent_mpi_add_ranks.cpp diff --git a/src/libs/ascent/runtimes/flow_filters/ascent_runtime_filters.cpp b/src/libs/ascent/runtimes/flow_filters/ascent_runtime_filters.cpp index 443a3492b..559eca002 100644 --- a/src/libs/ascent/runtimes/flow_filters/ascent_runtime_filters.cpp +++ b/src/libs/ascent/runtimes/flow_filters/ascent_runtime_filters.cpp @@ -110,8 +110,6 @@ register_builtin() AscentRuntime::register_filter_type(); AscentRuntime::register_filter_type(); // transforms, the current crop expect vtk-h input data - //AscentRuntime::register_filter_type("transforms","add_domain_ids"); - AscentRuntime::register_filter_type("transforms","add_mpi_ranks"); AscentRuntime::register_filter_type("transforms","clip"); AscentRuntime::register_filter_type("transforms","clip_with_field"); AscentRuntime::register_filter_type("transforms","clean_grid"); 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..d50a5ce88 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 @@ -1187,114 +1187,6 @@ VTKHGhostStripper::execute() } } -//----------------------------------------------------------------------------- -VTKHAddRanks::VTKHAddRanks() -:Filter() -{ -// empty -} - -//----------------------------------------------------------------------------- -VTKHAddRanks::~VTKHAddRanks() -{ -// empty -} - -//----------------------------------------------------------------------------- -void -VTKHAddRanks::declare_interface(Node &i) -{ - i["type_name"] = "vtkh_add_mpi_ranks"; - i["port_names"].append() = "in"; - i["output_port"] = "true"; -} - -//----------------------------------------------------------------------------- -bool -VTKHAddRanks::verify_params(const conduit::Node ¶ms, - conduit::Node &info) -{ - info.reset(); - - bool res = check_string("topology",params, info, false); - res = check_string("output",params, info, false); - - std::vector valid_paths; - valid_paths.push_back("output"); - valid_paths.push_back("topology"); - std::string surprises = surprise_check(valid_paths, params); - - if(surprises != "") - { - res = false; - info["errors"].append() = surprises; - } - - return res; -} - -//----------------------------------------------------------------------------- -void -VTKHAddRanks::execute() -{ - - if(!input(0).check_type()) - { - ASCENT_ERROR("VTKHAddRanks input must be a data object"); - } - - DataObject *data_object = input(0); - if(!data_object->is_valid()) - { - set_output(data_object); - return; - } - - int rank = 0; -#ifdef ASCENT_MPI_ENABLED - MPI_Comm mpi_comm = MPI_Comm_f2c(Workspace::default_mpi_comm()); - MPI_Comm_rank(mpi_comm, &rank); -#endif - - std::shared_ptr collection = data_object->as_vtkh_collection(); - - std::string output_field = "mpi_rank"; - if(params().has_child("output")) - { - output_field = params()["output"].as_string(); - } - - std::string topo_name = ""; - if(params().has_child("topology")) - { - topo_name = params()["topology"].as_string(); - } - else - { - bool throw_error = false; - topo_name = detail::resolve_topology(params(), - this->name(), - collection, - throw_error); - std::cerr << "topo_name: " << topo_name << std::endl; - if(topo_name == "") - { - // this creates a data object with an invalid source - set_output(new DataObject()); - return; - } - } - - vtkh::DataSet &data = collection->dataset_by_topology(topo_name); - VTKHCollection *new_coll = collection->copy_without_topology(topo_name); - data.AddConstantPointField(rank,output_field); - new_coll->add(data, topo_name); - - // re wrap in data object - DataObject *res = new DataObject(new_coll); - set_output(res); -} - //----------------------------------------------------------------------------- VTKHThreshold::VTKHThreshold() :Filter() 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..77b4a8e21 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 @@ -133,34 +133,6 @@ class ASCENT_API VTKHGhostStripper: public ::flow::Filter virtual void execute(); }; -//----------------------------------------------------------------------------- -class ASCENT_API VTKHAddRanks : public ::flow::Filter -{ -public: - VTKHAddRanks(); - virtual ~VTKHAddRanks(); - - virtual void declare_interface(conduit::Node &i); - virtual bool verify_params(const conduit::Node ¶ms, - conduit::Node &info); - virtual void execute(); -}; - -//----------------------------------------------------------------------------- -class ASCENT_API VTKHAddDomains : public ::flow::Filter -{ -public: - VTKHAddDomains(); - virtual ~VTKHAddDomains(); - - virtual void declare_interface(conduit::Node &i); - virtual bool verify_params(const conduit::Node ¶ms, - conduit::Node &info); - virtual void execute(); -}; - - - //----------------------------------------------------------------------------- class ASCENT_API VTKHClip: public ::flow::Filter { diff --git a/src/tests/_baseline_images/tout_mpi_add_ranks100.png b/src/tests/_baseline_images/tout_mpi_add_ranks100.png deleted file mode 100644 index 697193a9e280d3bd526688134e794ffca455eb0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397491 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 diff --git a/src/tests/ascent/CMakeLists.txt b/src/tests/ascent/CMakeLists.txt index 35ca8d588..c862dca96 100644 --- a/src/tests/ascent/CMakeLists.txt +++ b/src/tests/ascent/CMakeLists.txt @@ -99,7 +99,6 @@ 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_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 deleted file mode 100644 index 55c665e0f..000000000 --- a/src/tests/ascent/t_ascent_mpi_add_ranks.cpp +++ /dev/null @@ -1,155 +0,0 @@ -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// -// Copyright (c) Lawrence Livermore National Security, LLC and other Ascent -// Project developers. See top-level LICENSE AND COPYRIGHT files for dates and -// other details. No copyright assignment is required to contribute to Ascent. -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// - -//----------------------------------------------------------------------------- -/// -/// file: t_ascent_mpi_add_ranks.cpp -/// -//----------------------------------------------------------------------------- - - -#include "gtest/gtest.h" - -#include - -#include -#include -#include - -#include -#include - -#include "t_config.hpp" -#include "t_utils.hpp" - - - - -using namespace std; -using namespace conduit; -using namespace ascent; - - -int NUM_DOMAINS = 8; - -//----------------------------------------------------------------------------- -TEST(ascent_mpi_add_mpi_ranks_2d, test_mpi_add_mpi_ranks_2d) -{ - // - //Set Up MPI - // - int par_rank; - int par_size; - MPI_Comm comm = MPI_COMM_WORLD; - MPI_Comm_rank(comm, &par_rank); - MPI_Comm_size(comm, &par_size); - - Node n; - ascent::about(n); - // only run this test if ascent was built with vtkm support - if(n["runtimes/ascent/vtkm/status"].as_string() == "disabled") - { - ASCENT_INFO("Ascent vtkm support disabled, skipping test"); - return; - } - - // - // Create an example mesh. - // - Node data, verify_info; - conduit::blueprint::mpi::mesh::examples::spiral_round_robin(NUM_DOMAINS,data,comm); - - EXPECT_TRUE(conduit::blueprint::mesh::verify(data,verify_info)); -// data["state/cycle"] = 100; -// data.print(); - - ASCENT_INFO("Testing adding mpi ranks to conduit::blueprint spiral input\n"); - - - string output_path = prepare_output_dir(); - string output_file = conduit::utils::join_file_path(output_path,"tout_mpi_add_ranks"); - string image_file = conduit::utils::join_file_path(output_path,"tout_mpi_add_ranks10"); - - // remove old images before rendering - if(par_rank == 0) - remove_test_image(output_file); - - // - // Create the actions. - // - - conduit::Node pipelines; - // pipeline 1 - pipelines["pl1/f1/type"] = "add_mpi_ranks"; - conduit::Node ¶ms = pipelines["pl1/f1/params"]; - params["topology"] = "topo"; - params["output"] = "ranks"; - - conduit::Node scenes; - scenes["s1/plots/p1/type"] = "pseudocolor"; - scenes["s1/plots/p1/field"] = "ranks"; - scenes["s1/plots/p1/pipeline"] = "pl1"; - scenes["s1/plots/p1/color_table/discrete"] = "true"; - - scenes["s1/image_prefix"] = image_file; - - conduit::Node actions; - // add the pipeline - conduit::Node &add_pipelines = actions.append(); - add_pipelines["action"] = "add_pipelines"; - add_pipelines["pipelines"] = pipelines; - // add the scenes - conduit::Node &add_scenes= actions.append(); - add_scenes["action"] = "add_scenes"; - add_scenes["scenes"] = scenes; - -// conduit::Node extracts; -// -// extracts["e1/type"] = "relay"; -// extracts["e1/params/path"] = output_file; -// extracts["e1/params/protocol"] = "blueprint/mesh/hdf5"; -// conduit::Node &add_ext= actions.append(); -// add_ext["action"] = "add_extracts"; -// add_ext["extracts"] = extracts; - - // - // Run Ascent - // - - Ascent ascent; - - Node ascent_opts; - ascent_opts["runtime/type"] = "ascent"; - ascent_opts["mpi_comm"] = MPI_Comm_c2f(comm); - ascent_opts["exceptions"] = "forward"; - ascent.open(ascent_opts); - ascent.publish(data); - ascent.execute(actions); - ascent.close(); - - // check that we created an image - if(par_rank == 0) - { - EXPECT_TRUE(check_test_image(output_file)); - std::string msg = "An example of adding mpi ranks to the data."; - ASCENT_ACTIONS_DUMP(actions,output_file,msg); - } -} - -//----------------------------------------------------------------------------- -int main(int argc, char* argv[]) -{ - int result = 0; - - ::testing::InitGoogleTest(&argc, argv); - MPI_Init(&argc, &argv); - - result = RUN_ALL_TESTS(); - MPI_Finalize(); - return result; -} - -