This is an automated email from the ASF dual-hosted git repository. domino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/madlib.git
commit b20119dd1bc21a221db843c0288853f257f6e610 Author: Domino Valdano <dvald...@vmware.com> AuthorDate: Thu Sep 24 20:00:39 2020 -0700 Convert EXECUTE to PERFORM EXECUTE is supposed to act on a string, PERFORM on a query. I think the EXECUTE was only working because the call to assert() returns NULL, which I guess is treated as '' (so it runs SELECT ''). I'm not sure it matters in this case, but this way is more straightforward. --- .../test/madlib_keras_model_selection.sql_in | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_selection.sql_in b/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_selection.sql_in index d39f2a0..0c29246 100644 --- a/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_selection.sql_in +++ b/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_selection.sql_in @@ -348,16 +348,16 @@ CREATE OR REPLACE FUNCTION test_fit_multiple_one_hot_encoded_input(caching boole RETURNS VOID AS $$ BEGIN -EXECUTE madlib_keras_fit_multiple_model( - 'iris_data_one_hot_encoded_packed'::VARCHAR, - 'iris_multiple_model'::VARCHAR, - 'mst_table_4row'::VARCHAR, - 3, - FALSE, NULL, NULL, NULL, NULL, NULL, - caching +PERFORM madlib_keras_fit_multiple_model( + 'iris_data_one_hot_encoded_packed'::VARCHAR, + 'iris_multiple_model'::VARCHAR, + 'mst_table_4row'::VARCHAR, + 3, + FALSE, NULL, NULL, NULL, NULL, NULL, + caching ); -EXECUTE assert( +PERFORM assert( model_arch_table = 'iris_model_arch' AND validation_table is NULL AND model_info = 'iris_multiple_model_info' AND @@ -378,7 +378,7 @@ EXECUTE assert( 'Keras Fit Multiple Output Summary Validation failed when user passes in 1-hot encoded label vector. Actual:' || __to_char(summary)) FROM (SELECT * FROM iris_multiple_model_summary) summary; END; -$$ language plpgsql; +$$ language plpgsql VOLATILE; DROP TABLE if exists iris_multiple_model, iris_multiple_model_summary, iris_multiple_model_info; SELECT test_fit_multiple_one_hot_encoded_input(FALSE); @@ -435,8 +435,8 @@ RETURNS VOID AS $$ BEGIN -EXECUTE setseed(0); -EXECUTE madlib_keras_fit_multiple_model( +PERFORM setseed(0); +PERFORM madlib_keras_fit_multiple_model( 'iris_data_packed', 'iris_multiple_model', 'mst_table', @@ -446,7 +446,7 @@ EXECUTE madlib_keras_fit_multiple_model( caching ); -EXECUTE assert( +PERFORM assert( source_table = 'iris_data_packed' AND validation_table = 'iris_data_one_hot_encoded_packed' AND model = 'iris_multiple_model' AND @@ -467,7 +467,7 @@ EXECUTE assert( 'Keras Fit Multiple Output Summary Validation failed. Actual:' || __to_char(summary)) FROM (SELECT * FROM iris_multiple_model_summary) summary; -EXECUTE assert(COUNT(*)=3, 'Info table must have exactly same rows as the number of msts.') +PERFORM assert(COUNT(*)=3, 'Info table must have exactly same rows as the number of msts.') FROM iris_multiple_model_info; PERFORM assert( @@ -488,22 +488,22 @@ PERFORM assert( 'Keras Fit Multiple Output Info Validation failed. Actual:' || __to_char(info)) FROM (SELECT * FROM iris_multiple_model_info limit 1) info; -EXECUTE assert(cnt = 1, +PERFORM assert(cnt = 1, 'Keras Fit Multiple Output Info compile params validation failed. Actual:' || __to_char(info)) FROM (SELECT count(*) cnt FROM iris_multiple_model_info WHERE compile_params = $MAD$loss='categorical_crossentropy', optimizer='Adam(lr=0.01)', metrics=['accuracy']$MAD$::text) info; -EXECUTE assert(cnt = 1, +PERFORM assert(cnt = 1, 'Keras Fit Multiple Output Info compile params validation failed. Actual:' || __to_char(info)) FROM (SELECT count(*) cnt FROM iris_multiple_model_info WHERE compile_params = $MAD$loss='categorical_crossentropy', optimizer='Adam(lr=0.001)', metrics=['accuracy']$MAD$::text) info; -EXECUTE assert(cnt = 1, +PERFORM assert(cnt = 1, 'Keras Fit Multiple Output Info compile params validation failed. Actual:' || __to_char(info)) FROM (SELECT count(*) cnt FROM iris_multiple_model_info WHERE compile_params = $MAD$loss='categorical_crossentropy', optimizer='Adam(lr=0.0001)', metrics=['accuracy']$MAD$::text) info; -EXECUTE assert( +PERFORM assert( training_loss[6]-training_loss[1] < 0.1 AND training_metrics[6]-training_metrics[1] > -0.1, 'The loss and accuracy should have improved with more iterations.' @@ -526,7 +526,7 @@ RETURNS VOID AS $$ BEGIN -EXECUTE madlib_keras_fit_multiple_model( +PERFORM madlib_keras_fit_multiple_model( 'iris_data_packed', 'iris_multiple_model', 'mst_table_1row', @@ -540,10 +540,10 @@ EXECUTE madlib_keras_fit_multiple_model( caching ); -EXECUTE assert(COUNT(*)=1, 'Info table must have exactly same rows as the number of msts.') +PERFORM assert(COUNT(*)=1, 'Info table must have exactly same rows as the number of msts.') FROM iris_multiple_model_info; -EXECUTE assert( +PERFORM assert( model_id = 1 AND model_type = 'madlib_keras' AND model_size > 0 AND @@ -557,18 +557,18 @@ EXECUTE assert( 'Keras Fit Multiple Output Info Validation failed. Actual:' || __to_char(info)) FROM (SELECT * FROM iris_multiple_model_info) info; -EXECUTE assert(metrics_elapsed_time[3] - metrics_elapsed_time[1] > 0, +PERFORM assert(metrics_elapsed_time[3] - metrics_elapsed_time[1] > 0, 'Keras Fit Multiple invalid elapsed time calculation.') FROM (SELECT * FROM iris_multiple_model_info) info; -EXECUTE assert( +PERFORM assert( name = 'multi_model_name' AND description = 'multi_model_descr' AND metrics_compute_frequency = 1, 'Keras Fit Multiple Output Summary Validation failed. Actual:' || __to_char(summary)) FROM (SELECT * FROM iris_multiple_model_summary) summary; -EXECUTE assert(cnt = 1, +PERFORM assert(cnt = 1, 'Keras Fit Multiple Output Info compile params validation failed. Actual:' || __to_char(info)) FROM (SELECT count(*) cnt FROM iris_multiple_model_info WHERE compile_params = $MAD$loss='categorical_crossentropy', optimizer='Adam(lr=0.01)', metrics=['accuracy']$MAD$::text) info; @@ -588,7 +588,7 @@ RETURNS VOID AS $$ BEGIN -EXECUTE madlib_keras_fit_multiple_model( +PERFORM madlib_keras_fit_multiple_model( 'iris_data_packed', 'iris_multiple_model', 'mst_table_4row', @@ -602,7 +602,7 @@ EXECUTE madlib_keras_fit_multiple_model( -- reset after calling fit_multiple PERFORM CASE WHEN is_ver_greater_than_gp_640_or_pg_11() is TRUE THEN assert_guc_value('dev_opt_unsafe_truncate_in_subtransaction', 'off') END; -EXECUTE assert(COUNT(*)=4, 'Info table must have exactly same rows as the number of msts.') +PERFORM assert(COUNT(*)=4, 'Info table must have exactly same rows as the number of msts.') FROM iris_multiple_model_info; PERFORM assert( @@ -618,7 +618,7 @@ PERFORM assert( 'Keras Fit Multiple Output Info Validation failed. Actual:' || __to_char(info)) FROM (SELECT * FROM iris_multiple_model_info) info; -EXECUTE assert(cnt = 1, +PERFORM assert(cnt = 1, 'Keras Fit Multiple Output Info compile params validation failed. Actual:' || __to_char(info)) FROM (SELECT count(*) cnt FROM iris_multiple_model_info WHERE compile_params = $MAD$loss='categorical_crossentropy', optimizer='Adam(lr=0.01)', metrics=['accuracy']$MAD$::text