Added multiple results and created working grid settings and scripts

This commit is contained in:
lkrsnik 2017-08-29 20:06:59 +02:00
parent e79ae5c205
commit 7180550b0d
4 changed files with 65 additions and 42 deletions

View File

@ -2,11 +2,14 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8a8ba9af-e1a4-433a-9968-475192610776" name="Default" comment=""> <list default="true" id="8a8ba9af-e1a4-433a-9968-475192610776" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/cnn/accent_classification/letters/60_epoch.h5" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/cnn/accent_classification/letters/60_epoch_history.pkl" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/accent_classification/letters/cnn.ipynb" afterPath="$PROJECT_DIR$/cnn/accent_classification/letters/cnn.ipynb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/cnn.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/cnn.ipynb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/results_presentation.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/results_presentation.ipynb" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/results_presentation.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/results_presentation.ipynb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v3_4/notes" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v3_4/notes" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/syllabled_letters/cnn.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/syllabled_letters/cnn.ipynb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v3_7/cnn.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v3_7/cnn.ipynb" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/syllables/cnn.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/syllables/cnn.ipynb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v4_0/cnn.ipynb" afterPath="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/v4_0/cnn.ipynb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/workbench.py" afterPath="$PROJECT_DIR$/workbench.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workbench.py" afterPath="$PROJECT_DIR$/workbench.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/workbench.xrsl" afterPath="$PROJECT_DIR$/workbench.xrsl" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workbench.xrsl" afterPath="$PROJECT_DIR$/workbench.xrsl" />
</list> </list>
@ -38,18 +41,16 @@
<file leaf-file-name="prepare_data.py" pinned="false" current-in-tab="false"> <file leaf-file-name="prepare_data.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/prepare_data.py"> <entry file="file://$PROJECT_DIR$/prepare_data.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108"> <state relative-caret-position="298">
<caret line="14" column="121" lean-forward="false" selection-start-line="14" selection-start-column="102" selection-end-line="14" selection-end-column="121" /> <caret line="397" column="8" lean-forward="false" selection-start-line="397" selection-start-column="8" selection-end-line="397" selection-end-column="8" />
<folding> <folding>
<element signature="e#24#63#0" expanded="true" /> <element signature="e#24#63#0" expanded="true" />
<element signature="e#5979#7267#0" expanded="false" /> <element signature="e#5979#7267#0" expanded="false" />
<element signature="e#7428#8835#0" expanded="false" />
<element signature="e#8923#9218#0" expanded="false" /> <element signature="e#8923#9218#0" expanded="false" />
<element signature="e#13669#13971#0" expanded="false" /> <element signature="e#13669#13971#0" expanded="false" />
<element signature="e#14028#14857#0" expanded="false" /> <element signature="e#14028#14857#0" expanded="false" />
<element signature="e#14921#15267#0" expanded="false" /> <element signature="e#14921#15267#0" expanded="false" />
<element signature="e#18834#19030#0" expanded="false" /> <element signature="e#18834#19030#0" expanded="false" />
<element signature="e#19091#19282#0" expanded="false" />
<element signature="e#19349#19996#0" expanded="false" /> <element signature="e#19349#19996#0" expanded="false" />
<element signature="e#20095#22393#0" expanded="false" /> <element signature="e#20095#22393#0" expanded="false" />
<element signature="e#30153#30294#0" expanded="false" /> <element signature="e#30153#30294#0" expanded="false" />
@ -72,8 +73,8 @@
<file leaf-file-name="workbench.py" pinned="false" current-in-tab="true"> <file leaf-file-name="workbench.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/workbench.py"> <entry file="file://$PROJECT_DIR$/workbench.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="188"> <state relative-caret-position="716">
<caret line="53" column="20" lean-forward="false" selection-start-line="53" selection-start-column="20" selection-end-line="53" selection-end-column="20" /> <caret line="59" column="19" lean-forward="false" selection-start-line="59" selection-start-column="16" selection-end-line="59" selection-end-column="19" />
<folding> <folding>
<element signature="e#24#63#0" expanded="true" /> <element signature="e#24#63#0" expanded="true" />
</folding> </folding>
@ -81,6 +82,16 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="notes" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/notes">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="logistic_regression.py" pinned="false" current-in-tab="false"> <file leaf-file-name="logistic_regression.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/theano_tutorial/logistic_regression.py"> <entry file="file://$PROJECT_DIR$/theano_tutorial/logistic_regression.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -150,9 +161,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>orig_X</find>
<find>vowels</find>
<find>_create_syllable_letters_translator</find>
<find>_get_unresonant_silent_consonants</find> <find>_get_unresonant_silent_consonants</find>
<find>el[0]</find> <find>el[0]</find>
<find>max_num_vowels</find> <find>max_num_vowels</find>
@ -170,7 +178,6 @@
<find>predict</find> <find>predict</find>
<find>_reverse_inputs</find> <find>_reverse_inputs</find>
<find>_letter_generator</find> <find>_letter_generator</find>
<find>_accent_classification</find>
<find>_create_feature_dictionary</find> <find>_create_feature_dictionary</find>
<find>generate_data</find> <find>generate_data</find>
<find>Data</find> <find>Data</find>
@ -180,6 +187,10 @@
<find>../../../data/</find> <find>../../../data/</find>
<find>self.x_other_features_train</find> <find>self.x_other_features_train</find>
<find>_create_x_features</find> <find>_create_x_features</find>
<find>force</find>
<find>test_and_validation_size</find>
<find>_accent_classification</find>
<find>self.y_train</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
@ -199,13 +210,14 @@
<option value="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/character_based_ffnn_keras.ipynb" /> <option value="$PROJECT_DIR$/cnn/word_accetuation/cnn_dictionary/character_based_ffnn_keras.ipynb" />
<option value="$PROJECT_DIR$/tex_hyphenation.py" /> <option value="$PROJECT_DIR$/tex_hyphenation.py" />
<option value="$PROJECT_DIR$/prepare_data.py" /> <option value="$PROJECT_DIR$/prepare_data.py" />
<option value="$PROJECT_DIR$/notes" />
<option value="$PROJECT_DIR$/workbench.py" /> <option value="$PROJECT_DIR$/workbench.py" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="65" /> <option name="x" value="65" />
<option name="y" value="24" /> <option name="y" value="144" />
<option name="width" value="1855" /> <option name="width" value="1855" />
<option name="height" value="1056" /> <option name="height" value="1056" />
</component> </component>
@ -224,7 +236,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -239,6 +250,7 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="Scratches" /> <pane id="Scratches" />
</panes> </panes>
</component> </component>
@ -502,7 +514,7 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="65" y="24" width="1855" height="1056" extended-state="6" /> <frame x="65" y="144" width="1855" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16375546" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16375546" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@ -538,16 +550,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/theano_tutorial/test.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1368">
<caret line="76" column="6" lean-forward="false" selection-start-line="76" selection-start-column="2" selection-end-line="76" selection-end-column="6" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/theano_tutorial/logistic_regression.py"> <entry file="file://$PROJECT_DIR$/theano_tutorial/logistic_regression.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="846"> <state relative-caret-position="846">
@ -886,20 +888,26 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/notes">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/prepare_data.py"> <entry file="file://$PROJECT_DIR$/prepare_data.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108"> <state relative-caret-position="298">
<caret line="14" column="121" lean-forward="false" selection-start-line="14" selection-start-column="102" selection-end-line="14" selection-end-column="121" /> <caret line="397" column="8" lean-forward="false" selection-start-line="397" selection-start-column="8" selection-end-line="397" selection-end-column="8" />
<folding> <folding>
<element signature="e#24#63#0" expanded="true" /> <element signature="e#24#63#0" expanded="true" />
<element signature="e#5979#7267#0" expanded="false" /> <element signature="e#5979#7267#0" expanded="false" />
<element signature="e#7428#8835#0" expanded="false" />
<element signature="e#8923#9218#0" expanded="false" /> <element signature="e#8923#9218#0" expanded="false" />
<element signature="e#13669#13971#0" expanded="false" /> <element signature="e#13669#13971#0" expanded="false" />
<element signature="e#14028#14857#0" expanded="false" /> <element signature="e#14028#14857#0" expanded="false" />
<element signature="e#14921#15267#0" expanded="false" /> <element signature="e#14921#15267#0" expanded="false" />
<element signature="e#18834#19030#0" expanded="false" /> <element signature="e#18834#19030#0" expanded="false" />
<element signature="e#19091#19282#0" expanded="false" />
<element signature="e#19349#19996#0" expanded="false" /> <element signature="e#19349#19996#0" expanded="false" />
<element signature="e#20095#22393#0" expanded="false" /> <element signature="e#20095#22393#0" expanded="false" />
<element signature="e#30153#30294#0" expanded="false" /> <element signature="e#30153#30294#0" expanded="false" />
@ -910,8 +918,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/workbench.py"> <entry file="file://$PROJECT_DIR$/workbench.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="188"> <state relative-caret-position="716">
<caret line="53" column="20" lean-forward="false" selection-start-line="53" selection-start-column="20" selection-end-line="53" selection-end-column="20" /> <caret line="59" column="19" lean-forward="false" selection-start-line="59" selection-start-column="16" selection-end-line="59" selection-end-column="19" />
<folding> <folding>
<element signature="e#24#63#0" expanded="true" /> <element signature="e#24#63#0" expanded="true" />
</folding> </folding>

