Merge branch 'fe' into 'offic'

Fe

See merge request !13

requirements.txt

-tensorflow-gpu==1.15.2
+tensorflow==1.15.2
 keras==2.3.1
 pandas==1.0.5
 scikit-learn==0.23.1

src/models/esmm/fe/tractate_fe.py

@@ -289,6 +289,15 @@ CATEGORICAL_COLUMNS = [
     "is_related_service",
     "service_city",
 ]
+CROSS_COLUMNS = [
+    ["device_fd", "content_fd"],
+    ["device_sd", "content_sd"],
+    ["device_fs", "content_fs"],
+    ["device_ss", "content_ss"],
+    ["device_fp", "content_fp"],
+    ["device_sp", "content_sp"],
+    ["device_p", "content_p"],
+]
 
 
 def read_csv_data(dataset_path):

src/train_tractate.py

@@ -47,7 +47,8 @@ def main():
     train_df, test_df = train_test_split(df, test_size=0.2)
     train_df, val_df = train_test_split(train_df, test_size=0.2)
 
-    all_features = fe.build_features(df, tractate_fe.INT_COLUMNS, tractate_fe.FLOAT_COLUMNS, tractate_fe.CATEGORICAL_COLUMNS)
+    all_features = fe.build_features(df, tractate_fe.INT_COLUMNS, tractate_fe.FLOAT_COLUMNS, tractate_fe.CATEGORICAL_COLUMNS,
+                                     tractate_fe.CROSS_COLUMNS)
     params = {"feature_columns": all_features, "hidden_units": [360, 200, 80, 2], "learning_rate": 0.2}
     model_path = str(Path("/data/files/model_tmp/tractate/").expanduser())
     if os.path.exists(model_path):