From 6eba9030ed188bf89dffb1d449550b809356c03e Mon Sep 17 00:00:00 2001 From: Brendan Slabe Date: Mon, 9 Dec 2024 17:40:03 +0000 Subject: [PATCH 1/7] first commit --- jetstream_pt/cli.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jetstream_pt/cli.py b/jetstream_pt/cli.py index cd27046..6a8bbb3 100644 --- a/jetstream_pt/cli.py +++ b/jetstream_pt/cli.py @@ -27,6 +27,7 @@ flags.DEFINE_integer("max_input_length", 1024, "The batch size") flags.DEFINE_integer("max_output_length", 1024, "The batch size") flags.DEFINE_integer("port", 9000, "port to listen on") +flags.DEFINE_integer("prometheus_port", 0, "prometheus metrics port") flags.DEFINE_integer("threads", 64, "number of worker threads in thread pool") flags.DEFINE_string( "benchmark_save_offline_result_to_file", @@ -104,6 +105,11 @@ def serve(): print(f"server_config: {server_config}") metrics_server_config: MetricsServerConfig | None = None + if config.prometheus_port != 0: + if 1 <= config.prometheus_port <= 65535: + metrics_server_config = MetricsServerConfig(port=config.prometheus_port) + else: + raise ValueError(f"Invalid port number: {config.prometheus_port}. Port must be between 1 and 65535.") # We separate credential from run so that we can unit test it with local credentials. # We would like to add grpc credentials for OSS. From ce7f2816d40768a3ce641ed407ab5a28cdc20d8a Mon Sep 17 00:00:00 2001 From: Brendan Slabe Date: Mon, 9 Dec 2024 17:42:34 +0000 Subject: [PATCH 2/7] config -> flags --- jetstream_pt/cli.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jetstream_pt/cli.py b/jetstream_pt/cli.py index 6a8bbb3..068f588 100644 --- a/jetstream_pt/cli.py +++ b/jetstream_pt/cli.py @@ -106,10 +106,10 @@ def serve(): metrics_server_config: MetricsServerConfig | None = None if config.prometheus_port != 0: - if 1 <= config.prometheus_port <= 65535: - metrics_server_config = MetricsServerConfig(port=config.prometheus_port) + if 1 <= FLAGS.prometheus_port <= 65535: + metrics_server_config = MetricsServerConfig(port=FLAGS.prometheus_port) else: - raise ValueError(f"Invalid port number: {config.prometheus_port}. Port must be between 1 and 65535.") + raise ValueError(f"Invalid port number: {FLAGS.prometheus_port}. Port must be between 1 and 65535.") # We separate credential from run so that we can unit test it with local credentials. # We would like to add grpc credentials for OSS. From 582a4e34557432a17ba992d80122ec7dc9325358 Mon Sep 17 00:00:00 2001 From: Brendan Slabe Date: Mon, 9 Dec 2024 17:43:28 +0000 Subject: [PATCH 3/7] config -> flags --- jetstream_pt/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetstream_pt/cli.py b/jetstream_pt/cli.py index 068f588..1b90306 100644 --- a/jetstream_pt/cli.py +++ b/jetstream_pt/cli.py @@ -105,7 +105,7 @@ def serve(): print(f"server_config: {server_config}") metrics_server_config: MetricsServerConfig | None = None - if config.prometheus_port != 0: + if FLAGS.prometheus_port != 0: if 1 <= FLAGS.prometheus_port <= 65535: metrics_server_config = MetricsServerConfig(port=FLAGS.prometheus_port) else: From b16b7f294d0fdead8438fc6679a033fa388a82c4 Mon Sep 17 00:00:00 2001 From: Brendan Slabe Date: Mon, 9 Dec 2024 17:51:37 +0000 Subject: [PATCH 4/7] fmt --- jetstream_pt/cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jetstream_pt/cli.py b/jetstream_pt/cli.py index 1b90306..793f0ff 100644 --- a/jetstream_pt/cli.py +++ b/jetstream_pt/cli.py @@ -107,9 +107,9 @@ def serve(): metrics_server_config: MetricsServerConfig | None = None if FLAGS.prometheus_port != 0: if 1 <= FLAGS.prometheus_port <= 65535: - metrics_server_config = MetricsServerConfig(port=FLAGS.prometheus_port) + metrics_server_config = MetricsServerConfig(port=FLAGS.prometheus_port) else: - raise ValueError(f"Invalid port number: {FLAGS.prometheus_port}. Port must be between 1 and 65535.") + raise ValueError(f"Invalid port number: {FLAGS.prometheus_port}. Port must be between 1 and 65535.") # We separate credential from run so that we can unit test it with local credentials. # We would like to add grpc credentials for OSS. From 36aecde89fba9bc3c41f84f312183c802c91a1d5 Mon Sep 17 00:00:00 2001 From: Brendan Slabe Date: Wed, 22 Jan 2025 22:41:45 +0000 Subject: [PATCH 5/7] first commit --- jetstream_pt/cli.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jetstream_pt/cli.py b/jetstream_pt/cli.py index 793f0ff..c7d2f19 100644 --- a/jetstream_pt/cli.py +++ b/jetstream_pt/cli.py @@ -107,7 +107,10 @@ def serve(): metrics_server_config: MetricsServerConfig | None = None if FLAGS.prometheus_port != 0: if 1 <= FLAGS.prometheus_port <= 65535: - metrics_server_config = MetricsServerConfig(port=FLAGS.prometheus_port) + metrics_server_config = MetricsServerConfig( + port=FLAGS.prometheus_port + model_name=FLAGS.model_name + ) else: raise ValueError(f"Invalid port number: {FLAGS.prometheus_port}. Port must be between 1 and 65535.") From 8b4506c11b5a3e3956c53e32ee6d3570fcd107dd Mon Sep 17 00:00:00 2001 From: Brendan Slabe Date: Thu, 23 Jan 2025 22:11:27 +0000 Subject: [PATCH 6/7] missing comma --- jetstream_pt/cli.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jetstream_pt/cli.py b/jetstream_pt/cli.py index 5a4e23d..3b61780 100644 --- a/jetstream_pt/cli.py +++ b/jetstream_pt/cli.py @@ -111,9 +111,8 @@ def serve(): if FLAGS.prometheus_port != 0: if 1 <= FLAGS.prometheus_port <= 65535: metrics_server_config = MetricsServerConfig( - port=FLAGS.prometheus_port - model_name=FLAGS.model_name - ) + port=FLAGS.prometheus_port, model_name=FLAGS.model_name + ) else: raise ValueError( f"Invalid port number: {FLAGS.prometheus_port}. Port must be between 1 and 65535." From 5eca683dc15e531f951d285954219817403b52de Mon Sep 17 00:00:00 2001 From: Brendan Slabe Date: Mon, 10 Feb 2025 23:02:54 +0000 Subject: [PATCH 7/7] update submodules --- deps/JetStream | 2 +- deps/xla | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/JetStream b/deps/JetStream index d462ca9..8eb7c5c 160000 --- a/deps/JetStream +++ b/deps/JetStream @@ -1 +1 @@ -Subproject commit d462ca9bbc55531bbe785203cb076e7797250f2a +Subproject commit 8eb7c5c269725afd98485535ebea134cc625bb8a diff --git a/deps/xla b/deps/xla index fb2d4e1..cff9f4e 160000 --- a/deps/xla +++ b/deps/xla @@ -1 +1 @@ -Subproject commit fb2d4e1464dfd96f38a343c0e6f512629e28b48c +Subproject commit cff9f4e0660df37f897f65aaf8d754981c2ba709