From 8fbcceb8abc7a0215bb1a926d5524813efd204cf Mon Sep 17 00:00:00 2001
From: huiyan2021 <huiyan.cao@intel.com>
Date: Tue, 26 Sep 2023 23:17:23 +0800
Subject: [PATCH] Enable build_chatbot_on_xpu.ipynb (#398)

---
 .../docs/notebooks/build_chatbot_on_xpu.ipynb | 65 ++++++++++++-------
 .../notebooks/deploy_chatbot_on_xpu.ipynb     | 34 +++++++++-
 .../neural_chat/requirements.txt              |  1 -
 .../neural_chat/requirements_xpu.txt          | 33 ++++++++--
 .../neural_chat/requirements_xpu_no_deps.txt  |  1 -
 5 files changed, 99 insertions(+), 35 deletions(-)
 delete mode 100644 intel_extension_for_transformers/neural_chat/requirements_xpu_no_deps.txt

diff --git a/intel_extension_for_transformers/neural_chat/docs/notebooks/build_chatbot_on_xpu.ipynb b/intel_extension_for_transformers/neural_chat/docs/notebooks/build_chatbot_on_xpu.ipynb
index c1e4b9f6c3c..e5d14e7264e 100644
--- a/intel_extension_for_transformers/neural_chat/docs/notebooks/build_chatbot_on_xpu.ipynb
+++ b/intel_extension_for_transformers/neural_chat/docs/notebooks/build_chatbot_on_xpu.ipynb
@@ -14,9 +14,16 @@
     "# Prepare Environment"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Install Intel® Extension for Transformers*"
+   ]
+  },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -27,7 +34,14 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Install Requirements:"
+    "Refer to [Install Intel® Extension for PyTorch* from source](https://intel.github.io/intel-extension-for-pytorch/xpu/latest/tutorials/installations/linux.html#install-via-compiling-from-source) to build xpu version of torch, torchaudio and Intel® Extension for PyTorch*, and install generated wheels using pip."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Install requirements"
    ]
   },
   {
@@ -36,9 +50,31 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!git clone https://github.com/intel/intel-extension-for-transformers.git\n",
-    "!cd ./intel-extension-for-transformers/intel_extension_for_transformers/neural_chat/\n",
-    "!pip install -r requirements.txt"
+    "%cd ../../\n",
+    "!pip install -r requirements_xpu.txt"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Install requirements that have denpendency on stock pytorch"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!pip install --no-deps peft speechbrain optimum optimum-intel sentence_transformers lm_eval accelerate"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Notes: If you face \"GLIBCXX_3.4.30\" not found issue in conda environment, please remove lib/libstdc++* from conda environment. "
    ]
   },
   {
@@ -142,25 +178,6 @@
    "source": [
     "You can display the generated wav file using IPython."
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from intel_extension_for_transformers.neural_chat import PipelineConfig\n",
-    "from intel_extension_for_transformers.neural_chat import build_chatbot\n",
-    "from intel_extension_for_transformers.neural_chat import plugins\n",
-    "plugins.tts.enable = True\n",
-    "plugins.tts.args[\"output_audio_path\"] = \"./response.wav\"\n",
-    "plugins.asr.enable = True\n",
-    "\n",
-    "config = PipelineConfig(plugins=plugins, model_name_or_path='Intel/neural-chat-7b-v1-1')\n",
-    "chatbot = build_chatbot(config)\n",
-    "result = chatbot.predict(query=\"./sample.wav\")\n",
-    "print(result)"
-   ]
   }
  ],
  "metadata": {
diff --git a/intel_extension_for_transformers/neural_chat/docs/notebooks/deploy_chatbot_on_xpu.ipynb b/intel_extension_for_transformers/neural_chat/docs/notebooks/deploy_chatbot_on_xpu.ipynb
index 69831c53ded..f279a136beb 100644
--- a/intel_extension_for_transformers/neural_chat/docs/notebooks/deploy_chatbot_on_xpu.ipynb
+++ b/intel_extension_for_transformers/neural_chat/docs/notebooks/deploy_chatbot_on_xpu.ipynb
@@ -18,7 +18,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Install intel extension for transformers:"
+    "Install Intel® Extension for Transformers*"
    ]
   },
   {
@@ -34,7 +34,14 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Install Requirements:"
+    "Refer to [Install Intel® Extension for PyTorch* from source](https://intel.github.io/intel-extension-for-pytorch/xpu/latest/tutorials/installations/linux.html#install-via-compiling-from-source) to build xpu version of torch, torchaudio and Intel® Extension for PyTorch*, and install generated wheels using pip."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Install Requirements"
    ]
   },
   {
@@ -48,6 +55,29 @@
     "!pip install -r requirements.txt"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Install requirements that have denpendency on stock pytorch"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!pip install --no-deps peft speechbrain optimum optimum-intel sentence_transformers lm_eval accelerate"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Notes: If you face \"GLIBCXX_3.4.30\" not found issue in conda environment, please remove lib/libstdc++* from conda environment. "
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/intel_extension_for_transformers/neural_chat/requirements.txt b/intel_extension_for_transformers/neural_chat/requirements.txt
index 7bb7015deba..87e463ace49 100644
--- a/intel_extension_for_transformers/neural_chat/requirements.txt
+++ b/intel_extension_for_transformers/neural_chat/requirements.txt
@@ -38,5 +38,4 @@ numpy==1.23.5
 tiktoken==0.4.0
 lm_eval
 accelerate
-optimum.intel
 cchardet
diff --git a/intel_extension_for_transformers/neural_chat/requirements_xpu.txt b/intel_extension_for_transformers/neural_chat/requirements_xpu.txt
index cc67c9632ba..71987f130f2 100644
--- a/intel_extension_for_transformers/neural_chat/requirements_xpu.txt
+++ b/intel_extension_for_transformers/neural_chat/requirements_xpu.txt
@@ -1,12 +1,31 @@
 transformers>=4.32.0
 fschat
+num2words
+paddlepaddle
+paddlespeech==1.4.1
+shortuuid
+gptcache
 evaluate
-accelerate
-yacs
 pydub
 python-multipart
-sentencepiece
-protobuf
---extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/
-torch==2.0.1a0
-intel_extension_for_pytorch==2.0.110+xpu
\ No newline at end of file
+PyPDF2
+langchain
+python-docx
+scikit-learn
+farm-haystack
+librosa
+beautifulsoup4
+InstructorEmbedding
+chromadb
+fastapi
+pydantic
+starlette
+yacs
+uvicorn
+unstructured
+markdown
+rouge_score
+openpyxl
+numpy==1.23.5
+tiktoken==0.4.0
+cchardet
\ No newline at end of file
diff --git a/intel_extension_for_transformers/neural_chat/requirements_xpu_no_deps.txt b/intel_extension_for_transformers/neural_chat/requirements_xpu_no_deps.txt
deleted file mode 100644
index a37dd144f67..00000000000
--- a/intel_extension_for_transformers/neural_chat/requirements_xpu_no_deps.txt
+++ /dev/null
@@ -1 +0,0 @@
-peft
\ No newline at end of file