1
notes Normal file
View File

@ -0,0 +1 @@
256(0.3)-512(0.3)-512(0.3):115(3)-46(3) - [LETTERS ACCENT TYPE] One layer less

View File

@ -27,7 +27,11 @@ from prepare_data import *
# save_inputs('../../internal_representations/inputs/shuffeled_matrix_validate_inputs_other_features_output_11.h5', X_validate, y_validate, other_features = X_other_features_validate) # save_inputs('../../internal_representations/inputs/shuffeled_matrix_validate_inputs_other_features_output_11.h5', X_validate, y_validate, other_features = X_other_features_validate)
# X_train, X_other_features_train, y_train = load_inputs('cnn/internal_representations/inputs/shuffeled_matrix_train_inputs_other_features_output_11.h5', other_features=True) # X_train, X_other_features_train, y_train = load_inputs('cnn/internal_representations/inputs/shuffeled_matrix_train_inputs_other_features_output_11.h5', other_features=True)
# X_validate, X_other_features_validate, y_validate = load_inputs('cnn/internal_representations/inputs/shuffeled_matrix_validate_inputs_other_features_output_11.h5', other_features=True) # X_validate, X_other_features_validate, y_validate = load_inputs('cnn/internal_representations/inputs/shuffeled_matrix_validate_inputs_other_features_output_11.h5', other_features=True)
data = Data('l', save_generated_data=False, number_of_syllables=True) # letters
# data = Data('l', save_generated_data=False, number_of_syllables=True)
# syllabled letters
data = Data('l', save_generated_data=False, accent_classification=True)
data.generate_data('letters_word_accetuation_train', data.generate_data('letters_word_accetuation_train',
'letters_word_accetuation_test', 'letters_word_accetuation_test',
'letters_word_accetuation_validate', content_name='SlovarIJS_BESEDE_utf8.lex', 'letters_word_accetuation_validate', content_name='SlovarIJS_BESEDE_utf8.lex',
@ -36,7 +40,7 @@ data.generate_data('letters_word_accetuation_train',
num_examples = len(data.x_train) # training set size num_examples = len(data.x_train) # training set size
nn_output_dim = 10 nn_output_dim = 13
nn_hdim = 516 nn_hdim = 516
batch_size = 16 batch_size = 16
# actual_epoch = 1 # actual_epoch = 1
@ -46,13 +50,23 @@ num_fake_epoch = 20
# letters
conv_input_shape=(23, 36) conv_input_shape=(23, 36)
othr_input = (141, )
# syllabled letters
# conv_input_shape=(10, 5168)
# othr_input = (140, )
othr_input = (150, )
conv_input = Input(shape=conv_input_shape, name='conv_input') conv_input = Input(shape=conv_input_shape, name='conv_input')
# letters
x_conv = Conv1D(115, (3), padding='same', activation='relu')(conv_input) x_conv = Conv1D(115, (3), padding='same', activation='relu')(conv_input)
x_conv = Conv1D(46, (3), padding='same', activation='relu')(x_conv) x_conv = Conv1D(46, (3), padding='same', activation='relu')(x_conv)
# syllabled letters
# x_conv = Conv1D(200, (2), padding='same', activation='relu')(conv_input)
x_conv = MaxPooling1D(pool_size=2)(x_conv) x_conv = MaxPooling1D(pool_size=2)(x_conv)
x_conv = Flatten()(x_conv) x_conv = Flatten()(x_conv)
@ -62,10 +76,10 @@ x = concatenate([x_conv, othr_input])
# x = Dense(1024, input_dim=(516 + 256), activation='relu')(x) # x = Dense(1024, input_dim=(516 + 256), activation='relu')(x)
x = Dense(256, activation='relu')(x) x = Dense(256, activation='relu')(x)
x = Dropout(0.3)(x) x = Dropout(0.3)(x)
x = Dense(256, activation='relu')(x) x = Dense(512, activation='relu')(x)
x = Dropout(0.3)(x)
x = Dense(512, activation='relu')(x)
x = Dropout(0.3)(x) x = Dropout(0.3)(x)
x = Dense(256, activation='relu')(x)
x = Dropout(0.2)(x)
x = Dense(nn_output_dim, activation='sigmoid')(x) x = Dense(nn_output_dim, activation='sigmoid')(x)

View File

@ -2,13 +2,13 @@
(jobName="accetuation_nn") (jobName="accetuation_nn")
(executable="workbench.sh") (executable="workbench.sh")
(inputfiles= (inputfiles=
("workbench.py" "")("prepare_data.py" "")("content_shuffle_vector.h5" "cnn/internal_representations/inputs/content_shuffle_vector.h5")("shuffle_vector_test.h5" "cnn/internal_representations/inputs/shuffle_vector_test.h5")("shuffle_vector_train.h5" "cnn/internal_representations/inputs/shuffle_vector_train.h5")("shuffle_vector_validate.h5" "cnn/internal_representations/inputs/shuffle_vector_validate.h5")("SlovarIJS_BESEDE_utf8.lex" "data/SlovarIJS_BESEDE_utf8.lex")("40_epoch.h5" "")("40_epoch_history.pkl" "") ("workbench.py" "")("prepare_data.py" "")("content_shuffle_vector.h5" "cnn/internal_representations/inputs/content_shuffle_vector.h5")("shuffle_vector_test.h5" "cnn/internal_representations/inputs/shuffle_vector_test.h5")("shuffle_vector_train.h5" "cnn/internal_representations/inputs/shuffle_vector_train.h5")("shuffle_vector_validate.h5" "cnn/internal_representations/inputs/shuffle_vector_validate.h5")("SlovarIJS_BESEDE_utf8.lex" "data/SlovarIJS_BESEDE_utf8.lex")("40_epoch.h5" "")("40_epoch_history.pkl" "")("notes" "")
) )
(outputfiles=("40_epoch.h5" "")("workbench.py" "")("workbench.sh" "")("40_epoch_history.pkl" "") (outputfiles=("40_epoch.h5" "")("workbench.py" "")("workbench.sh" "")("40_epoch_history.pkl" "")("notes" "")
) )
(stdout="out.txt") (stdout="out.txt")
(stderr="err.txt") (stderr="err.txt")
(gmlog="gmlog") (gmlog="gmlog")
(runtimeenvironment="APPS/BASE/THEANO-GPU-0.9") (runtimeenvironment="APPS/BASE/THEANO-GPU-0.9")
(gridTime=2000) (gridTime=750)
(memory=12000) (memory=12000)