Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
3a3a9f2
Print out total shot counts in preprocess.py
felker Nov 21, 2019
09c4d67
Always print # train shots before # validate shots in diagnostics
felker Nov 21, 2019
df7228e
Encapsulate printing of shot set sizes in new fn, in new file diagnos…
felker Nov 21, 2019
cbc31b4
Add missing bracket
felker Nov 21, 2019
366de2d
Comment out unused fn
felker Nov 21, 2019
e527c38
Add details about how many omitted shots were disruptive
felker Nov 21, 2019
286dc87
Typo
felker Nov 21, 2019
3009662
Remove stray diagnostic print
felker Nov 21, 2019
0e4715b
Reformat diagnostics
felker Nov 21, 2019
a99c01a
Reduce number of lines
felker Nov 22, 2019
31fafa3
Drop Rick Zamora's ALCF notes into docs/
felker Nov 22, 2019
8ecf571
Convert YAML to 2 space indent from 4 spaces
felker Nov 22, 2019
9585728
Clarify comment
felker Nov 22, 2019
e2738ea
Add comment warning about workaround for JET 0D CW -> ILW preprocessing
felker Nov 23, 2019
6f7894d
Attempt to standardize diagnostics from guarantee_preprocessed.py
felker Nov 25, 2019
36920a6
Spacing changes
felker Nov 26, 2019
01a2376
Change validation_frac default from 0.33 to 1.0/3.0
felker Nov 26, 2019
7586b68
Add comments
felker Nov 26, 2019
9a5b0f4
Do not use Python expressions in conf.yaml values
felker Nov 26, 2019
fda919f
Remove leftover debug print()
felker Nov 26, 2019
7712e2e
Standardize [omit] diagnostics in Normalizer and downloading.py
felker Nov 26, 2019
f53eeee
Add comment
felker Dec 2, 2019
d31908f
Suppress the same NumPy deprecation warning in tensorboard
felker Dec 5, 2019
b0e5889
Prefix processed_shots/*.npz filenames with "jet-", "d3d-" etc.
felker Dec 5, 2019
677b00b
Fix bugs in parent commit
felker Dec 5, 2019
c1c645f
Add support for CuDNNLSTM; dump model params to ONNX
felker Dec 7, 2019
b11d759
Delete single-GPU Keras runner; comment out hyperopt driver for it
felker Dec 7, 2019
7a72cca
Remove "_data_", "_data" from names of dataset variables
felker Dec 11, 2019
036b9fb
Consistency in cross-machine data variables
felker Dec 11, 2019
5d5932e
Merge branch 'master' into feature/documentation
felker Dec 12, 2019
61cd42c
Start storing machine-dependent module .cmd and Conda YAML in envs/
felker Dec 16, 2019
212b0b0
Reorganize CI files
felker Dec 16, 2019
44772f9
Add TigerGPU build specs to envs/
felker Dec 16, 2019
336135b
Fix 2x Conda YAML errors; comment-out channel_priority
felker Dec 16, 2019
8593944
Add pip to TigerGPU dependencies
felker Dec 16, 2019
5b44e44
Fix intentional style error
felker Dec 16, 2019
f68f2f0
Do not install mpi4py via pip when building Conda env
felker Dec 16, 2019
03f6239
TigerGPU conda env is generic for x86_64 Linux platforms with GPUs
felker Dec 16, 2019
4a6ceaa
Install Cython on Traverse (unique req. for this PICSciE cluster)
felker Dec 16, 2019
c522d3b
Add tcn.py from @ge-dong's fork
felker Dec 19, 2019
ae84a22
Fix PEP8 style erorrs
felker Dec 19, 2019
6add7f5
Make keras2onnx, onnx optional modules
felker Dec 19, 2019
92a76fb
Merge branch 'master' into feature/documentation
felker Jan 2, 2020
458a765
Restrict Keras to <v2.3.0
felker Jan 2, 2020
9b58f63
Loosen precise Python version requirement in Conda YAML files
felker Jan 2, 2020
46afd73
Remove version info from dependency list in setup.py
felker Jan 2, 2020
057535f
Add docstrings to cumulative moving Averager()
felker Jan 3, 2020
856c147
Comment-out pre-RNN diagnostics
felker Jan 6, 2020
1867bd2
Fix typo
felker Jan 6, 2020
f292e9e
Deprecate and remove old documentation
felker Jan 6, 2020
63b8d2d
Note unused functions in targets.py
felker Jan 6, 2020
8a36a58
Group "T_*" timing parameters close together in conf.yaml
felker Jan 9, 2020
eb8f664
Fix bug: MaxHingeTarget was inheriting loss='mse' from parent Target
felker Jan 9, 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
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ env:
# before_install:

install:
- sh install-mpi.sh
- sh ci/travis/install-mpi.sh
- export MPI_PREFIX="${HOME}/opt/${MPI_LIBRARY}-${MPI_LIBRARY_VERSION}"
- export PATH="${HOME}/.local/bin:${MPI_PREFIX}/bin${PATH:+":${PATH}"}"
- export LD_LIBRARY_PATH="${MPI_PREFIX}/lib${LD_LIBRARY_PATH:+":${LD_LIBRARY_PATH}"}"
- pip install --upgrade pip
- pip install -r requirements-travis.txt
- pip install -r envs/pip-requirements-travis.txt

# before_script:

Expand All @@ -54,6 +54,8 @@ stages:

notifications:
email:
recipients:
- felker@anl.gov
on_success: change
on_failure: always
slack:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 5 additions & 3 deletions data/signals.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,9 @@ def get_units(str):
if found:
if rank > 1:
xdata = c.get('dim_of(_s,1)').data()
# xunits = get_units('dim_of(_s,1)')
ydata = c.get('dim_of(_s)').data()
# yunits = get_units('dim_of(_s)')
else:
xdata = c.get('dim_of(_s)').data()
# xunits = get_units('dim_of(_s)')

# MDSplus seems to return 2-D arrays transposed. Change them back.
if np.ndim(data) == 2:
Expand Down Expand Up @@ -406,6 +403,11 @@ def fetch_nstx_data(signal_path, shot_num, c):
# 'tmamp1':tmamp1, 'tmamp2':tmamp2, 'tmfreq1':tmfreq1, 'tmfreq2':tmfreq2,
# 'pechin':pechin,
# 'rho_profile_spatial':rho_profile_spatial, 'etemp':etemp,
# -----
# TODO(KGF): replace this hacky workaround
# IMPORTANT: must comment-out the following line when preprocessing for
# training on JET CW and testing on JET ILW (FRNN 0D).
# Otherwise 1K+ CW shots are excluded due to missing profile data
'etemp_profile': etemp_profile, 'edens_profile': edens_profile,
# 'itemp_profile':itemp_profile, 'zdens_profile':zdens_profile,
# 'trot_profile':trot_profile, 'pthm_profile':pthm_profile,
Expand Down
Loading