From d0047672865351125dbb9cd94f4ef56095be111e Mon Sep 17 00:00:00 2001 From: Lucas Molander Date: Mon, 8 May 2023 14:25:44 -0400 Subject: [PATCH] Minor updates to gen_feature_services.py script and README --- README.md | 18 +++++++++--------- feature_services.py | 36 ++++++++++++++++++------------------ gen_feature_services.py | 13 +++---------- run_vegeta_all.sh | 12 ++++++------ 4 files changed, 36 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index aa0834a..cb5f8f7 100644 --- a/README.md +++ b/README.md @@ -22,19 +22,19 @@ test_datasource = BatchSource( ``` ### Feature Services -- `fs_non_aggregate_1_feature_views` +- `fs_nonagg_1_fv` - 1 non-aggregate feature view -- `fs_non_aggregate_2_feature_views` - - 2 non-aggregate feature view -- `fs_non_aggregate_4_feature_views` - - 4 non-aggregate feature view -- `fs_mixed_5_feature_views` +- `fs_nonagg_2_fv` + - 2 non-aggregate feature views +- `fs_nonagg_4_fv` + - 4 non-aggregate feature views +- `fs_mixed_5_fv` - 5 feature views - - 4 aggregate and 1 non-aggregate feature views -- `fs_mixed_10_feature_views` + - 4 aggregate and 1 non-aggregate feature view +- `fs_mixed_10_fv` - 10 feature views - 8 aggregate and 2 non-aggregate feature views -- `fs_mixed_18_feature_views` +- `fs_mixed_18_fv` - 18 feature views - 14 aggregate and 4 non-aggregate feature views diff --git a/feature_services.py b/feature_services.py index 8d316b6..f9ba380 100644 --- a/feature_services.py +++ b/feature_services.py @@ -9959,42 +9959,42 @@ def load_test_window_336_9109c85a45b703f87f1413a405549a2cea9ab556(data): {data} ''' -fs_mixed_5_feature_views = FeatureService( - name='fs_mixed_5_feature_views', +fs_mixed_5_fv = FeatureService( + name='fs_mixed_5_fv', features=[load_test_lifetime_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c, load_test_window_28_fa35e192121eabf3dabf9f5ea6abdbcbc107ac3b, load_test_window_7_0a57cb53ba59c46fc4b692527a38a87c78d84028, load_test_window_1_92cfceb39d57d914ed8b14d0e37643de0797ae56, load_test_window_336_c5b76da3e608d34edb07244cd9b875ee86906328] ) -fs_mixed_10_feature_views = FeatureService( - name='fs_mixed_10_feature_views', +fs_mixed_10_fv = FeatureService( + name='fs_mixed_10_fv', features=[load_test_lifetime_356a192b7913b04c54574d18c28d46e6395428ab, load_test_window_28_f1abd670358e036c31296e66b3b66c382ac00812, load_test_window_7_7719a1c782a1ba91c031a682a0a2f8658209adbf, load_test_window_1_0286dd552c9bea9a69ecb3759e7b94777635514b, load_test_window_336_80e28a51cbc26fa4bd34938c5e593b36146f5e0c, load_test_lifetime_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c, load_test_window_28_fa35e192121eabf3dabf9f5ea6abdbcbc107ac3b, load_test_window_7_0a57cb53ba59c46fc4b692527a38a87c78d84028, load_test_window_1_92cfceb39d57d914ed8b14d0e37643de0797ae56, load_test_window_336_c5b76da3e608d34edb07244cd9b875ee86906328] ) -fs_mixed_18_feature_views = FeatureService( - name='fs_mixed_18_feature_views', +fs_mixed_18_fv = FeatureService( + name='fs_mixed_18_fv', features=[load_test_lifetime_da4b9237bacccdf19c0760cab7aec4a8359010b0, load_test_lifetime_77de68daecd823babbb58edb1c8e14d7106e83bb, load_test_window_28_1574bddb75c78a6fd2251d61e2993b5146201319, load_test_window_28_0716d9708d321ffb6a00818614779e779925365c, load_test_window_7_22d200f8670dbdb3e253a90eee5098477c95c23d, load_test_window_7_632667547e7cd3e0466547863e1207a8c0c0c549, load_test_window_1_98fbc42faedc02492397cb5962ea3a3ffc0a9243, load_test_window_336_8effee409c625e1a2d8f5033631840e6ce1dcb64, load_test_lifetime_356a192b7913b04c54574d18c28d46e6395428ab, load_test_window_28_f1abd670358e036c31296e66b3b66c382ac00812, load_test_window_7_7719a1c782a1ba91c031a682a0a2f8658209adbf, load_test_window_1_0286dd552c9bea9a69ecb3759e7b94777635514b, load_test_window_336_80e28a51cbc26fa4bd34938c5e593b36146f5e0c, load_test_lifetime_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c, load_test_window_28_fa35e192121eabf3dabf9f5ea6abdbcbc107ac3b, load_test_window_7_0a57cb53ba59c46fc4b692527a38a87c78d84028, load_test_window_1_92cfceb39d57d914ed8b14d0e37643de0797ae56, load_test_window_336_c5b76da3e608d34edb07244cd9b875ee86906328] ) -fs_non_aggregate_1_feature_views = FeatureService( - name='fs_non_aggregate_1_feature_views', +fs_nonagg_1_fv = FeatureService( + name='fs_nonagg_1_fv', features=[load_test_lifetime_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c] ) -fs_non_aggregate_2_feature_views = FeatureService( - name='fs_non_aggregate_2_feature_views', +fs_nonagg_2_fv = FeatureService( + name='fs_nonagg_2_fv', features=[load_test_lifetime_356a192b7913b04c54574d18c28d46e6395428ab, load_test_lifetime_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c] ) -fs_non_aggregate_4_feature_views = FeatureService( - name='fs_non_aggregate_4_feature_views', +fs_nonagg_4_fv = FeatureService( + name='fs_nonagg_4_fv', features=[load_test_lifetime_da4b9237bacccdf19c0760cab7aec4a8359010b0, load_test_lifetime_77de68daecd823babbb58edb1c8e14d7106e83bb, load_test_lifetime_356a192b7913b04c54574d18c28d46e6395428ab, load_test_lifetime_b6589fc6ab0dc82cf12099d1c2d40ab994e8410c] ) ALL_FEATURE_SERVICES = [ - "fs_mixed_5_feature_views", - "fs_mixed_10_feature_views", - "fs_mixed_18_feature_views", - "fs_non_aggregate_1_feature_views", - "fs_non_aggregate_2_feature_views", - "fs_non_aggregate_4_feature_views", + "fs_mixed_5_fv", + "fs_mixed_10_fv", + "fs_mixed_18_fv", + "fs_nonagg_1_fv", + "fs_nonagg_2_fv", + "fs_nonagg_4_fv", ] \ No newline at end of file diff --git a/gen_feature_services.py b/gen_feature_services.py index b2e474b..864102b 100755 --- a/gen_feature_services.py +++ b/gen_feature_services.py @@ -133,14 +133,6 @@ def main(): ("1", "1", (50, 50, 100, 800)), ('336', "7", (13, 12, 25, 200)) ] - # - # splits = [ - # ("lifetime", None, (1,2, 3, 4)), - # ("28d", "7d", (1,2, 3, 4)), - # ("7d", "1d", (1,2, 3, 4)), - # ("1d", "1h", (1,2, 3, 4)), - # ('336d', "7d", (1,2, 3, 4)) - # ] start_year=2020 start_month=10 start_day=10 @@ -202,12 +194,13 @@ def main(): feature_view_num += 1 fs_prefix = "fs" + fv_suffix = "fv" all_feature_services = [] for i in range(N_MIXED_FS): features = fs[i] if i > 0: fs[i] += fs[i-1] - name = f"{fs_prefix}_mixed_{len(features)}_feature_views" + name = f"{fs_prefix}_mixed_{len(features)}_{fv_suffix}" all_feature_services.append(name) code += gen_feature_service(name, features) for i in range(N_MIXED_FS, N_MIXED_FS*2): @@ -216,7 +209,7 @@ def main(): for feature in features: if "load_test_lifetime" in feature: tfv_features.append(feature) - name = f"{fs_prefix}_non_aggregate_{len(tfv_features)}_feature_views" + name = f"{fs_prefix}_nonagg_{len(tfv_features)}_{fv_suffix}" all_feature_services.append(name) code += gen_feature_service(name, tfv_features) diff --git a/run_vegeta_all.sh b/run_vegeta_all.sh index 522d7b1..b42acfe 100755 --- a/run_vegeta_all.sh +++ b/run_vegeta_all.sh @@ -5,10 +5,10 @@ # or just as a reference to paste line(s) into your console. # -./run_vegeta.py --service fs_mixed_5_feature_views --file -r 5 -d 10 -t 5000 & -./run_vegeta.py --service fs_mixed_10_feature_views --file -r 5 -d 10 -t 5000 & -./run_vegeta.py --service fs_mixed_18_feature_views --file -r 5 -d 10 -t 5000 & -./run_vegeta.py --service fs_non_aggregate_1_feature_views --file -r 5 -d 10 -t 5000 & -./run_vegeta.py --service fs_non_aggregate_2_feature_views --file -r 5 -d 10 -t 5000 & -./run_vegeta.py --service fs_non_aggregate_4_feature_views --file -r 5 -d 10 -t 5000 & +./run_vegeta.py --service fs_mixed_5_fv --file -r 5 -d 10 -t 5000 & +./run_vegeta.py --service fs_mixed_10_fv --file -r 5 -d 10 -t 5000 & +./run_vegeta.py --service fs_mixed_18_fv --file -r 5 -d 10 -t 5000 & +./run_vegeta.py --service fs_nonagg_1_fv --file -r 5 -d 10 -t 5000 & +./run_vegeta.py --service fs_nonagg_2_fv --file -r 5 -d 10 -t 5000 & +./run_vegeta.py --service fs_nonagg_4_fv --file -r 5 -d 10 -t 5000 &