From cda0d5404462d8a8b29316994bef1398046c51e2 Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 9 Jul 2025 11:59:44 -0700 Subject: [PATCH 1/2] 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 c1fc6a3e94776..5c1fa9fa02c67 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -310,7 +310,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 79fe805f0c16f090e67fffae94b5cb7b46df98dc Mon Sep 17 00:00:00 2001 From: Ethan Wee Date: Wed, 9 Jul 2025 14:17:09 -0700 Subject: [PATCH 2/2] fix merge --- .ci/docker/requirements-ci.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt index 5c1fa9fa02c67..8b2ae54154816 100644 --- a/.ci/docker/requirements-ci.txt +++ b/.ci/docker/requirements-ci.txt @@ -310,11 +310,7 @@ 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