Skip to content

Commit 7a72cca

Browse files
felkerfelker
committed
Remove "_data_", "_data" from names of dataset variables
1 parent b11d759 commit 7a72cca

File tree

4 files changed

+42
-41
lines changed

4 files changed

+42
-41
lines changed

‎examples/conf.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,22 @@
77
fs_path: '/tigress'
88
target: 'hinge' # 'maxhinge' # 'maxhinge' # 'binary' # 'hinge'
99
num_gpus: 4 # per node
10-
1110
paths:
1211
signal_prepath: '/signal_data/' # /signal_data/jet/
1312
shot_list_dir: '/shot_lists/'
1413
tensorboard_save_path: '/Graph/'
15-
data: d3d_data_0D
14+
data: d3d_0D
1615
# if specific_signals: [] left empty, it will use all valid signals defined on a machine. Only use if need a custom set
1716
specific_signals: [] # ['q95','li','ip','betan','energy','lm','pradcore','pradedge','pradtot','pin','torquein','tmamp1','tmamp2','tmfreq1','tmfreq2','pechin','energydt','ipdirect','etemp_profile','edens_profile']
1817
executable: "mpi_learn.py"
1918
shallow_executable: "learn.py"
20-
2119
data:
2220
bleed_in: 0 # how many shots from the test set to use in training?
2321
bleed_in_repeat_fac: 1 # how many times to repeat shots in training and validation?
2422
bleed_in_remove_from_test: True
2523
bleed_in_equalize_sets: False
26-
# TODO(KGF): make next parameter use 'none' instead of None for consistency
2724
signal_to_augment: None # 'plasma current'
28-
augmentation_mode: 'none'
25+
augmentation_mode: None
2926
augment_during_training: False
3027
cut_shot_ends: True
3128
T_min_warn: 30
@@ -57,7 +54,6 @@ data:
5754
# the fraction of samples with which to train the shallow model
5855
# shallow_sample_prob: 0.01
5956
floatx: 'float32'
60-
6157
model:
6258
loss_scale_factor: 1.0
6359
use_batch_norm: false

‎plasma/conf_parser.py‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -150,60 +150,62 @@ def parameters(input_file):
150150
# nstx, params['paths']['shot_list_dir'],
151151
# ['disrupt_nstx.txt'], 'nstx shots (all are disruptive')
152152

