update requirements

requirements_version.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 aiohappyeyeballs==2.6.1
 aiohttp==3.11.18
 aiosignal==1.3.2
@@ -70,6 +71,39 @@ networkx==3.3
 notebook==6.5.2
 notebook_shim==0.2.4
 numpy==2.0.0
+=======
+<<<<<<< HEAD
+certifi==2025.4.26
+charset-normalizer==3.4.2
+filelock==3.18.0
+fsspec==2025.3.2
+=======
+accelerate==1.7.0
+aiohappyeyeballs==2.6.1
+aiohttp==3.11.18
+aiosignal==1.3.2
+attrs==25.3.0
+certifi==2025.4.26
+charset-normalizer==3.4.2
+datasets==3.6.0
+dill==0.3.8
+filelock==3.18.0
+frozenlist==1.6.0
+fsspec==2025.3.0
+>>>>>>> fc9eefc (add pretrain code)
+huggingface-hub==0.30.2
+idna==3.10
+Jinja2==3.1.6
+MarkupSafe==3.0.2
+mpmath==1.3.0
+<<<<<<< HEAD
+=======
+multidict==6.4.3
+multiprocess==0.70.16
+>>>>>>> fc9eefc (add pretrain code)
+networkx==3.4.2
+numpy==2.2.5
+>>>>>>> 11473a798f338efdf3f70d665a00810099f51174
 nvidia-cublas-cu12==12.1.3.1
 nvidia-cuda-cupti-cu12==12.1.105
 nvidia-cuda-nvrtc-cu12==12.1.105
@@ -80,6 +114,7 @@ nvidia-curand-cu12==10.3.2.106
 nvidia-cusolver-cu12==11.4.5.107
 nvidia-cusparse-cu12==12.1.0.106
 nvidia-nccl-cu12==2.20.5
+<<<<<<< HEAD
 nvidia-nvjitlink-cu12==12.5.82
 nvidia-nvtx-cu12==12.1.105
 overrides==7.7.0
@@ -143,3 +178,46 @@ webencodings==0.5.1
 websocket-client==1.8.0
 xxhash==3.5.0
 yarl==1.20.0
+=======
+nvidia-nvjitlink-cu12==12.9.41
+nvidia-nvtx-cu12==12.1.105
+packaging==25.0
+<<<<<<< HEAD
+protobuf==3.20.0
+=======
+pandas==2.2.3
+propcache==0.3.1
+protobuf==3.20.0
+psutil==7.0.0
+pyarrow==20.0.0
+python-dateutil==2.9.0.post0
+pytz==2025.2
+>>>>>>> fc9eefc (add pretrain code)
+PyYAML==6.0.2
+regex==2024.11.6
+requests==2.32.3
+safetensors==0.5.3
+sentencepiece==0.2.0
+<<<<<<< HEAD
+=======
+setuptools==78.1.1
+six==1.17.0
+>>>>>>> fc9eefc (add pretrain code)
+sympy==1.14.0
+tokenizers==0.21.1
+torch==2.3.1
+tqdm==4.67.1
+transformers==4.51.3
+<<<<<<< HEAD
+triton==2.3.1
+typing_extensions==4.13.2
+urllib3==2.4.0
+=======
+typing_extensions==4.13.2
+tzdata==2025.2
+urllib3==2.4.0
+wheel==0.45.1
+xxhash==3.5.0
+yarl==1.20.0
+>>>>>>> fc9eefc (add pretrain code)
+>>>>>>> 11473a798f338efdf3f70d665a00810099f51174

setup.py

@@ -6,12 +6,26 @@ setup(
     packages=find_packages(include=["src_llm"]),  
     install_requires=[
         "torch==2.3.1",
+<<<<<<< HEAD
         "datasets==3.6.0",
+=======
+<<<<<<< HEAD
+=======
+        "datasets==3.6.0",
+>>>>>>> fc9eefc (add pretrain code)
+>>>>>>> 11473a798f338efdf3f70d665a00810099f51174
         "sentencepiece==0.2.0",
         "protobuf==3.20.0",
         "transformers==4.51.3",
         "tokenizers==0.21.1",
+<<<<<<< HEAD
         "setuptools",
+=======
+<<<<<<< HEAD
+=======
+        "accelerate==1.7.0",
+>>>>>>> fc9eefc (add pretrain code)
+>>>>>>> 11473a798f338efdf3f70d665a00810099f51174
         ],  
     author="IP127000",  
     author_email="hanluzhi@outlook.com",