Merge b3fbfac into c254020

LLNL · Nov 16, 2020 · 29b4427 · 29b4427
2 parents c254020 + b3fbfac
commit 29b4427
Show file tree

Hide file tree

Showing 33 changed files with 3,204 additions and 601 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,16 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ## Unreleased
 
+### Changed
+
+#### General 
+- Conduit now requires C++11 support.
+
 ### Added
 
 #### General 
 - Added a builtin sandboxed version of fmt. The namespace and directory paths were changed to `conduit_fmt` to avoid potential symbol collisions with other codes using fmt.
+- Added support for using C++11 initializer lists to set Node and DataArray values from numeric arrays. This is conditional on C++11 support. See C++ tutorial docs (https://llnl-conduit.readthedocs.io/en/latest/tutorial_cpp_numeric.html#c-11-initializer-lists) for more details.
 
 
 ## [0.6.0] - Released 2020-11-02

diff --git a/src/cmake/CMakeBasics.cmake b/src/cmake/CMakeBasics.cmake
@@ -51,12 +51,11 @@ if(WIN32 AND BUILD_SHARED_LIBS)
 endif()
 
 if( BLT_CXX_STD STREQUAL "c++98" )
-    message(STATUS "C++11 support disabled")
-    message(STATUS "NOTE: C++98 support is deprecated and C++11"
-                   " will be required in a future release.")
+    message(FATAL_ERROR "Conduit now requires C++11 support."
+                        "\nPlease set BLT_CXX_STD to c++11 or newer.")
 else()
-    set(CONDUIT_USE_CXX11 1)
-    message(STATUS "C++11 support enabled (CONDUIT_USE_CXX11 == 1)")
+    set(CONDUIT_USE_CXX11 TRUE)
+    message(STATUS "C++11 support enabled (CONDUIT_USE_CXX11 == TRUE)")
 endif()
 
 ################################

diff --git a/src/config/ConduitConfig.cmake.in b/src/config/ConduitConfig.cmake.in
@@ -27,7 +27,9 @@ if(NOT CONDUIT_FOUND)
     endif()
 
     set(CONDUIT_VERSION "@PROJECT_VERSION@")
+    set(CONDUIT_USE_CXX11 "@CONDUIT_USE_CXX11@")
     set(CONDUIT_INSTALL_PREFIX "@CONDUIT_INSTALL_PREFIX@")
+    set(CONDUIT_PYTHON_MODULE_DIR "@CONDUIT_INSTALL_PYTHON_MODULE_DIR@")
     set(CONDUIT_HDF5_DIR  "@HDF5_DIR@")
     set(CONDUIT_ADIOS_DIR "@ADIOS_DIR@")
     set(CONDUIT_SILO_DIR "@SILO_DIR@")

diff --git a/src/config/conduit_config.mk.in b/src/config/conduit_config.mk.in
@@ -21,6 +21,8 @@ CONDUIT_DIR = @CONDUIT_INSTALL_PREFIX@
 
 CONDUIT_EXTRA_LIB_FLAGS = @CONDUIT_MAKE_EXTRA_LIBS@
 
+CONDUIT_USE_CXX11 = @CONDUIT_USE_CXX11@
+
 CONDUIT_SILO_DIR  = @SILO_DIR@
 CONDUIT_ADIOS_DIR = @ADIOS_DIR@
 CONDUIT_ZFP_DIR   = @ZFP_DIR@

diff --git a/src/config/conduit_setup_targets.cmake b/src/config/conduit_setup_targets.cmake
@@ -82,6 +82,7 @@ endif()
 if(NOT Conduit_FIND_QUIETLY)
     message(STATUS "CONDUIT_VERSION             = ${CONDUIT_VERSION}")
     message(STATUS "CONDUIT_INSTALL_PREFIX      = ${CONDUIT_INSTALL_PREFIX}")
+    message(STATUS "CONDUIT_USE_CXX11           = ${CONDUIT_USE_CXX11}")
     message(STATUS "CONDUIT_INCLUDE_DIRS        = ${CONDUIT_INCLUDE_DIRS}")
     message(STATUS "CONDUIT_FORTRAN_ENABLED     = ${CONDUIT_FORTRAN_ENABLED}")
     message(STATUS "CONDUIT_PYTHON_ENABLED      = ${CONDUIT_PYTHON_ENABLED}")

diff --git a/src/docs/sphinx/t_conduit_docs_blueprint_demos_out.txt b/src/docs/sphinx/t_conduit_docs_blueprint_demos_out.txt
@@ -31,7 +31,7 @@ fields:
 END_EXAMPLE("blueprint_demo_basic_uniform")
 [/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
  Testing Basic Example 'uniform'
-[       OK ] conduit_docs.blueprint_demo_basic_uniform (10 ms)
+[       OK ] conduit_docs.blueprint_demo_basic_uniform (18 ms)
 [ RUN      ] conduit_docs.blueprint_demo_basic_rectilinear
 BEGIN_EXAMPLE("blueprint_demo_basic_rectilinear")
 
@@ -55,7 +55,7 @@ fields:
 END_EXAMPLE("blueprint_demo_basic_rectilinear")
 [/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
  Testing Basic Example 'rectilinear'
-[       OK ] conduit_docs.blueprint_demo_basic_rectilinear (6 ms)
+[       OK ] conduit_docs.blueprint_demo_basic_rectilinear (8 ms)
 [ RUN      ] conduit_docs.blueprint_demo_basic_structured
 BEGIN_EXAMPLE("blueprint_demo_basic_structured")
 
@@ -83,7 +83,7 @@ fields:
 END_EXAMPLE("blueprint_demo_basic_structured")
 [/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
  Testing Basic Example 'structured'
-[       OK ] conduit_docs.blueprint_demo_basic_structured (8 ms)
+[       OK ] conduit_docs.blueprint_demo_basic_structured (11 ms)
 [ RUN      ] conduit_docs.blueprint_demo_basic_tris
 BEGIN_EXAMPLE("blueprint_demo_basic_tris")
 
@@ -110,7 +110,7 @@ fields:
 END_EXAMPLE("blueprint_demo_basic_tris")
 [/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
  Testing Basic Example 'tris'
-[       OK ] conduit_docs.blueprint_demo_basic_tris (6 ms)
+[       OK ] conduit_docs.blueprint_demo_basic_tris (8 ms)
 [ RUN      ] conduit_docs.blueprint_demo_basic_quads
 BEGIN_EXAMPLE("blueprint_demo_basic_quads")
 
@@ -193,7 +193,7 @@ fields:
 END_EXAMPLE("blueprint_demo_basic_hexs")
 [/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
  Testing Basic Example 'hexs'
-[       OK ] conduit_docs.blueprint_demo_basic_hexs (9 ms)
+[       OK ] conduit_docs.blueprint_demo_basic_hexs (11 ms)
 [ RUN      ] conduit_docs.blueprint_demo_basic_polygons
 BEGIN_EXAMPLE("blueprint_demo_basic_polygons")
 
@@ -222,7 +222,7 @@ fields:
 END_EXAMPLE("blueprint_demo_basic_polygons")
 [/Users/harrison37/Work/github/llnl/conduit/src/tests/docs/t_conduit_docs_blueprint_demos.cpp : 67]
  Testing Basic Example 'polygons'
-[       OK ] conduit_docs.blueprint_demo_basic_polygons (8 ms)
+[       OK ] conduit_docs.blueprint_demo_basic_polygons (10 ms)
 [ RUN      ] conduit_docs.blueprint_demo_basic_polyhedra
 BEGIN_EXAMPLE("blueprint_demo_basic_polyhedra")
 
@@ -288,9 +288,9 @@ fields:
     values: [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0]
 
 END_EXAMPLE("blueprint_demo_basic_uniform_complete")
-[       OK ] conduit_docs.blueprint_demo_basic_uniform_complete (6 ms)
-[----------] 10 tests from conduit_docs (80 ms total)
+[       OK ] conduit_docs.blueprint_demo_basic_uniform_complete (8 ms)
+[----------] 10 tests from conduit_docs (102 ms total)
 
 [----------] Global test environment tear-down
-[==========] 10 tests from 1 test suite ran. (80 ms total)
+[==========] 10 tests from 1 test suite ran. (102 ms total)
 [  PASSED  ] 10 tests.
diff --git a/src/docs/sphinx/t_conduit_docs_blueprint_examples_out.txt b/src/docs/sphinx/t_conduit_docs_blueprint_examples_out.txt
@@ -29,15 +29,15 @@ z: [3.0, 3.0, 3.0, 3.0, 3.0]
 
 
 mem_spaces: 
-  0x7f8890700210: 
+  0x7fb50a8001e0: 
     path: "x"
     type: "allocated"
     bytes: 40
-  0x7f8890700310: 
+  0x7fb50a8002e0: 
     path: "y"
     type: "allocated"
     bytes: 40
-  0x7f8890700470: 
+  0x7fb50a800440: 
     path: "z"
     type: "allocated"
     bytes: 40
@@ -79,7 +79,7 @@ transformed to 'interleaved' mcarray
 }
 
 mem_spaces: 
-  0x7f8890702090: 
+  0x7fb509405db0: 
     path: ""
     type: "allocated"
     bytes: 120
@@ -90,8 +90,8 @@ total_strided_bytes: 312
 
 END_EXAMPLE("blueprint_example_2")
 [       OK ] conduit_docs.blueprint_example_2 (0 ms)
-[----------] 2 tests from conduit_docs (3 ms total)
+[----------] 2 tests from conduit_docs (4 ms total)
 
 [----------] Global test environment tear-down
-[==========] 2 tests from 1 test suite ran. (3 ms total)
+[==========] 2 tests from 1 test suite ran. (4 ms total)
 [  PASSED  ] 2 tests.
diff --git a/src/docs/sphinx/t_conduit_docs_relay_io_generic_examples_out.txt b/src/docs/sphinx/t_conduit_docs_relay_io_generic_examples_out.txt
@@ -41,7 +41,7 @@ a:
     my_string: "value"
 
 END_EXAMPLE("relay_io_example_1_hdf5")
-[       OK ] conduit_docs.relay_io_example_1_hdf5 (4 ms)
+[       OK ] conduit_docs.relay_io_example_1_hdf5 (33 ms)
 [ RUN      ] conduit_docs.relay_io_example_2_hdf5
 BEGIN_EXAMPLE("relay_io_example_2_hdf5")
 
@@ -113,7 +113,7 @@ Load result from 'path/to'
 my_data: 1.0
 
 END_EXAMPLE("relay_io_example_4_hdf5")
-[       OK ] conduit_docs.relay_io_example_4_hdf5 (1 ms)
+[       OK ] conduit_docs.relay_io_example_4_hdf5 (2 ms)
 [ RUN      ] conduit_docs.relay_io_example_5_hdf5
 BEGIN_EXAMPLE("relay_io_example_5_hdf5")
 
@@ -130,8 +130,8 @@ path:
 
 END_EXAMPLE("relay_io_example_5_hdf5")
 [       OK ] conduit_docs.relay_io_example_5_hdf5 (1 ms)
-[----------] 6 tests from conduit_docs (12 ms total)
+[----------] 6 tests from conduit_docs (42 ms total)
 
 [----------] Global test environment tear-down
-[==========] 6 tests from 1 test suite ran. (12 ms total)
+[==========] 6 tests from 1 test suite ran. (43 ms total)
 [  PASSED  ] 6 tests.
diff --git a/src/docs/sphinx/t_conduit_docs_relay_io_handle_examples_out.txt b/src/docs/sphinx/t_conduit_docs_relay_io_handle_examples_out.txt
@@ -33,7 +33,7 @@ a:
   c: 42.0
 
 END_EXAMPLE("relay_io_handle_example_1")
-[       OK ] conduit_docs.relay_io_handle_1 (6 ms)
+[       OK ] conduit_docs.relay_io_handle_1 (9 ms)
 [ RUN      ] conduit_docs.relay_io_handle_sidre_1
 BEGIN_EXAMPLE("relay_io_handle_example_sidre_1")
 
@@ -53,7 +53,7 @@ my_arrays:
   b_v2: [2.0, 2.0, 2.0]
 
 END_EXAMPLE("relay_io_handle_example_sidre_1")
-[       OK ] conduit_docs.relay_io_handle_sidre_1 (6 ms)
+[       OK ] conduit_docs.relay_io_handle_sidre_1 (9 ms)
 [ RUN      ] conduit_docs.relay_io_handle_sidre_2
 BEGIN_EXAMPLE("relay_io_handle_example_sidre_2")
 
@@ -159,9 +159,9 @@ fields:
     values: [1, 1, 1, 1]
 
 END_EXAMPLE("relay_io_handle_example_sidre_2")
-[       OK ] conduit_docs.relay_io_handle_sidre_2 (14 ms)
-[----------] 3 tests from conduit_docs (26 ms total)
+[       OK ] conduit_docs.relay_io_handle_sidre_2 (20 ms)
+[----------] 3 tests from conduit_docs (38 ms total)
 
 [----------] Global test environment tear-down
-[==========] 3 tests from 1 test suite ran. (26 ms total)
+[==========] 3 tests from 1 test suite ran. (38 ms total)
 [  PASSED  ] 3 tests.
diff --git a/src/docs/sphinx/t_conduit_docs_relay_io_hdf5_examples_out.txt b/src/docs/sphinx/t_conduit_docs_relay_io_hdf5_examples_out.txt
@@ -34,7 +34,7 @@ a:
 
 File 'myoutput.hdf5' is a hdf5 file
 END_EXAMPLE("relay_io_example_hdf5_interface_1")
-[       OK ] conduit_docs.relay_io_example_hdf5_interface_1 (5 ms)
+[       OK ] conduit_docs.relay_io_example_hdf5_interface_1 (6 ms)
 [ RUN      ] conduit_docs.relay_io_example_hdf5_interface_2
 BEGIN_EXAMPLE("relay_io_example_hdf5_interface_opts")
 
@@ -81,9 +81,9 @@ chunking:
 
 saving data to 'myoutput_chunked.hdf5' 
 END_EXAMPLE("relay_io_example_hdf5_interface_opts")
-[       OK ] conduit_docs.relay_io_example_hdf5_interface_2 (2 ms)
-[----------] 2 tests from conduit_docs (7 ms total)
+[       OK ] conduit_docs.relay_io_example_hdf5_interface_2 (6 ms)
+[----------] 2 tests from conduit_docs (12 ms total)
 
 [----------] Global test environment tear-down
-[==========] 2 tests from 1 test suite ran. (7 ms total)
+[==========] 2 tests from 1 test suite ran. (12 ms total)
 [  PASSED  ] 2 tests.
diff --git a/src/docs/sphinx/t_conduit_docs_tutorial_basics_out.txt b/src/docs/sphinx/t_conduit_docs_tutorial_basics_out.txt
@@ -8,7 +8,7 @@ BEGIN_EXAMPLE("basics_very_basic")
 my: "data"
 
 END_EXAMPLE("basics_very_basic")
-[       OK ] conduit_tutorial.basics_very_basic (0 ms)
+[       OK ] conduit_tutorial.basics_very_basic (3 ms)
 [ RUN      ] conduit_tutorial.basics_hierarchial
 BEGIN_EXAMPLE("basics_hierarchial")
 
@@ -20,7 +20,7 @@ a:
 
 total bytes: 15
 END_EXAMPLE("basics_hierarchial")
-[       OK ] conduit_tutorial.basics_hierarchial (0 ms)
+[       OK ] conduit_tutorial.basics_hierarchial (1 ms)
 [ RUN      ] conduit_tutorial.basics_object_and_list
 BEGIN_EXAMPLE("basics_object_and_list")
 
@@ -61,20 +61,20 @@ val3: 3.1415
 3
 4
 END_EXAMPLE("basics_object_and_list_itr")
-[       OK ] conduit_tutorial.basics_object_and_list_itr (0 ms)
+[       OK ] conduit_tutorial.basics_object_and_list_itr (1 ms)
 [ RUN      ] conduit_tutorial.basics_mem_spaces
 BEGIN_EXAMPLE("basics_mem_spaces")
 
 mem_spaces: 
-  0x7fa4e4c05e80: 
+  0x7f7fee4006a0: 
     path: "my"
     type: "allocated"
     bytes: 5
-  0x7fa4e4c05840: 
+  0x7f7fee401bc0: 
     path: "a/b/c"
     type: "allocated"
     bytes: 2
-  0x7fa4e4c05830: 
+  0x7f7fee401bb0: 
     path: "a/b/e"
     type: "allocated"
     bytes: 8
@@ -103,7 +103,7 @@ test: 100
 , "value": 100}
 }
 END_EXAMPLE("basics_bw_style")
-[       OK ] conduit_tutorial.basics_bw_style (0 ms)
+[       OK ] conduit_tutorial.basics_bw_style (1 ms)
 [ RUN      ] conduit_tutorial.basics_bw_style_from_native
 BEGIN_EXAMPLE("basics_bw_style_from_native")
 
@@ -185,7 +185,7 @@ my:
 
 
 file: /Users/harrison37/Work/github/llnl/conduit/src/libs/conduit/conduit_node.cpp
-line: 12179
+line: 12913
 message: 
 Cannot fetch non-existent child "data" from Node(my/important)
 
@@ -200,9 +200,9 @@ my:
             data: 42.0
 
 END_EXAMPLE("basics_const_vs_non_const")
-[       OK ] conduit_tutorial.basics_const_vs_non_const (0 ms)
-[----------] 10 tests from conduit_tutorial (1 ms total)
+[       OK ] conduit_tutorial.basics_const_vs_non_const (1 ms)
+[----------] 10 tests from conduit_tutorial (8 ms total)
 
 [----------] Global test environment tear-down
-[==========] 10 tests from 1 test suite ran. (1 ms total)
+[==========] 10 tests from 1 test suite ran. (8 ms total)
 [  PASSED  ] 10 tests.
diff --git a/src/docs/sphinx/t_conduit_docs_tutorial_errors_out.txt b/src/docs/sphinx/t_conduit_docs_tutorial_errors_out.txt
@@ -16,9 +16,9 @@ BEGIN_EXAMPLE("error_handlers_rewire")
 END_EXAMPLE("error_handlers_rewire")
 BEGIN_EXAMPLE("error_handlers_reset")
 END_EXAMPLE("error_handlers_reset")
-[       OK ] conduit_tutorial.error_handlers (0 ms)
-[----------] 3 tests from conduit_tutorial (0 ms total)
+[       OK ] conduit_tutorial.error_handlers (1 ms)
+[----------] 3 tests from conduit_tutorial (1 ms total)
 
 [----------] Global test environment tear-down
-[==========] 3 tests from 1 test suite ran. (0 ms total)
+[==========] 3 tests from 1 test suite ran. (1 ms total)
 [  PASSED  ] 3 tests.
diff --git a/src/docs/sphinx/t_conduit_docs_tutorial_numeric_out.txt b/src/docs/sphinx/t_conduit_docs_tutorial_numeric_out.txt
@@ -1,7 +1,7 @@
 Running main() from /Users/harrison37/Work/github/llnl/conduit/src/blt/thirdparty_builtin/googletest-master-2020-01-07/googletest/src/gtest_main.cc
-[==========] Running 8 tests from 1 test suite.
+[==========] Running 9 tests from 1 test suite.
 [----------] Global test environment set-up.
-[----------] 8 tests from conduit_tutorial
+[----------] 9 tests from conduit_tutorial
 [ RUN      ] conduit_tutorial.numeric_as_dtype
 BEGIN_EXAMPLE("numeric_as_dtype")
 100
@@ -11,7 +11,7 @@ END_EXAMPLE("numeric_as_dtype")
 BEGIN_EXAMPLE("numeric_via_value")
 100
 END_EXAMPLE("numeric_via_value")
-[       OK ] conduit_tutorial.numeric_via_value (0 ms)
+[       OK ] conduit_tutorial.numeric_via_value (1 ms)
 [ RUN      ] conduit_tutorial.numeric_ptr_as_dtype
 BEGIN_EXAMPLE("numeric_ptr_as_dtype")
 my_vals[0] = 100
@@ -57,8 +57,16 @@ vals[3] = 4000
 [ RUN      ] conduit_tutorial.numeric_double_conversion_end
 END_EXAMPLE("numeric_double_conversion")
 [       OK ] conduit_tutorial.numeric_double_conversion_end (0 ms)
-[----------] 8 tests from conduit_tutorial (1 ms total)
+[ RUN      ] conduit_tutorial.numeric_cxx11_init
+BEGIN_EXAMPLE("numeric_cxx11_init")
+[100, 200, 300]
+[100, 200, 300]
+[1.0, 2.0, 3.0]
+[1.0, 2.0, 3.0]
+END_EXAMPLE("numeric_cxx11_init")
+[       OK ] conduit_tutorial.numeric_cxx11_init (0 ms)
+[----------] 9 tests from conduit_tutorial (2 ms total)
 
 [----------] Global test environment tear-down
-[==========] 8 tests from 1 test suite ran. (1 ms total)
-[  PASSED  ] 8 tests.
+[==========] 9 tests from 1 test suite ran. (2 ms total)
+[  PASSED  ] 9 tests.