153-
if params['paths']['data'] == 'jet_data':
153+
if params['paths']['data'] == 'jet_all':
154154
params['paths']['shot_files'] = [jet_carbon_wall]
155155
params['paths']['shot_files_test'] = [jet_iterlike_wall]
156156
params['paths']['use_signals_dict'] = sig.jet_signals
157-
elif params['paths']['data'] == 'jet_data_0D':
157+
elif params['paths']['data'] == 'jet_0D':
158158
params['paths']['shot_files'] = [jet_carbon_wall]
159159
params['paths']['shot_files_test'] = [jet_iterlike_wall]
160160
params['paths']['use_signals_dict'] = sig.jet_signals_0D
161-
elif params['paths']['data'] == 'jet_data_1D':
161+
elif params['paths']['data'] == 'jet_1D':
162162
params['paths']['shot_files'] = [jet_carbon_wall]
163163
params['paths']['shot_files_test'] = [jet_iterlike_wall]
164164
params['paths']['use_signals_dict'] = sig.jet_signals_1D
165-
elif params['paths']['data'] == 'jet_data_late':
165+
elif params['paths']['data'] == 'jet_late':
166166
params['paths']['shot_files'] = [jet_iterlike_wall_late]
167167
params['paths']['shot_files_test'] = []
168168
params['paths']['use_signals_dict'] = sig.jet_signals
169-
elif params['paths']['data'] == 'jet_data_carbon_to_late_0D':
169+
elif params['paths']['data'] == 'jet_carbon_to_late_0D':
170170
params['paths']['shot_files'] = [jet_carbon_wall]
171171
params['paths']['shot_files_test'] = [jet_iterlike_wall_late]
172172
params['paths']['use_signals_dict'] = sig.jet_signals_0D
173-
elif params['paths']['data'] == 'jet_data_temp_profile':
173+
elif params['paths']['data'] == 'jet_temp_profile':
174174
params['paths']['shot_files'] = [jet_carbon_wall]
175175
params['paths']['shot_files_test'] = [jet_iterlike_wall]
176176
params['paths']['use_signals_dict'] = {
177177
'etemp_profile': sig.etemp_profile}
178-
elif params['paths']['data'] == 'jet_data_dens_profile':
178+
elif params['paths']['data'] == 'jet_dens_profile':
179179
params['paths']['shot_files'] = [jet_carbon_wall]
180180
params['paths']['shot_files_test'] = [jet_iterlike_wall]
181181
params['paths']['use_signals_dict'] = {
182182
'edens_profile': sig.edens_profile}
183-
elif params['paths']['data'] == 'jet_carbon_data':
183+
elif params['paths']['data'] == 'jet_carbon_all':
184184
params['paths']['shot_files'] = [jet_carbon_wall]
185185
params['paths']['shot_files_test'] = []
186186
params['paths']['use_signals_dict'] = sig.jet_signals
187-
elif params['paths']['data'] == 'jet_mixed_data':
187+
elif params['paths']['data'] == 'jet_mixed_all':
188188
params['paths']['shot_files'] = [jet_full]
189189
params['paths']['shot_files_test'] = []
190190
params['paths']['use_signals_dict'] = sig.jet_signals
191191
elif params['paths']['data'] == 'jenkins_jet':
192192
params['paths']['shot_files'] = [jenkins_jet_carbon_wall]
193193
params['paths']['shot_files_test'] = [jenkins_jet_iterlike_wall]
194194
params['paths']['use_signals_dict'] = sig.jet_signals
195-
# jet data but with fully defined signals
196-
elif params['paths']['data'] == 'jet_data_fully_defined':
195+
# JET data but with fully defined signals
196+
elif params['paths']['data'] == 'jet_fully_defined':
197197
params['paths']['shot_files'] = [jet_carbon_wall]
198198
params['paths']['shot_files_test'] = [jet_iterlike_wall]
199199
params['paths']['use_signals_dict'] = sig.fully_defined_signals
200-
# jet data but with fully defined signals
201-
elif params['paths']['data'] == 'jet_data_fully_defined_0D':
200+
# JET data but with fully defined signals
201+
elif params['paths']['data'] == 'jet_fully_defined_0D':
202202
params['paths']['shot_files'] = [jet_carbon_wall]
203203
params['paths']['shot_files_test'] = [jet_iterlike_wall]
204204
params['paths']['use_signals_dict'] = sig.fully_defined_signals_0D
205-
206-
elif params['paths']['data'] == 'd3d_data':
205+
# ==================
206+
# START D3D DATASETS
207+
# ==================
208+
elif params['paths']['data'] == 'd3d_all':
207209
params['paths']['shot_files'] = [d3d_full]
208210
params['paths']['shot_files_test'] = []
209211
params['paths']['use_signals_dict'] = {
@@ -224,15 +226,15 @@ def parameters(input_file):
224226
'etemp_profile': sig.etemp_profile,
225227
'edens_profile': sig.edens_profile,
226228
}
227-
elif params['paths']['data'] == 'd3d_data_1D':
229+
elif params['paths']['data'] == 'd3d_1D':
228230
params['paths']['shot_files'] = [d3d_full]
229231
params['paths']['shot_files_test'] = []
230232
params['paths']['use_signals_dict'] = {
231233
'ipdirect': sig.ipdirect,
232234
'etemp_profile': sig.etemp_profile,
233235
'edens_profile': sig.edens_profile,
234236
}
235-
elif params['paths']['data'] == 'd3d_data_all_profiles':
237+
elif params['paths']['data'] == 'd3d_all_profiles':
236238
params['paths']['shot_files'] = [d3d_full]
237239
params['paths']['shot_files_test'] = []
238240
params['paths']['use_signals_dict'] = {
@@ -248,7 +250,7 @@ def parameters(input_file):
248250
'bootstrap_current_profile': sig.bootstrap_current_profile,
249251
'q_psi_profile': sig.q_psi_profile,
250252
}
251-
elif params['paths']['data'] == 'd3d_data_0D':
253+
elif params['paths']['data'] == 'd3d_0D':
252254
params['paths']['shot_files'] = [d3d_full]
253255
params['paths']['shot_files_test'] = []
254256
params['paths']['use_signals_dict'] = {
@@ -267,10 +269,12 @@ def parameters(input_file):
267269
'iptarget': sig.iptarget,
268270
'iperr': sig.iperr,
269271
}
270-
elif params['paths']['data'] == 'd3d_data_all':
271-
params['paths']['shot_files'] = [d3d_full]
272-
params['paths']['shot_files_test'] = []
273-
params['paths']['use_signals_dict'] = sig.d3d_signals
272+
# TODO(KGF): rename. Unlike JET, there are probably differences between
273+
# sig.d3d_signals and the manually-defined sigs in above d3d_all
274+
# elif params['paths']['data'] == 'd3d_all':
275+
# params['paths']['shot_files'] = [d3d_full]
276+
# params['paths']['shot_files_test'] = []
277+
# params['paths']['use_signals_dict'] = sig.d3d_signals
274278
elif params['paths']['data'] == 'jenkins_d3d':
275279
params['paths']['shot_files'] = [d3d_jenkins]
276280
params['paths']['shot_files_test'] = []
@@ -293,54 +297,54 @@ def parameters(input_file):
293297
'edens_profile': sig.edens_profile,
294298
}
295299
# jet data but with fully defined signals
296-
elif params['paths']['data'] == 'd3d_data_fully_defined':
300+
elif params['paths']['data'] == 'd3d_fully_defined':
297301
params['paths']['shot_files'] = [d3d_full]
298302
params['paths']['shot_files_test'] = []
299303
params['paths']['use_signals_dict'] = sig.fully_defined_signals
300304
# jet data but with fully defined signals
301-
elif params['paths']['data'] == 'd3d_data_fully_defined_0D':
305+
elif params['paths']['data'] == 'd3d_fully_defined_0D':
302306
params['paths']['shot_files'] = [d3d_full]
303307
params['paths']['shot_files_test'] = []
304308
params['paths']['use_signals_dict'] = sig.fully_defined_signals_0D
305-
elif params['paths']['data'] == 'd3d_data_temp_profile':
309+
elif params['paths']['data'] == 'd3d_temp_profile':
306310
# jet data but with fully defined signals
307311
params['paths']['shot_files'] = [d3d_full]
308312
params['paths']['shot_files_test'] = []
309313
params['paths']['use_signals_dict'] = {
310314
'etemp_profile': sig.etemp_profile} # fully_defined_signals_0D
311-
elif params['paths']['data'] == 'd3d_data_dens_profile':
315+
elif params['paths']['data'] == 'd3d_dens_profile':
312316
# jet data but with fully defined signals
313317
params['paths']['shot_files'] = [d3d_full]
314318
params['paths']['shot_files_test'] = []
315319
params['paths']['use_signals_dict'] = {
316320
'edens_profile': sig.edens_profile} # fully_defined_signals_0D
317321

