modify requirements

Ascend · Oct 22, 2024 · 47eb0c4 · 47eb0c4
1 parent 240d9ad
commit 47eb0c4
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/requirements/requirements_deepspeed.txt b/requirements/requirements_deepspeed.txt
@@ -1,10 +1,7 @@
 accelerate
 clang-format==18.1.3
 comet_ml>=3.41.0
-<<<<<<< HEAD
-=======
 # deepspeed-kernels ; sys_platform == 'linux'
->>>>>>> main
 docutils<0.18
 future
 importlib-metadata>=4
@@ -22,16 +19,6 @@ tensorboard
 torchvision
 transformers>=4.39.0
 wandb
-<<<<<<< HEAD
-google
-lm-eval==0.3.0
-protobuf
-qtorch
-safetensors
-sentencepiece
-transformers>=4.32.1
-tabulate
-=======
 # google
 # lm-eval==0.3.0
 # protobuf
@@ -40,4 +27,3 @@ tabulate
 # sentencepiece
 # transformers>=4.32.1
 # tabulate
->>>>>>> main