From 5e7e0f4b17141076a322098a74557a6edde55790 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 9 Jul 2025 11:59:44 -0700 Subject: [PATCH 1/3] Cherry-picked commit with merge conflict --- .ci/docker/requirements-ci.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index 219aa602afee2..5bf8a65c34e71 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -304,7 +304,11 @@ z3-solver==4.12.2.0 #Pinned versions: #test that import: +<<<<<<< HEAD tensorboard==2.13.0 +======= +tensorboard==2.18.0 +>>>>>>> c7f61f4205 ([rocm7.0_internal_testing] upgrade tensorboard compatible with numpy 2 (#2326)) #Description: Also included in .ci/docker/requirements-docs.txt #Pinned versions: #test that import: test_tensorboard From 4a73bf4f3c069b47d628e677f8b4e29c17865d92 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 9 Jul 2025 14:15:37 -0700 Subject: [PATCH 2/3] fix merge --- .ci/docker/requirements-ci.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index 5bf8a65c34e71..d3fea012c5f48 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -304,9 +304,6 @@ z3-solver==4.12.2.0 #Pinned versions: #test that import: -<<<<<<< HEAD -tensorboard==2.13.0 -======= tensorboard==2.18.0 >>>>>>> c7f61f4205 ([rocm7.0_internal_testing] upgrade tensorboard compatible with numpy 2 (#2326)) #Description: Also included in .ci/docker/requirements-docs.txt From 702104cedc278f625a4619816ff40c74dc3f4127 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 9 Jul 2025 14:16:02 -0700 Subject: [PATCH 3/3] lint --- .ci/docker/requirements-ci.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index d3fea012c5f48..0c54a8febc7db 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -305,7 +305,6 @@ z3-solver==4.12.2.0 #test that import: tensorboard==2.18.0 ->>>>>>> c7f61f4205 ([rocm7.0_internal_testing] upgrade tensorboard compatible with numpy 2 (#2326)) #Description: Also included in .ci/docker/requirements-docs.txt #Pinned versions: #test that import: test_tensorboard