Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

Develop fix rusage format error and add global rusage data #745

Merged
merged 4 commits into from
Sep 23, 2020

Conversation

dchassin
Copy link
Member

@dchassin dchassin commented Sep 12, 2020

This PR fixes a formatting error in rusage output.

Current issues

None

Code changes

  • Fix formatting error in utime and stime output. Also added a global_rusage_data to store rusage values in json format.

Documentation changes

Test and Validation Notes

None

@dchassin dchassin added the bug Request a fix or change to the code label Sep 12, 2020
@dchassin dchassin mentioned this pull request Sep 12, 2020
13 tasks
@dchassin dchassin added this to To do in HIPAS via automation Sep 12, 2020
@dchassin dchassin marked this pull request as ready for review September 21, 2020 19:57
@dchassin dchassin moved this from To do to Review pending in HIPAS Sep 21, 2020
@dchassin dchassin added this to the HiPAS Final Implementation milestone Sep 21, 2020
@dchassin dchassin changed the title Fix rusage format error and add global rusage data Develop fix rusage format error and add global rusage data Sep 22, 2020
HIPAS automation moved this from Review pending to Merge pending Sep 23, 2020
@aivanova5 aivanova5 merged commit 77cb1b0 into develop Sep 23, 2020
HIPAS automation moved this from Merge pending to Done Sep 23, 2020
@aivanova5 aivanova5 deleted the develop-fix-rusage-format-error branch September 23, 2020 17:06
dchassin added a commit that referenced this pull request Sep 28, 2020
* Develop (#2)
* Update version.h
* Add support for python properties (#748)
* Move subcommand help tests to autotest folder (#747)
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Develop add optimize module (#746)
* Add optimize module
* Add optimize module
* Remove CSV output from optimize module
* Change optimize extremum test to optional
* Rename test_extremum_opt.glm to test_extremum.glm
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Develop fix rusage format error and add global rusage data (#745)
* Fix rusage format error and add global rusage data
* Add rusage_data doc
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Add server control halt and stop commands (#752)
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update Library.md (#753)
* Update load.cpp (#751)
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update Glm_save_options.md (#755)
* Develop add python property access (#750)
* Add support for python properties
* Finalized basic python property object implementation
* Add example
* Update Property.md
* Delete Stochastic variables.ipynb
* Add support for property comparisons
* Update example
* Fix property type structure init
* Merge remote-tracking branch 'origin/develop-fix-load-phase-tautology' into develop-add-python-property-access
* Add support for unit conversion in python property
* Document python property unit conversion and fix ambiguous method name
* Workaround for python finalize exception
* Update python_embed.cpp
* Update Property.md
* Update Property.md
* Update test_python_property.glm
* Fix problem with modlist in python event handler
* Update main.cpp
* Added python shadow class tutorial
* Fix json2png it can plot csv data by default
* Create tmy32glm.py
* Update Makefile.mk
* Update Python shadow class tutorial.ipynb
* Fix traceback issues
* Update thermostat.py
* Update Python shadow class tutorial.ipynb
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Create c-cpp.yml
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update README.md
* Update master.yml
* Update and rename test_require_pwlf.glm to test_require_pytz.glm
* Update develop.yml
aivanova5 added a commit that referenced this pull request Sep 28, 2020
* Create c-cpp.yml

* Fix action for master and develop (#759)

* Develop (#2)
* Update version.h
* Add support for python properties (#748)
* Move subcommand help tests to autotest folder (#747)
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Develop add optimize module (#746)
* Add optimize module
* Add optimize module
* Remove CSV output from optimize module
* Change optimize extremum test to optional
* Rename test_extremum_opt.glm to test_extremum.glm
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Develop fix rusage format error and add global rusage data (#745)
* Fix rusage format error and add global rusage data
* Add rusage_data doc
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Add server control halt and stop commands (#752)
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update Library.md (#753)
* Update load.cpp (#751)
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update Glm_save_options.md (#755)
* Develop add python property access (#750)
* Add support for python properties
* Finalized basic python property object implementation
* Add example
* Update Property.md
* Delete Stochastic variables.ipynb
* Add support for property comparisons
* Update example
* Fix property type structure init
* Merge remote-tracking branch 'origin/develop-fix-load-phase-tautology' into develop-add-python-property-access
* Add support for unit conversion in python property
* Document python property unit conversion and fix ambiguous method name
* Workaround for python finalize exception
* Update python_embed.cpp
* Update Property.md
* Update Property.md
* Update test_python_property.glm
* Fix problem with modlist in python event handler
* Update main.cpp
* Added python shadow class tutorial
* Fix json2png it can plot csv data by default
* Create tmy32glm.py
* Update Makefile.mk
* Update Python shadow class tutorial.ipynb
* Fix traceback issues
* Update thermostat.py
* Update Python shadow class tutorial.ipynb
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Create c-cpp.yml
Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
* Update README.md
* Update master.yml
* Update and rename test_require_pwlf.glm to test_require_pytz.glm
* Update develop.yml

* Delete c-cpp.yml

* Update develop.yml

* Update develop.yml

* Update and rename develop.yml to validate.yml

* Delete master.yml

* Rename validate.yml to develop.yml

* Update and rename develop.yml to master.yml

* Create develop.yml

Co-authored-by: Alyona Ivanova <Ivanova.alyona5@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Request a fix or change to the code
Projects
No open projects
HIPAS
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants