Implement all suggestions

Alpine-DAV · Oct 31, 2023 · da425ea · da425ea
1 parent 714336b
commit da425ea
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/src/libs/ascent/ascent.cpp b/src/libs/ascent/ascent.cpp
@@ -858,6 +858,10 @@ about(conduit::Node &n)
 
 }
 
+// Callback maps
+static std::map<std::string, void (*)(conduit::Node &, conduit::Node &)> m_void_callback_map;
+static std::map<std::string, bool (*)(void)> m_bool_callback_map;
+
 //-----------------------------------------------------------------------------
 void
 register_callback(const std::string &callback_name,

diff --git a/src/libs/ascent/ascent.hpp b/src/libs/ascent/ascent.hpp
@@ -66,10 +66,6 @@ class ASCENT_API Ascent
     conduit::Node  m_info;
 };
 
-// Callback maps
-static std::map<std::string, void (*)(conduit::Node &, conduit::Node &)> m_void_callback_map;
-static std::map<std::string, bool (*)(void)> m_bool_callback_map;
-
 //-----------------------------------------------------------------------------
 std::string ASCENT_API about();
 

diff --git a/src/libs/ascent/python/ascent_module/py_src/mpi/ascent_mpi.py b/src/libs/ascent/python/ascent_module/py_src/mpi/ascent_mpi.py
@@ -21,31 +21,31 @@ def about():
         from .ascent_mpi_python import about as ascent_about
         return ascent_about()
     except ImportError:
-        raise ImportError('failed to import ascent_mpi_python, was Ascent built with mpi support?')
+        raise ImportError('failed to import ascent_mpi_python, was Ascent built with MPI support ENABLE_MPI=ON ?')
     return None
 
 def execute_callback(callback_name, params, output):
     try:
         from .ascent_mpi_python import execute_callback as ascent_execute_callback
         return ascent_execute_callback(callback_name, params, output)
     except ImportError:
-        raise ImportError('failed to import ascent_mpi_python, was Ascent built with serial support ENABLE_SERIAL=ON ?')
+        raise ImportError('failed to import ascent_mpi_python, was Ascent built with MPI support ENABLE_MPI=ON ?')
     return None
 
 def Ascent():
     try:
         from .ascent_mpi_python import Ascent as ascent_obj
         return ascent_obj()
     except ImportError:
-        raise ImportError('failed to import ascent_mpi_python, was Ascent built with mpi support?')
+        raise ImportError('failed to import ascent_mpi_python, was Ascent built with MPI support ENABLE_MPI=ON ?')
     return None
 
 def jupyter_bridge():
     try:
         from ..bridge_kernel.server import jupyter_extract
         return jupyter_extract()
     except ImportError:
-        raise ImportError('failed to import ascent_mpi_python, was Ascent built with mpi support?')
+        raise ImportError('failed to import ascent_mpi_python, was Ascent built with MPI support ENABLE_MPI=ON ?')
     return None
 
 

diff --git a/src/tests/ascent/t_ascent_commands.cpp b/src/tests/ascent/t_ascent_commands.cpp
@@ -156,15 +156,6 @@ TEST(ascent_commands, direct_void_callback_invocation)
     // Register callbacks
     ascent::register_callback("void_callback_1", void_callback_1);
 
-    //
-    // Run Ascent
-    //
-    Ascent ascent;
-    Node ascent_opts;
-    // default is now ascent
-    ascent_opts["runtime/type"] = "ascent";
-    ascent.open(ascent_opts);
-
     Node params;
     Node output;
     ascent::execute_callback("void_callback_1", params, output);
@@ -189,12 +180,6 @@ TEST(ascent_commands, direct_void_callback_invocation)
         has_output = output["param_was_passed"].to_uint8();
     }
     EXPECT_TRUE(has_output);
-
-    Node actions;
-    std::string msg = "An example of invoking void callbacks directly";
-    ASCENT_ACTIONS_DUMP(actions, std::string("direct_void_callback_invocation"), msg);
-
-    ascent.close();
 }
 
 //-----------------------------------------------------------------------------