Merge branch 'main' into 3/8/22

gpu_bdb/queries/q01/gpu_bdb_query_01_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -70,8 +71,11 @@ def main(data_dir, client, c, config):
     c.drop_table("distinct_table")
     return result
 
-
-if __name__ == "__main__":
+@annotate("QUERY1", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q02/gpu_bdb_query_02_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -82,7 +83,11 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+@annotate("QUERY2", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q03/gpu_bdb_query_03_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -95,7 +96,11 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+@annotate("QUERY3", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q04/gpu_bdb_query_04_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 import cudf
 
 from bdb_tools.cluster_startup import attach_to_cluster
@@ -88,7 +89,11 @@ def main(data_dir, client, c, config):
     return result_df
 
 
-if __name__ == "__main__":
+@annotate("QUERY4", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q05/gpu_bdb_query_05_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 from dask.distributed import wait
 from dask import delayed
@@ -91,7 +92,11 @@ def main(data_dir, client, c, config):
     return results_dict
 
 
-if __name__ == "__main__":
+@annotate("QUERY5", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q06/gpu_bdb_query_06_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -96,8 +97,11 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+@annotate("QUERY6", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
 
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q07/gpu_bdb_query_07_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -68,7 +69,11 @@ def main(data_dir, client, c, config):
     return result
 
 
+@annotate("QUERY7", color="green", domain="gpu-bdb")
+def start_run():
+    config = gpubdb_argparser()
+    client, c = attach_to_cluster(config, create_sql_context=True)
+    run_query(config=config, client=client, query_func=main, sql_context=c)
+
 if __name__ == "__main__":
-	config = gpubdb_argparser()
-	client, c = attach_to_cluster(config, create_sql_context=True)
-	run_query(config=config, client=client, query_func=main, sql_context=c)
+    start_run()    

gpu_bdb/queries/q08/gpu_bdb_query_08_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -131,7 +132,11 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+@annotate("QUERY8", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q09/gpu_bdb_query_09_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -119,7 +120,11 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+@annotate("QUERY9", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q10/gpu_bdb_query_10_dask_sql.py

@@ -149,7 +149,11 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+@annotate("QUERY10", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q11/gpu_bdb_query_11_dask_sql.py

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+from nvtx import annotate
 import cudf
 import dask_cudf
 import pandas as pd
@@ -69,7 +71,11 @@ def main(data_dir, client, c, config):
     return result_df
 
 
-if __name__ == "__main__":
+@annotate("QUERY11", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q12/gpu_bdb_query_12_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -61,7 +62,11 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+@annotate("QUERY12", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q13/gpu_bdb_query_13_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -95,7 +96,11 @@ def main(data_dir, client, c, config):
     return result
 
 
+@annotate("QUERY13", color="green", domain="gpu-bdb")
+def start_run():
+    config = gpubdb_argparser()
+    client, c = attach_to_cluster(config, create_sql_context=True)
+    run_query(config=config, client=client, query_func=main, sql_context=c)
+
 if __name__ == "__main__":
-	config = gpubdb_argparser()
-	client, c = attach_to_cluster(config, create_sql_context=True)
-	run_query(config=config, client=client, query_func=main, sql_context=c)
+    start_run()    

gpu_bdb/queries/q14/gpu_bdb_query_14_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -49,8 +50,11 @@ def main(data_dir, client, c, config):
     result = c.sql(query)
     return result
 
+@annotate("QUERY14", color="green", domain="gpu-bdb")
+def start_run():
+    config = gpubdb_argparser()
+    client, c = attach_to_cluster(config, create_sql_context=True)
+    run_query(config=config, client=client, query_func=main, sql_context=c)
 
 if __name__ == "__main__":
-	config = gpubdb_argparser()
-	client, c = attach_to_cluster(config, create_sql_context=True)
-	run_query(config=config, client=client, query_func=main, sql_context=c)
+    start_run()    

gpu_bdb/queries/q15/gpu_bdb_query_15_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -65,8 +66,11 @@ def main(data_dir, client, c, config):
     result = c.sql(query)
     return result
 
-
-if __name__ == "__main__":
+@annotate("QUERY15", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q16/gpu_bdb_query_16_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 import cudf
@@ -92,7 +93,11 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+@annotate("QUERY16", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q17/gpu_bdb_query_17_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 from bdb_tools.cluster_startup import attach_to_cluster
 
 from bdb_tools.utils import (
@@ -79,7 +80,11 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+@annotate("QUERY17", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()    

gpu_bdb/queries/q18/gpu_bdb_query_18_dask_sql.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+from nvtx import annotate
 import os
 
 from bdb_tools.cluster_startup import attach_to_cluster
@@ -233,7 +234,12 @@ def main(data_dir, client, c, config):
     return result
 
 
-if __name__ == "__main__":
+
+@annotate("QUERY18", color="green", domain="gpu-bdb")
+def start_run():
     config = gpubdb_argparser()
     client, c = attach_to_cluster(config, create_sql_context=True)
     run_query(config=config, client=client, query_func=main, sql_context=c)
+
+if __name__ == "__main__":
+    start_run()