Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HERON plugin #1271

Merged
merged 24 commits into from
Jul 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
43c2919
extraneous tracked file?
PaulTalbot-INL Mar 31, 2020
a36cbdb
Merge branch 'devel' of github.com:PaulTalbot-INL/raven into devel
PaulTalbot-INL Apr 23, 2020
c1c3188
Merge branch 'devel' of https://github.com/idaholab/raven into devel
PaulTalbot-INL May 11, 2020
702c2f4
heron as a submodule
PaulTalbot-INL May 13, 2020
de3e810
undoing file removal
PaulTalbot-INL May 13, 2020
dc8c91a
update with class docs
PaulTalbot-INL May 13, 2020
857faa0
Merge branch 'devel' of github.com:PaulTalbot-INL/raven into devel
PaulTalbot-INL Jun 25, 2020
148adb6
matching remote devel
PaulTalbot-INL Jun 25, 2020
311a4a1
Merge branch 'devel' of https://github.com/idaholab/raven into devel
PaulTalbot-INL Jul 7, 2020
0883db4
Merge branch 'devel' of https://github.com/idaholab/raven into devel
PaulTalbot-INL Jul 8, 2020
9496aa6
Merge branch 'devel' into heron_submod
PaulTalbot-INL Jul 10, 2020
2cd7ca0
updated to latest heron
PaulTalbot-INL Jul 10, 2020
353ac6c
fixed submodule
PaulTalbot-INL Jul 13, 2020
4e15240
TESTING build
PaulTalbot-INL Jul 13, 2020
31cac93
did not work, trying again
PaulTalbot-INL Jul 13, 2020
a4551c7
wip
PaulTalbot-INL Jul 16, 2020
8bf8ffc
moved to XML library dependency lists, see raven example for instruct…
PaulTalbot-INL Jul 20, 2020
02e6c26
attempting to find problem with printing on testing machines
PaulTalbot-INL Jul 20, 2020
bc4151d
and again, looks like we have some old pythons on the test machines
PaulTalbot-INL Jul 20, 2020
ba1bdd2
corrected lib version, also checked others carefully
PaulTalbot-INL Jul 20, 2020
91911fa
new heron update using xml
PaulTalbot-INL Jul 20, 2020
1603459
changed makefile ref from ini to xml
PaulTalbot-INL Jul 21, 2020
8afc5d4
conversion script
PaulTalbot-INL Jul 21, 2020
bc6f282
removed old file
PaulTalbot-INL Jul 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 0 additions & 100 deletions dependencies.ini

This file was deleted.

67 changes: 67 additions & 0 deletions dependencies.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<!--
Structure:
<root>
<install-method>
...
</install method>
<next-install-method> etc
</root>
Note all install methods after "main" take
Instructions:

add library: <library>pinned.version.number</library>
add with no pinned version: <library/>
remove a library: <library>remove</library>
action for limited OS: <library os='windows'>...
add library from forge: <library source='forge'>...
optional: <library optional='True'>...
skip run/install check: <library skip_check='True'>...

default OS is "all"
default source is "conda" meaning main conda repo
default optional is "false"

For more information about the command line arguments to library_handler.sh, see that module.
Also try
`python library_handler.sh -h` and
`python library_handler.sh conda -h`

end reading flow
-->
<dependencies>
<main>
<h5py>2.9.0</h5py>
<numpy>1.18.1</numpy>
<scipy>1.2.1</scipy>
<scikit-learn>0.21.2</scikit-learn>
<pandas>0.24.2</pandas>
<xarray>0.12.1</xarray>
<netcdf4>1.4.2</netcdf4>
<matplotlib>3.1.1</matplotlib>
<statsmodels>0.9.0</statsmodels>
<cloudpickle>1.1.1</cloudpickle>
<tensorflow>1.13.1</tensorflow>
<python skip_check='True'>3</python>
<hdf5 skip_check='True'/>
<swig skip_check='True'/>
<pylint/>
<coverage/>
<lxml/>
<psutil/>
<pip/>
<importlib_metadata/>
<pyside2 source='forge'/>
<pillow optional='True'>6.0.0</pillow>
<nomkl os='linux' skip_check='True'/>
<numexpr os='linux'/>
<ray os="mac,linux" source="pip"/>
</main>
<alternate name="pip">
<hdf5>remove</hdf5>
<swig>remove</swig>
<pip>remove</pip>
<python>remove</python>
<nomkl>remove</nomkl>
<numexpr>remove</numexpr>
</alternate>
</dependencies>
4 changes: 2 additions & 2 deletions doc/user_manual/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ introduction.tex raven_user_manual.tex model.tex runInfo.tex libraries.tex DataM
Installation/clone.tex Installation/conda.tex Installation/linux.tex Installation/macosx.tex Installation/main.tex \
Installation/overview.tex Installation/windows.tex advanced_users_templates.tex
LATEX_FLAGS=-interaction=nonstopmode
LIB_FILES = ../../scripts/library_handler.py ../../dependencies.ini
LIB_FILES = ../../scripts/library_handler.py ../../dependencies.xml

all: raven_user_manual.pdf

Expand Down Expand Up @@ -43,4 +43,4 @@ conda_command.txt : $(LIB_FILES)
./create_command.sh

pip_commands.txt : $(LIB_FILES)
./create_pip_commands.sh
./create_pip_commands.sh
2 changes: 1 addition & 1 deletion plugins/heron
Submodule heron updated from a6f4d1 to cee70f
Loading