Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
chg0901 authored May 8, 2024
2 parents 10e6973 + c979181 commit a372fb5
Show file tree
Hide file tree
Showing 8 changed files with 305 additions and 86 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
</table>

## 🎇最近更新

- 【2024.05.07】[增量预训练指南](xtuner_config/pt/README.md)
- 【2024.05.04】基于LLaMA3_8b_instruct的[EmoLLM3.0 OpenXLab Demo](https://st-app-center-006861-9746-jlroxvg.openxlab.space/)上线([重启链接](https://openxlab.org.cn/apps/detail/chg0901/EmoLLM-Llama3-8B-Instruct3.0)), [**LLAMA3微调指南**](xtuner_config/README_llama3_8b_instruct_qlora_alpaca_e3_M.md)**更新**,在[**OpenXLab**](https://openxlab.org.cn/models/detail/chg0901/EmoLLM-Llama3-8B-Instruct3.0)[**ModelScope**](https://modelscope.cn/models/chg0901/EmoLLM-Llama3-8B-Instruct3.0/summary)平台发布**LLaMA3_8b_instruct-8B QLoRA微调模型 EmoLLM3.0权重**
- 【2024.04.20】[LLAMA3微调指南](xtuner_config/README_llama3_8b_instruct_qlora_alpaca_e3_M.md)及基于[LLaMA3_8b_instruct的艾薇](https://openxlab.org.cn/models/detail/ajupyter/EmoLLM-LLaMA3_8b_instruct_aiwei)开源
- 【2023.04.14】新增[快速开始](docs/quick_start.md)和保姆级教程[BabyEmoLLM](Baby_EmoLLM.ipynb)
Expand Down Expand Up @@ -145,7 +145,9 @@
<img src="assets/Shusheng.png" alt="浦语挑战赛创新创意奖">
</p>

- 项目荣获公众号**NLP工程化**[推文宣传](https://mp.weixin.qq.com/s/78lrRl2tlXEKUfElnkVx4A)
- 🎉感谢以下媒体及公众号朋友对本项目的报道和支持(以下排名不分先后! 若有遗漏、十分抱歉, 一并感激! 欢迎补充!): [NLP工程化](https://mp.weixin.qq.com/s/78lrRl2tlXEKUfElnkVx4A), [机智流](https://mp.weixin.qq.com/s/_wMCmssRMGd0Oz5OVVkjAA), [爱可可爱生活](https://mp.weixin.qq.com/s/4WaCg4OpkCWXEuWHuV4r3w), [阿郎小哥](https://mp.weixin.qq.com/s/_MSMeL1XHP0v5lDi3YaPVw), [大模型日知路](https://mp.weixin.qq.com/s/FYYibsCXtfU6FFM9TuKILA), [AI Code](https://mp.weixin.qq.com/s/yDWGY3S4CwCi6U_irsFmqA) 等!

- 项目宣传视频 [EmoLLM](https://www.bilibili.com/video/BV1N7421N76X/) 已发布,欢迎大家围观 😀

## 🎯路线图

Expand Down
7 changes: 6 additions & 1 deletion README_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ The Model aims to fully understand and promote the mental health of individuals,
</table>

## Recent Updates

- [2024.05.07][Incremental Pre-training Guide](xtuner_config/pt/README.md)
- [2024.05.04] [EmoLLM3.0 OpenXLab Demo](https://st-app-center-006861-9746-jlroxvg.openxlab.space/) based on LLaMA3_8b_instruct is available now ([restart link]((https://openxlab.org.cn/apps/detail/chg0901/EmoLLM-Llama3-8B-Instruct3.0))), [LLAMA3 fine-tuning guide](xtuner_config/README_llama3_8b_instruct_qlora_alpaca_e3_M.md) is updated, LLaMA3_8b_instruct-8B QLoRA fine-tuning model EmoLLM3.0 weights are released on [**OpenXLab**](https://openxlab.org.cn/models/detail/chg0901/EmoLLM-Llama3-8B-Instruct3.0) and [**ModelScope**](https://modelscope.cn/models/chg0901/EmoLLM-Llama3-8B-Instruct3.0/summary) platforms
- [2024.04.20] [LLAMA3 fine-tuning guide](xtuner_config/README_llama3_8b_instruct_qlora_alpaca_e3_M.md) and based on [LLaMA3_8b_instruct's aiwei](https://openxlab.org.cn/models/detail/ajupyter/EmoLLM-LLaMA3_8b_instruct_aiwei) open source
- [2023.04.14] Added [Quick Start](docs/quick_start_EN.md) and Nanny level tutorial [BabyEmoLLM](Baby_EmoLLM.ipynb)
Expand All @@ -121,6 +121,7 @@ The Model aims to fully understand and promote the mental health of individuals,

- [2024.02.18] The full fine-tuned version based on Qwen1_5-0_5B-Chat has been [open-sourced](https://www.modelscope.cn/models/aJupyter/EmoLLM_Qwen1_5-0_5B-Chat_full_sft/summary). Friends with limited computational resources can now dive in and explore it.


<details>
<summary>View More</summary>

Expand Down Expand Up @@ -155,6 +156,10 @@ The Model aims to fully understand and promote the mental health of individuals,

## Roadmap

- 🎉 Thanks to the following media and friends for their coverage and support of our project(Listed below in no particular order! Sorry for any omissions, we appreciate it! Feel free to add!): [NLP工程化](https://mp.weixin.qq.com/s/78lrRl2tlXEKUfElnkVx4A), [机智流](https://mp.weixin.qq.com/s/_wMCmssRMGd0Oz5OVVkjAA), [爱可可爱生活](https://mp.weixin.qq.com/s/4WaCg4OpkCWXEuWHuV4r3w), [阿郎小哥](https://mp.weixin.qq.com/s/_MSMeL1XHP0v5lDi3YaPVw), [大模型日知路](https://mp.weixin.qq.com/s/FYYibsCXtfU6FFM9TuKILA), [AI Code](https://mp.weixin.qq.com/s/yDWGY3S4CwCi6U_irsFmqA), etc!

- Project Vedio [EmoLLM](https://www.bilibili.com/video/BV1N7421N76X/) has been released for viewing! 😀

<p align="center">
<a href="https://github.com/SmartFlowAI/EmoLLM/">
<img src="assets/Roadmap_EN.png" alt="Roadmap_EN">
Expand Down
4 changes: 4 additions & 0 deletions datasets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
| *General* | multi_turn_dataset_2 | Conversation | 27,000+ |
| *General* | single_turn_dataset_1 | QA | 14,000+ |
| *General* | single_turn_dataset_2 | QA | 18,300+ |
| *General* | self_cognition_EmoLLM | QA | 85+ |
| *General* | ruozhiba_raw | QA | 240+ |
| *Role-play* | aiwei | Conversation | 4000+ |
| *Role-play* | SoulStar | QA | 11,200+ |
| *Role-play* | tiangou | Conversation | 3900+ |
Expand All @@ -41,6 +43,8 @@
* 数据集 `multi_turn_dataset_2` 来源 [CPsyCounD](https://github.com/CAS-SIAT-XinHai/CPsyCoun)
* 数据集 `single_turn_dataset_1` 来自本项目
* 数据集 `single_turn_dataset_2` 来自本项目
* 数据集 `self_cognition_EmoLLM` 来自本项目
* 数据集 `ruozhiba_raw` 来源[COIG-CQIA](https://huggingface.co/datasets/m-a-p/COIG-CQIA/viewer/ruozhiba)

### **Role-play**

Expand Down
4 changes: 4 additions & 0 deletions datasets/README_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
| *General* | multi_turn_dataset_2 | Conversation | 27,000+ |
| *General* | single_turn_dataset_1 | QA | 14,000+ |
| *General* | single_turn_dataset_2 | QA | 18,300+ |
| *General* | self_cognition_EmoLLM | QA | 85+ |
| *General* | ruozhiba_raw | QA | 240+ |
| *Role-play* | aiwei | Conversation | 4000+ |
| *Role-play* | SoulStar | QA | 11,200+ |
| *Role-play* | tiangou | Conversation | 3900+ |
Expand All @@ -38,6 +40,8 @@
* dataset `multi_turn_dataset_2` from [CPsyCounD](https://github.com/CAS-SIAT-XinHai/CPsyCoun)
* dataset `single_turn_dataset_1` from this repo
* dataset `single_turn_dataset_2` from this repo
* dataset `self_cognition_EmoLLM` from this repo
* dataset `ruozhiba_raw` from [COIG-CQIA](https://huggingface.co/datasets/m-a-p/COIG-CQIA/viewer/ruozhiba)

**Role-play**
* dataset `aiwei` from this repo
Expand Down
84 changes: 1 addition & 83 deletions rag/pdf2md/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,90 +4,8 @@

通过使用doc2x的库,实现将pdf文件转换为结构化md文档。

通过代码调用(需要提供api_key)
通过代码调用(需要提供api_key),详见代码`pdf2md.py`

~~~python
import requests as rq
import json
import os
import zipfile

class PDF2MD:
def __init__(self, api_key):
self.api_key = api_key
self.url = "https://api.doc2x.noedgeai.com/api/v1/pdf"
self.export_url = "https://api.doc2x.noedgeai.com/api/export"

def convert(self, filepath, to="md"):
filename = os.path.splitext(os.path.basename(filepath))[0]

res = rq.post(self.url, files={"file": open(filepath, "rb")}, headers={"Authorization": "Bearer " + self.api_key}, stream=True)

if res.status_code == 200:
txt_path = filename + ".txt"
with open(txt_path, "w", encoding="utf-8") as f:
for line in res.iter_lines():
if len(line) > 0:
decoded_line = line.decode("utf-8")
f.write(decoded_line + "\n")
print(decoded_line)

uuid = json.loads(decoded_line.replace("data: ", ''))['uuid']
print(uuid)

if to == "md" or to == 'latex':
path = filename + '.zip'
elif to == 'docx':
path = filename + '.docx'

export_url = self.export_url + "?request_id=" + uuid + "&to=" + to
res = rq.get(export_url, headers={"Authorization": "Bearer " + self.api_key})

if res.status_code == 200:
with open(path, "wb") as f:
f.write(res.content)
print("下载成功,存入:", path)

if to == "md" or to == 'latex':
zip_file = zipfile.ZipFile(path)

# 创建以原始文件名命名的文件夹
if not os.path.exists(filename):
os.mkdir(filename)

# 解压到该文件夹内
for names in zip_file.namelist():
zip_file.extract(names, filename)
zip_file.close()

# 找到解压后的md文件
for file in os.listdir(filename):
if file.endswith(".md"):
extracted_md = os.path.join(filename, file)
break

# 重命名md文件
new_md_name = os.path.join(filename, filename+'.md')
os.rename(extracted_md, new_md_name)
print("解压并重命名md文件为:", new_md_name)

else:
print(format("[ERROR] status code: %d, body: %s" % (res.status_code, res.text)))
else:
print(format("[ERROR] status code: %d, body: %s" % (res.status_code, res.text)))



def main():
api_key = "sk-xxx"
filepath = r"test.pdf"
converter = PDF2MD(api_key)
converter.convert(filepath, to="md")


if __name__ == "__main__":
main()
~~~

## 通过网页使用在线PDF2MD服务:

Expand Down
36 changes: 36 additions & 0 deletions xtuner_config/pt/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 增量预训练教程

# 增量预训练简介
增量预训练旨在提升模型在特定领域或任务的能力。


# 预训练流程
- Step1 处理数据
- Step2 配置config(全量、Lora、Qlora)
- Step3 启动训练(单卡、多卡、是否使用deepspeed)
- Step4 模型合成
- Step5 模型测试
- Step6 模型上传

# EmoLLM增量预训练教程
基于微调中的数据集[datasets](../../datasets)修改而来

- Step1 修改`ft2pt.py`中的文件路径
这里以[output2.json](../../datasets/processed/output2.json)为例,运行脚本生成[pt.json](../../datasets/pt/pt.json)

- Step2 [config](./internlm2_chat_1_8b_qlora_e3_pt.py)
注意:本config采用了**变长注意力 (Variable Length Attention)**
需要安装flash_attn
`MAX_JOBS=4 pip install flash-attn --no-build-isolation`


- Step3 训练:
```
# On a single GPU
xtuner train internlm2_chat_1_8b_qlora_e3_pt.py --deepspeed deepspeed_zero2
# On multiple GPUs
(DIST) NPROC_PER_NODE=${GPU_NUM} xtuner train internlm2_chat_1_8b_qlora_e3_pt.py --deepspeed deepspeed_zero2
(SLURM) srun ${SRUN_ARGS} xtuner train internlm2_chat_1_8b_qlora_e3_pt.py --launcher slurm --deepspeed deepspeed_zero2
```

- 其余流程请参考[微调教程](../../xtuner_config/README.md)
48 changes: 48 additions & 0 deletions xtuner_config/pt/ft2pt.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# 将微调的数据格式转为预训练的格式
import json


def convert(data_path:str, target_path:str):
# 假设原始JSON数据存储在名为'data.json'的文件中
filename = data_path

# 读取文件内容
with open(filename, 'rt', encoding='utf-8') as file:
original_json = file.read()

# 将原始JSON字符串解析为Python对象
data = json.loads(original_json)

# 遍历每个对话
converted_data = []

# 遍历原始数据中的每个对话对象
for conversation_group in data:
# 遍历每个对话
for dialog in conversation_group["conversation"]:
# 创建一个新的对话对象,用于存储转换后的对话
new_conversation_group = {
"conversation": []
}
# 创建一个新的对话,其中输出被替换为"xxx"
new_dialog = {
"input": '',
"output": f'问题:{dialog["input"]}\n答案:{dialog["output"]}',
}
# 将新的对话添加到新对话对象的列表中
new_conversation_group["conversation"].append(new_dialog)

# 将新对话对象添加到转换后的数据列表中
converted_data.append(new_conversation_group)


# 将更新后的数据转换回JSON字符串,并格式化输出
updated_json = json.dumps(converted_data, indent=4, ensure_ascii=False)


# 将更新后的JSON数据写入到新的文件中
with open(f'{target_path}', 'wt', encoding='utf-8') as file:
file.write(updated_json)

if __name__ == '__main__':
convert(data_path='./output2.json', target_path='pt.json')
Loading

0 comments on commit a372fb5

Please sign in to comment.