fix: mv vllm to cuda-enable requirement file and update Dockerfile (#160

) * docs: add pull request template * chore: mv vllm to cuda-enabled dependencies * chore: update Dockerfile * refactor: rename llm_kernel as llm_core
agiresearch · Jul 5, 2024 · 2a3142a · 2a3142a
1 parent ac14f82
commit 2a3142a
Show file tree

Hide file tree

Showing 20 changed files with 15 additions and 36 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,33 +1,15 @@
-# Use the Ubuntu 22.04 base image
 FROM ubuntu:22.04
 
-# Update the package list and install dependencies
 RUN apt-get update && apt-get install -y \
-    git \
-    wget \
-    curl \
-    vim \
-    tmux \
-    && rm -rf /var/lib/apt/lists/*
+    git wget curl vim tmux python3 python3-pip
 
-# Install Miniconda
-RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/miniconda.sh \
-    && bash /tmp/miniconda.sh -b -p /opt/conda \
-    && rm /tmp/miniconda.sh \
-    && /opt/conda/bin/conda init
-
-# Set path to conda
-ENV PATH=/opt/conda/bin:$PATH
+WORKDIR /workspace
 
 RUN curl https://ollama.ai/install.sh | sh
 
-# Create a working directory
-WORKDIR /workspace
-
-RUN conda create -n aios python=3.11 -y \
-    && /bin/bash -c "source /opt/conda/bin/activate aios" \
-    && git clone https://github.com/dongyuanjushi/AIOS.git \
-    && cd AIOS
+RUN git clone https://github.com/agiresearch/AIOS.git \
+    && cd AIOS \
+    && pip install -r requirements.txt
 
 # Set the default command to run when starting the container
 CMD ["/bin/bash"]
diff --git a/README.md b/README.md
@@ -7,16 +7,14 @@
 
 <a href="https://trendshift.io/repositories/8908" target="_blank"><img src="https://trendshift.io/api/badge/repositories/8908" alt="agiresearch%2FAIOS | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
-AIOS, a Large Language Model (LLM) Agent operating system, embeds large language model into Operating Systems (OS) as the brain of the OS, enabling an operating system "with soul" -- an important step towards AGI. AIOS is designed to optimize resource allocation, facilitate context switch across agents, enable concurrent execution of agents, provide tool service for agents, maintain access control for agents, and provide a rich set of toolkits for LLM Agent developers.
-
+AIOS is to build a Large Language Model (LLM) Agent operating system, which intends to embed large language model into the Operating System as the brain of the OS. AIOS is designated to address problems (e.g., scheduling, context switch, memory management, etc.) during the development and deployment of LLM-based agents for a better ecosystem among agent developers and users.
 
 ## 🏠 Architecture of AIOS
 <p align="center">
 <img src="images/AIOS-Architecture.png">
 </p>
 
-The objective of AIOS is to provide the LLM kernel which will be an abstraction on top of the OS kernel. The kernel intends to facilitate the installation of agents, which are utilities the kernel can interact with in order to perform tasks the user queries. For example, the MathAgent facilitates mathematical computations, such as currency conversion, integral calculus, or even basic algebraic manipulation. The method of installation is intended to be in a manner similar to [apt](https://en.wikipedia.org/wiki/APT_(software)) or [brew](https://brew.sh).
-
+AIOS provides the LLM kernel as an abstraction on top of the OS kernel. The kernel intends to facilitate the installation and usage of agents.
 At the present moment, AIOS is a userspace wrapper around the current kernel. However, this is subject to change as outlined in the [Q4 Goals and Objectives](https://github.com/agiresearch/AIOS/issues/127).
 
 ## 📰 News

diff --git a/aios/llm_kernel/README.md → aios/llm_core/README.md b/aios/llm_kernel/README.md → aios/llm_core/README.md
@@ -1,4 +1,4 @@
-# aios/llm_kernel/
+# aios/llm_core/
 
 This directory contains wrapper classes that abstract the LLMs into a single class called LLMKernel. Currently, the following models are supported:
 

diff --git a/aios/llm_kernel/llm_classes/__init__.py → aios/llm_core/llm_classes/__init__.py b/aios/llm_kernel/llm_classes/__init__.py → aios/llm_core/llm_classes/__init__.py
diff --git a/aios/llm_kernel/llm_classes/base_llm.py → aios/llm_core/llm_classes/base_llm.py b/aios/llm_kernel/llm_classes/base_llm.py → aios/llm_core/llm_classes/base_llm.py
diff --git a/aios/llm_kernel/llm_classes/bed_rock.py → aios/llm_core/llm_classes/bed_rock.py b/aios/llm_kernel/llm_classes/bed_rock.py → aios/llm_core/llm_classes/bed_rock.py
diff --git a/aios/llm_kernel/llm_classes/constant.py → aios/llm_core/llm_classes/constant.py b/aios/llm_kernel/llm_classes/constant.py → aios/llm_core/llm_classes/constant.py
diff --git a/aios/llm_kernel/llm_classes/gemini_llm.py → aios/llm_core/llm_classes/gemini_llm.py b/aios/llm_kernel/llm_classes/gemini_llm.py → aios/llm_core/llm_classes/gemini_llm.py
diff --git a/aios/llm_kernel/llm_classes/gpt_llm.py → aios/llm_core/llm_classes/gpt_llm.py b/aios/llm_kernel/llm_classes/gpt_llm.py → aios/llm_core/llm_classes/gpt_llm.py
diff --git a/...nel/llm_classes/huggingface_native_llm.py → ...ore/llm_classes/huggingface_native_llm.py b/...nel/llm_classes/huggingface_native_llm.py → ...ore/llm_classes/huggingface_native_llm.py
diff --git a/.../llm_kernel/llm_classes/model_registry.py → aios/llm_core/llm_classes/model_registry.py b/.../llm_kernel/llm_classes/model_registry.py → aios/llm_core/llm_classes/model_registry.py
diff --git a/aios/llm_kernel/llm_classes/ollama_llm.py → aios/llm_core/llm_classes/ollama_llm.py b/aios/llm_kernel/llm_classes/ollama_llm.py → aios/llm_core/llm_classes/ollama_llm.py
diff --git a/aios/llm_kernel/llm_classes/vllm.py → aios/llm_core/llm_classes/vllm.py b/aios/llm_kernel/llm_classes/vllm.py → aios/llm_core/llm_classes/vllm.py
diff --git a/aios/llm_kernel/llms.py → aios/llm_core/llms.py b/aios/llm_kernel/llms.py → aios/llm_core/llms.py
diff --git a/aios/scheduler/base.py b/aios/scheduler/base.py
@@ -3,7 +3,7 @@
 
 from threading import Thread
 
-from aios.llm_kernel.llms import LLMKernel
+from aios.llm_core.llms import LLMKernel
 
 from aios.utils.logger import SchedulerLogger
 class BaseScheduler:

diff --git a/eval.py b/eval.py
@@ -11,17 +11,15 @@
 
 import warnings
 
-from aios.llm_kernel import llms
+from aios.llm_core import llms
 
 from concurrent.futures import ThreadPoolExecutor
 
-
 from aios.utils.utils import delete_directories
 from aios.utils.calculator import get_numbers_concurrent, get_numbers_sequential, comparison
 
 import argparse
 
-
 from dotenv import load_dotenv
 
 # Construct help message and parse argumets using argparse

diff --git a/main.py b/main.py
@@ -15,7 +15,7 @@
 
 import warnings
 
-from aios.llm_kernel import llms
+from aios.llm_core import llms
 
 from concurrent.futures import ThreadPoolExecutor, as_completed
 

diff --git a/requirements-cuda.txt b/requirements-cuda.txt
@@ -0,0 +1,2 @@
+-r requirements.txt
+vllm
diff --git a/requirements.txt b/requirements.txt
@@ -5,6 +5,5 @@ protobuf==4.25.3
 pydantic==2.7.0
 Pympler==1.0.1
 click==8.1.7
-ollama==0.1.7
+ollama
 pyopenagi
-vllm
diff --git a/simulator.py b/simulator.py
@@ -19,7 +19,7 @@
 
 import warnings
 
-from aios.llm_kernel import llms
+from aios.llm_core import llms
 
 
 from aios.utils.utils import delete_directories