318322
# cross-machine
319-
elif params['paths']['data'] == 'jet_to_d3d_data':
323+
elif params['paths']['data'] == 'jet_to_d3d':
320324
params['paths']['shot_files'] = [jet_full]
321325
params['paths']['shot_files_test'] = [d3d_full]
322326
params['paths']['use_signals_dict'] = sig.fully_defined_signals
323-
elif params['paths']['data'] == 'd3d_to_jet_data':
327+
elif params['paths']['data'] == 'd3d_to_jet':
324328
params['paths']['shot_files'] = [d3d_full]
325329
params['paths']['shot_files_test'] = [jet_iterlike_wall]
326330
params['paths']['use_signals_dict'] = sig.fully_defined_signals
327-
elif params['paths']['data'] == 'd3d_to_late_jet_data':
331+
elif params['paths']['data'] == 'd3d_to_late_jet':
328332
params['paths']['shot_files'] = [d3d_full]
329333
params['paths']['shot_files_test'] = [jet_iterlike_wall_late]
330334
params['paths']['use_signals_dict'] = sig.fully_defined_signals
331-
elif params['paths']['data'] == 'jet_to_d3d_data_0D':
335+
elif params['paths']['data'] == 'jet_to_d3d_0D':
332336
params['paths']['shot_files'] = [jet_full]
333337
params['paths']['shot_files_test'] = [d3d_full]
334338
params['paths']['use_signals_dict'] = sig.fully_defined_signals_0D
335-
elif params['paths']['data'] == 'd3d_to_jet_data_0D':
339+
elif params['paths']['data'] == 'd3d_to_jet_0D':
336340
params['paths']['shot_files'] = [d3d_full]
337341
params['paths']['shot_files_test'] = [jet_iterlike_wall]
338342
params['paths']['use_signals_dict'] = sig.fully_defined_signals_0D
339-
elif params['paths']['data'] == 'jet_to_d3d_data_1D':
343+
elif params['paths']['data'] == 'jet_to_d3d_1D':
340344
params['paths']['shot_files'] = [jet_full]
341345
params['paths']['shot_files_test'] = [d3d_full]
342346
params['paths']['use_signals_dict'] = sig.fully_defined_signals_1D
343-
elif params['paths']['data'] == 'd3d_to_jet_data_1D':
347+
elif params['paths']['data'] == 'd3d_to_jet_1D':
344348
params['paths']['shot_files'] = [d3d_full]
345349
params['paths']['shot_files_test'] = [jet_iterlike_wall]
346350
params['paths']['use_signals_dict'] = sig.fully_defined_signals_1D

‎plasma/preprocessor/augment.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,9 @@ def augment(self, signal, strength=10):
135135
elif self.conf['data']['augmentation_mode'] == "zero":
136136
# if "set to zero" augmentation. Can control in conf.
137137
return signal*0.0
138-
elif self.conf['data']['augmentation_mode'] == "none":
139-
return signal # if no augmentation. Should be the default in conf.
138+
elif self.conf['data']['augmentation_mode'] is None:
139+
# no augmentation should be the default in conf.yaml
140+
return signal
140141
else:
141142
print("Unknown augmentation mode. Exiting")
142143
exit(-1)

requirements-travis.txt renamed to requirements-cpu.yaml

File renamed without changes.

0 commit comments

Comments
 (0)