Skip to content

Commit

Permalink
Merge d67794d into 76e58df
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrush committed Dec 28, 2019
2 parents 76e58df + d67794d commit 805d085
Show file tree
Hide file tree
Showing 28 changed files with 1,458 additions and 568 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
### Added

#### General
- Added Node::parse() method, (C++, Python and Fortran) which supports common json and yaml parsing use cases without creating a generator instance.
- Use FOLDER target property to group targets for Visual Studio
- Added Node load(), and save() support to the C and Fortran APIs

### Changed

#### General
- Changed Python linking strategy to defer linking for our compiler modules


### Fixed

#### General
Expand Down
76 changes: 76 additions & 0 deletions src/docs/sphinx/t_conduit_docs_python_tutorial_parse_out.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
UpdateCTestConfiguration from :/Users/harrison37/Work/github/llnl/conduit/build-debug/DartConfiguration.tcl
Parse Config file:/Users/harrison37/Work/github/llnl/conduit/build-debug/DartConfiguration.tcl
UpdateCTestConfiguration from :/Users/harrison37/Work/github/llnl/conduit/build-debug/DartConfiguration.tcl
Parse Config file:/Users/harrison37/Work/github/llnl/conduit/build-debug/DartConfiguration.tcl
Test project /Users/harrison37/Work/github/llnl/conduit/build-debug
Constructing a list of tests
Done constructing a list of tests
Updating test list for fixtures
Added 0 tests to meet fixture requirements
Checking test dependency graph...
Checking test dependency graph end
test 104
Start 104: t_conduit_docs_tutorial_python_parse

104: Test command: /Users/harrison37/Work/github/llnl/conduit/uberenv_libs/spack/opt/spack/darwin-highsierra-x86_64/clang-9.0.0-apple/python-3.7.4-ss4j2sdo26gewstsqqmjxxzri7ozxevh/bin/python3.7 "-B" "-m" "unittest" "-v" "t_conduit_docs_tutorial_python_parse"
104: Environment variables:
104: PYTHONPATH=/Users/harrison37/Work/github/llnl/conduit/build-debug/python-modules/:/Users/harrison37/Work/github/llnl/conduit/src/tests/docs
104: Test timeout computed to be: 1500
104: test_docs_tutorial_json (t_conduit_docs_tutorial_python_parse.Conduit_Tutorial_Python_Parse) ... ok
104: test_docs_tutorial_yaml (t_conduit_docs_tutorial_python_parse.Conduit_Tutorial_Python_Parse) ... ok
104: test_docs_tutorial_yaml_inline_array (t_conduit_docs_tutorial_python_parse.Conduit_Tutorial_Python_Parse) ... ok
104: test_json_generator_pure_json (t_conduit_docs_tutorial_python_parse.Conduit_Tutorial_Python_Parse) ... ok
104: test_json_generator_pure_yaml (t_conduit_docs_tutorial_python_parse.Conduit_Tutorial_Python_Parse) ... ok
104: test_json_generator_std (t_conduit_docs_tutorial_python_parse.Conduit_Tutorial_Python_Parse) ... ok
104:
104: ----------------------------------------------------------------------
104: Ran 6 tests in 0.001s
104:
104: OK
104: BEGIN_EXAMPLE("t_py_conduit_docs_tutorial_json")
104: 42.0
104:
104: {
104: "mykey": {"dtype":"float64", "number_of_elements": 1, "offset": 0, "stride": 8, "element_bytes": 8, "endianness": "little"}
104: }
104: END_EXAMPLE("t_py_conduit_docs_tutorial_json")
104: BEGIN_EXAMPLE("t_py_conduit_docs_tutorial_yaml")
104: 42.0
104:
104: {
104: "mykey": {"dtype":"float64", "number_of_elements": 1, "offset": 0, "stride": 8, "element_bytes": 8, "endianness": "little"}
104: }
104: END_EXAMPLE("t_py_conduit_docs_tutorial_yaml")
104: BEGIN_EXAMPLE("t_py_conduit_docs_tutorial_yaml_inline_array")
104: [ 0. 10. 20. 30.]
104: {"dtype":"float64", "number_of_elements": 4, "offset": 0, "stride": 8, "element_bytes": 8, "endianness": "little"}
104: END_EXAMPLE("t_py_conduit_docs_tutorial_yaml_inline_array")
104: BEGIN_EXAMPLE("t_py_json_generator_pure_json")
104: 100.0
104:
104: {
104: "test": 100.0
104: }
104: END_EXAMPLE("t_py_json_generator_pure_json")
104: BEGIN_EXAMPLE("t_py_json_generator_pure_yaml")
104: 100.0
104:
104: {
104: "test": 100.0
104: }
104: END_EXAMPLE("t_py_json_generator_pure_yaml")
104: BEGIN_EXAMPLE("t_py_json_generator_std")
104: 100.0
104:
104: {
104: "test": 100.0
104: }
104: END_EXAMPLE("t_py_json_generator_std")
1/1 Test #104: t_conduit_docs_tutorial_python_parse ... Passed 0.17 sec

The following tests passed:
t_conduit_docs_tutorial_python_parse

100% tests passed, 0 tests failed out of 1

Total Test time (real) = 0.20 sec
Loading

0 comments on commit 805d085

Please sign in to comment.