DL: Add tests for schema qualified output tables
JIRA: MADLIB-1417
This commit changes some tests to use public schema (instead
of the default install check schema) for output tables to ensure
that the DL functions do not fail under these circumstances.
diff --git a/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_averaging_e2e.sql_in b/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_averaging_e2e.sql_in
index d246f8d..658edd2 100644
--- a/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_averaging_e2e.sql_in
+++ b/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_averaging_e2e.sql_in
@@ -32,7 +32,7 @@
DROP TABLE if exists iris_model, iris_model_summary;
SELECT madlib_keras_fit(
'iris_data_packed',
- 'iris_model',
+ 'public.iris_model',
'iris_model_arch',
1,
$$loss='categorical_crossentropy', optimizer='Adam(lr=0.01)', metrics=['accuracy']$$,
@@ -45,7 +45,7 @@
model_arch_table = 'iris_model_arch' AND
validation_table is NULL AND
source_table = 'iris_data_packed' AND
- model = 'iris_model' AND
+ model = 'public.iris_model' AND
dependent_varname = 'class_text' AND
independent_varname = 'attributes' AND
madlib_version is NOT NULL AND
@@ -57,31 +57,31 @@
dependent_vartype LIKE '%char%' AND
normalizing_const = 1,
'Keras Fit Multiple Output Summary Validation failed. Actual:' || __to_char(summary))
-FROM (SELECT * FROM iris_model_summary) summary;
+FROM (SELECT * FROM public.iris_model_summary) summary;
-- Run Predict
-DROP TABLE IF EXISTS iris_predict;
+DROP TABLE IF EXISTS public.iris_predict;
SELECT madlib_keras_predict(
- 'iris_model',
+ 'public.iris_model',
'iris_data',
'id',
'attributes',
- 'iris_predict',
+ 'public.iris_predict',
'prob',
FALSE);
-- Run Evaluate
-DROP TABLE IF EXISTS evaluate_out;
+DROP TABLE IF EXISTS public.evaluate_out;
SELECT madlib_keras_evaluate(
- 'iris_model',
+ 'public.iris_model',
'iris_data_val',
- 'evaluate_out',
+ 'public.evaluate_out',
FALSE);
SELECT assert(loss >= 0 AND
metric >= 0 AND
metrics_type = '{accuracy}', 'Evaluate output validation failed. Actual:' || __to_char(evaluate_out))
-FROM evaluate_out;
+FROM public.evaluate_out;
-- Test for one-hot encoded user input data
DROP TABLE if exists iris_model, iris_model_summary, iris_model_info;
diff --git a/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_selection_e2e.sql_in b/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_selection_e2e.sql_in
index eb4dd10..4995aed 100644
--- a/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_selection_e2e.sql_in
+++ b/src/ports/postgres/modules/deep_learning/test/madlib_keras_model_selection_e2e.sql_in
@@ -33,7 +33,7 @@
DROP TABLE IF EXISTS mst_table, mst_table_summary;
SELECT load_model_selection_table(
'iris_model_arch',
- 'mst_table',
+ 'public.mst_table',
ARRAY[1],
ARRAY[
$$loss='categorical_crossentropy', optimizer='Adam(lr=0.01)', metrics=['accuracy']$$,
@@ -48,8 +48,8 @@
DROP TABLE if exists iris_multiple_model, iris_multiple_model_summary, iris_multiple_model_info;
SELECT madlib_keras_fit_multiple_model(
'iris_data_packed',
- 'iris_multiple_model',
- 'mst_table',
+ 'public.iris_multiple_model',
+ 'public.mst_table',
3,
FALSE
);
@@ -57,9 +57,9 @@
SELECT assert(
model_arch_table = 'iris_model_arch' AND
validation_table is NULL AND
- model_info = 'iris_multiple_model_info' AND
+ model_info = 'public.iris_multiple_model_info' AND
source_table = 'iris_data_packed' AND
- model = 'iris_multiple_model' AND
+ model = 'public.iris_multiple_model' AND
dependent_varname = 'class_text' AND
independent_varname = 'attributes' AND
madlib_version is NOT NULL AND
@@ -71,40 +71,40 @@
dependent_vartype LIKE '%char%' AND
normalizing_const = 1,
'Keras Fit Multiple Output Summary Validation failed. Actual:' || __to_char(summary))
-FROM (SELECT * FROM iris_multiple_model_summary) summary;
+FROM (SELECT * FROM public.iris_multiple_model_summary) summary;
-- Run Predict
-DROP TABLE IF EXISTS iris_predict;
+DROP TABLE IF EXISTS public.iris_predict;
SELECT madlib_keras_predict(
- 'iris_multiple_model',
+ 'public.iris_multiple_model',
'iris_data',
'id',
'attributes',
- 'iris_predict',
+ 'public.iris_predict',
'prob',
NULL,
1);
-- Run Evaluate
-DROP TABLE IF EXISTS evaluate_out;
+DROP TABLE IF EXISTS public.evaluate_out;
SELECT madlib_keras_evaluate(
- 'iris_multiple_model',
+ 'public.iris_multiple_model',
'iris_data_val',
- 'evaluate_out',
+ 'public.evaluate_out',
NULL,
1);
SELECT assert(loss >= 0 AND
metric >= 0 AND
metrics_type = '{accuracy}', 'Evaluate output validation failed. Actual:' || __to_char(evaluate_out))
-FROM evaluate_out;
+FROM public.evaluate_out;
-- Test for one-hot encoded user input data
DROP TABLE if exists iris_multiple_model, iris_multiple_model_summary, iris_multiple_model_info;
SELECT madlib_keras_fit_multiple_model(
'iris_data_one_hot_encoded_packed',
'iris_multiple_model',
- 'mst_table',
+ 'public.mst_table',
3,
FALSE
);
