Revert "Internal refactor" (#156)

This reverts commit 8e18e7f. Co-authored-by: Yijia J <[email protected]>
AI-Hypercomputer · Dec 16, 2024 · 973647d · 973647d
1 parent 8e18e7f
commit 973647d
Show file tree

Hide file tree

Showing 88 changed files with 2 additions and 1 deletion.
diff --git a/...ird_party/py/jetstream/.github/CODEOWNERS → .github/CODEOWNERS b/...ird_party/py/jetstream/.github/CODEOWNERS → .github/CODEOWNERS
diff --git a/...etstream/.github/workflows/e2e_tests.yaml → .github/workflows/e2e_tests.yaml b/...etstream/.github/workflows/e2e_tests.yaml → .github/workflows/e2e_tests.yaml
diff --git a/.../jetstream/.github/workflows/release.yaml → .github/workflows/release.yaml b/.../jetstream/.github/workflows/release.yaml → .github/workflows/release.yaml
diff --git a/...ithub/workflows/scripts/create_release.js → .github/workflows/scripts/create_release.js b/...ithub/workflows/scripts/create_release.js → .github/workflows/scripts/create_release.js
diff --git a/...tstream/.github/workflows/unit_tests.yaml → .github/workflows/unit_tests.yaml b/...tstream/.github/workflows/unit_tests.yaml → .github/workflows/unit_tests.yaml
diff --git a/google3/third_party/py/jetstream/.gitignore → .gitignore b/google3/third_party/py/jetstream/.gitignore → .gitignore
diff --git a/google3/third_party/py/jetstream/AUTHORS → AUTHORS b/google3/third_party/py/jetstream/AUTHORS → AUTHORS
diff --git a/.../third_party/py/jetstream/CONTRIBUTING.md → CONTRIBUTING.md b/.../third_party/py/jetstream/CONTRIBUTING.md → CONTRIBUTING.md
diff --git a/google3/third_party/py/jetstream/LICENSE → LICENSE b/google3/third_party/py/jetstream/LICENSE → LICENSE
diff --git a/google3/third_party/py/jetstream/MANIFEST.in → MANIFEST.in b/google3/third_party/py/jetstream/MANIFEST.in → MANIFEST.in
diff --git a/google3/third_party/py/jetstream/Makefile → Makefile b/google3/third_party/py/jetstream/Makefile → Makefile
diff --git a/google3/third_party/py/jetstream/README.md → README.md b/google3/third_party/py/jetstream/README.md → README.md
diff --git a/...d_party/py/jetstream/benchmarks/README.md → benchmarks/README.md b/...d_party/py/jetstream/benchmarks/README.md → benchmarks/README.md
diff --git a/...party/py/jetstream/benchmarks/__init__.py → benchmarks/__init__.py b/...party/py/jetstream/benchmarks/__init__.py → benchmarks/__init__.py
diff --git a/...jetstream/benchmarks/benchmark_serving.py → benchmarks/benchmark_serving.py b/...jetstream/benchmarks/benchmark_serving.py → benchmarks/benchmark_serving.py
diff --git a/.../py/jetstream/benchmarks/eval_accuracy.py → benchmarks/eval_accuracy.py b/.../py/jetstream/benchmarks/eval_accuracy.py → benchmarks/eval_accuracy.py
@@ -64,6 +64,7 @@ def main(args):
 
   eval_accuracy(request_outputs_dict)
 
+
 if __name__ == "__main__":
   parser = argparse.ArgumentParser()
   parser.add_argument(

diff --git a/...gpt4_tokenized_llama.calibration_1000.pkl → ...gpt4_tokenized_llama.calibration_1000.pkl b/...gpt4_tokenized_llama.calibration_1000.pkl → ...gpt4_tokenized_llama.calibration_1000.pkl
diff --git a/...y/py/jetstream/benchmarks/requirements.in → benchmarks/requirements.in b/...y/py/jetstream/benchmarks/requirements.in → benchmarks/requirements.in
diff --git a/...prometheus-metrics-in-jetstream-server.md → ...prometheus-metrics-in-jetstream-server.md b/...prometheus-metrics-in-jetstream-server.md → ...prometheus-metrics-in-jetstream-server.md
@@ -80,6 +80,6 @@ echo '{
   }' | kubectl apply -f -
   ```
 
-The metrics can now be queried in the Google Cloud Metrics Explorer. When adding a metrics query with the `+Add Query` button the new metrics should be found under the `Prometheus Target > Jetstream` submenu.
+The metrics can now be queried in the [Google Cloud Metrics Explorer](https://pantheon.corp.google.com/monitoring/metrics-explorer). When adding a metrics query with the `+Add Query` button the new metrics should be found under the `Prometheus Target > Jetstream` submenu.
 
 Additional guides on the metrics explorer can be found [here](https://cloud.google.com/monitoring/charts/metrics-selector).
diff --git a/...s/online-inference-with-maxtext-engine.md → docs/online-inference-with-maxtext-engine.md b/...s/online-inference-with-maxtext-engine.md → docs/online-inference-with-maxtext-engine.md
diff --git a/...ling-with-jax-profiler-and-tensorboard.md → ...ling-with-jax-profiler-and-tensorboard.md b/...ling-with-jax-profiler-and-tensorboard.md → ...ling-with-jax-profiler-and-tensorboard.md
diff --git a/google3/third_party/py/jetstream/__init__.py → jetstream/__init__.py b/google3/third_party/py/jetstream/__init__.py → jetstream/__init__.py
diff --git a/...3/third_party/py/jetstream/core/README.md → jetstream/core/README.md b/...3/third_party/py/jetstream/core/README.md → jetstream/core/README.md
diff --git a/...third_party/py/jetstream/core/__init__.py → jetstream/core/__init__.py b/...third_party/py/jetstream/core/__init__.py → jetstream/core/__init__.py
diff --git a/...ird_party/py/jetstream/core/config_lib.py → jetstream/core/config_lib.py b/...ird_party/py/jetstream/core/config_lib.py → jetstream/core/config_lib.py
diff --git a/...etstream/core/implementations/__init__.py → jetstream/core/implementations/__init__.py b/...etstream/core/implementations/__init__.py → jetstream/core/implementations/__init__.py
diff --git a/...tream/core/implementations/mock/README.md → ...tream/core/implementations/mock/README.md b/...tream/core/implementations/mock/README.md → ...tream/core/implementations/mock/README.md
diff --git a/...eam/core/implementations/mock/__init__.py → ...eam/core/implementations/mock/__init__.py b/...eam/core/implementations/mock/__init__.py → ...eam/core/implementations/mock/__init__.py
diff --git a/...tream/core/implementations/mock/config.py → ...tream/core/implementations/mock/config.py b/...tream/core/implementations/mock/config.py → ...tream/core/implementations/mock/config.py
diff --git a/...tream/core/implementations/mock/server.py → ...tream/core/implementations/mock/server.py b/...tream/core/implementations/mock/server.py → ...tream/core/implementations/mock/server.py
diff --git a/...rty/py/jetstream/core/metrics/__init__.py → jetstream/core/metrics/__init__.py b/...rty/py/jetstream/core/metrics/__init__.py → jetstream/core/metrics/__init__.py
diff --git a/...y/py/jetstream/core/metrics/prometheus.py → jetstream/core/metrics/prometheus.py b/...y/py/jetstream/core/metrics/prometheus.py → jetstream/core/metrics/prometheus.py
diff --git a/...d_party/py/jetstream/core/orchestrator.py → jetstream/core/orchestrator.py b/...d_party/py/jetstream/core/orchestrator.py → jetstream/core/orchestrator.py
diff --git a/...party/py/jetstream/core/proto/__init__.py → jetstream/core/proto/__init__.py b/...party/py/jetstream/core/proto/__init__.py → jetstream/core/proto/__init__.py
diff --git a/...y/py/jetstream/core/proto/jetstream.proto → jetstream/core/proto/jetstream.proto b/...y/py/jetstream/core/proto/jetstream.proto → jetstream/core/proto/jetstream.proto
diff --git a/.../py/jetstream/core/proto/jetstream_pb2.py → jetstream/core/proto/jetstream_pb2.py b/.../py/jetstream/core/proto/jetstream_pb2.py → jetstream/core/proto/jetstream_pb2.py
diff --git a/...etstream/core/proto/jetstream_pb2_grpc.py → jetstream/core/proto/jetstream_pb2_grpc.py b/...etstream/core/proto/jetstream_pb2_grpc.py → jetstream/core/proto/jetstream_pb2_grpc.py
diff --git a/...ird_party/py/jetstream/core/server_lib.py → jetstream/core/server_lib.py b/...ird_party/py/jetstream/core/server_lib.py → jetstream/core/server_lib.py
diff --git a/...party/py/jetstream/core/utils/__init__.py → jetstream/core/utils/__init__.py b/...party/py/jetstream/core/utils/__init__.py → jetstream/core/utils/__init__.py
diff --git a/...jetstream/core/utils/async_multifuture.py → jetstream/core/utils/async_multifuture.py b/...jetstream/core/utils/async_multifuture.py → jetstream/core/utils/async_multifuture.py
diff --git a/...rty/py/jetstream/core/utils/proxy_util.py → jetstream/core/utils/proxy_util.py b/...rty/py/jetstream/core/utils/proxy_util.py → jetstream/core/utils/proxy_util.py
diff --git a/.../py/jetstream/core/utils/return_sample.py → jetstream/core/utils/return_sample.py b/.../py/jetstream/core/utils/return_sample.py → jetstream/core/utils/return_sample.py
diff --git a/...third_party/py/jetstream/engine/README.md → jetstream/engine/README.md b/...third_party/py/jetstream/engine/README.md → jetstream/engine/README.md
diff --git a/...ird_party/py/jetstream/engine/__init__.py → jetstream/engine/__init__.py b/...ird_party/py/jetstream/engine/__init__.py → jetstream/engine/__init__.py
diff --git a/...d_party/py/jetstream/engine/engine_api.py → jetstream/engine/engine_api.py b/...d_party/py/jetstream/engine/engine_api.py → jetstream/engine/engine_api.py
diff --git a/..._party/py/jetstream/engine/mock_engine.py → jetstream/engine/mock_engine.py b/..._party/py/jetstream/engine/mock_engine.py → jetstream/engine/mock_engine.py
diff --git a/...d_party/py/jetstream/engine/mock_utils.py → jetstream/engine/mock_utils.py b/...d_party/py/jetstream/engine/mock_utils.py → jetstream/engine/mock_utils.py
diff --git a/...rty/py/jetstream/engine/sampling_utils.py → jetstream/engine/sampling_utils.py b/...rty/py/jetstream/engine/sampling_utils.py → jetstream/engine/sampling_utils.py
diff --git a/..._party/py/jetstream/engine/token_utils.py → jetstream/engine/token_utils.py b/..._party/py/jetstream/engine/token_utils.py → jetstream/engine/token_utils.py
diff --git a/...party/py/jetstream/engine/tokenizer.proto → jetstream/engine/tokenizer.proto b/...party/py/jetstream/engine/tokenizer.proto → jetstream/engine/tokenizer.proto
diff --git a/...arty/py/jetstream/engine/tokenizer_api.py → jetstream/engine/tokenizer_api.py b/...arty/py/jetstream/engine/tokenizer_api.py → jetstream/engine/tokenizer_api.py
diff --git a/...arty/py/jetstream/engine/tokenizer_pb2.py → jetstream/engine/tokenizer_pb2.py b/...arty/py/jetstream/engine/tokenizer_pb2.py → jetstream/engine/tokenizer_pb2.py
diff --git a/...py/jetstream/engine/tokenizer_pb2_grpc.py → jetstream/engine/tokenizer_pb2_grpc.py b/...py/jetstream/engine/tokenizer_pb2_grpc.py → jetstream/engine/tokenizer_pb2_grpc.py
diff --git a/...party/py/jetstream/engine/warmup_utils.py → jetstream/engine/warmup_utils.py b/...party/py/jetstream/engine/warmup_utils.py → jetstream/engine/warmup_utils.py
diff --git a/...arty/py/jetstream/entrypoints/__init__.py → jetstream/entrypoints/__init__.py b/...arty/py/jetstream/entrypoints/__init__.py → jetstream/entrypoints/__init__.py
diff --git a/..._party/py/jetstream/entrypoints/config.py → jetstream/entrypoints/config.py b/..._party/py/jetstream/entrypoints/config.py → jetstream/entrypoints/config.py
diff --git a/...py/jetstream/entrypoints/http/__init__.py → jetstream/entrypoints/http/__init__.py b/...py/jetstream/entrypoints/http/__init__.py → jetstream/entrypoints/http/__init__.py
diff --git a/.../jetstream/entrypoints/http/api_server.py → jetstream/entrypoints/http/api_server.py b/.../jetstream/entrypoints/http/api_server.py → jetstream/entrypoints/http/api_server.py
diff --git a/...py/jetstream/entrypoints/http/protocol.py → jetstream/entrypoints/http/protocol.py b/...py/jetstream/entrypoints/http/protocol.py → jetstream/entrypoints/http/protocol.py
diff --git a/...ty/py/jetstream/entrypoints/http/utils.py → jetstream/entrypoints/http/utils.py b/...ty/py/jetstream/entrypoints/http/utils.py → jetstream/entrypoints/http/utils.py
diff --git a/...jetstream/external_tokenizers/__init__.py → jetstream/external_tokenizers/__init__.py b/...jetstream/external_tokenizers/__init__.py → jetstream/external_tokenizers/__init__.py
diff --git a/...am/external_tokenizers/llama3/__init__.py → ...am/external_tokenizers/llama3/__init__.py b/...am/external_tokenizers/llama3/__init__.py → ...am/external_tokenizers/llama3/__init__.py
diff --git a/...nal_tokenizers/llama3/llama3_tokenizer.py → ...nal_tokenizers/llama3/llama3_tokenizer.py b/...nal_tokenizers/llama3/llama3_tokenizer.py → ...nal_tokenizers/llama3/llama3_tokenizer.py
diff --git a/...hird_party/py/jetstream/tests/__init__.py → jetstream/tests/__init__.py b/...hird_party/py/jetstream/tests/__init__.py → jetstream/tests/__init__.py
diff --git a/...party/py/jetstream/tests/core/__init__.py → jetstream/tests/core/__init__.py b/...party/py/jetstream/tests/core/__init__.py → jetstream/tests/core/__init__.py
diff --git a/...y/jetstream/tests/core/test_config_lib.py → jetstream/tests/core/test_config_lib.py b/...y/jetstream/tests/core/test_config_lib.py → jetstream/tests/core/test_config_lib.py
diff --git a/...jetstream/tests/core/test_orchestrator.py → jetstream/tests/core/test_orchestrator.py b/...jetstream/tests/core/test_orchestrator.py → jetstream/tests/core/test_orchestrator.py
diff --git a/...ty/py/jetstream/tests/core/test_server.py → jetstream/tests/core/test_server.py b/...ty/py/jetstream/tests/core/test_server.py → jetstream/tests/core/test_server.py
diff --git a/...rty/py/jetstream/tests/engine/__init__.py → jetstream/tests/engine/__init__.py b/...rty/py/jetstream/tests/engine/__init__.py → jetstream/tests/engine/__init__.py
diff --git a/...xternal_tokenizers/llama2/tokenizer.model → ...xternal_tokenizers/llama2/tokenizer.model b/...xternal_tokenizers/llama2/tokenizer.model → ...xternal_tokenizers/llama2/tokenizer.model
diff --git a/...xternal_tokenizers/llama3/tokenizer.model → ...xternal_tokenizers/llama3/tokenizer.model b/...xternal_tokenizers/llama3/tokenizer.model → ...xternal_tokenizers/llama3/tokenizer.model
diff --git a/...etstream/tests/engine/test_mock_engine.py → jetstream/tests/engine/test_mock_engine.py b/...etstream/tests/engine/test_mock_engine.py → jetstream/tests/engine/test_mock_engine.py
diff --git a/...tream/tests/engine/test_sampling_utils.py → ...tream/tests/engine/test_sampling_utils.py b/...tream/tests/engine/test_sampling_utils.py → ...tream/tests/engine/test_sampling_utils.py
diff --git a/...etstream/tests/engine/test_token_utils.py → jetstream/tests/engine/test_token_utils.py b/...etstream/tests/engine/test_token_utils.py → jetstream/tests/engine/test_token_utils.py
diff --git a/...y/py/jetstream/tests/engine/test_utils.py → jetstream/tests/engine/test_utils.py b/...y/py/jetstream/tests/engine/test_utils.py → jetstream/tests/engine/test_utils.py
diff --git a/...y/jetstream/tests/entrypoints/__init__.py → jetstream/tests/entrypoints/__init__.py b/...y/jetstream/tests/entrypoints/__init__.py → jetstream/tests/entrypoints/__init__.py
diff --git a/...stream/tests/entrypoints/http/__init__.py → jetstream/tests/entrypoints/http/__init__.py b/...stream/tests/entrypoints/http/__init__.py → jetstream/tests/entrypoints/http/__init__.py
diff --git a/...tests/entrypoints/http/test_api_server.py → ...tests/entrypoints/http/test_api_server.py b/...tests/entrypoints/http/test_api_server.py → ...tests/entrypoints/http/test_api_server.py
diff --git a/...d_party/py/jetstream/tools/load_tester.py → jetstream/tools/load_tester.py b/...d_party/py/jetstream/tools/load_tester.py → jetstream/tools/load_tester.py
diff --git a/...am/tools/maxtext/model_ckpt_conversion.sh → ...am/tools/maxtext/model_ckpt_conversion.sh b/...am/tools/maxtext/model_ckpt_conversion.sh → ...am/tools/maxtext/model_ckpt_conversion.sh
diff --git a/...s/maxtext/model_ckpt_finetune_with_aqt.sh → ...s/maxtext/model_ckpt_finetune_with_aqt.sh b/...s/maxtext/model_ckpt_finetune_with_aqt.sh → ...s/maxtext/model_ckpt_finetune_with_aqt.sh
diff --git a/...jetstream/tools/proxy_dev/base.Dockerfile → jetstream/tools/proxy_dev/base.Dockerfile b/...jetstream/tools/proxy_dev/base.Dockerfile → jetstream/tools/proxy_dev/base.Dockerfile
diff --git a/.../jetstream/tools/proxy_dev/dev.Dockerfile → jetstream/tools/proxy_dev/dev.Dockerfile b/.../jetstream/tools/proxy_dev/dev.Dockerfile → jetstream/tools/proxy_dev/dev.Dockerfile
diff --git a/...ird_party/py/jetstream/tools/requester.py → jetstream/tools/requester.py b/...ird_party/py/jetstream/tools/requester.py → jetstream/tools/requester.py
diff --git a/...d_party/py/jetstream/license_preamble.txt → license_preamble.txt b/...d_party/py/jetstream/license_preamble.txt → license_preamble.txt
diff --git a/google3/third_party/py/jetstream/pylintrc → pylintrc b/google3/third_party/py/jetstream/pylintrc → pylintrc
diff --git a/...third_party/py/jetstream/requirements.txt → requirements.txt b/...third_party/py/jetstream/requirements.txt → requirements.txt
diff --git a/google3/third_party/py/jetstream/setup.py → setup.py b/google3/third_party/py/jetstream/setup.py → setup.py