Merge branch 'dev2'

bmaltais · Jun 24, 2023 · b48a94a · b48a94a
2 parents ba26879 + 73d2f14
commit b48a94a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,8 +26,10 @@ RUN python3 -m pip install wheel
 ## RUN python3 -m pip install -v -U git+https://github.com/facebookresearch/xformers.git@main#egg=xformers
 
 # Install requirements
-COPY requirements_linux.txt ./setup/setup.py ./
-RUN python3 -m pip install --use-pep517 -r requirements_linux.txt xformers
+COPY ./requirements.txt ./requirements_linux_docker.txt ./
+COPY ./setup/docker_setup.py ./setup.py
+RUN python3 -m pip install -r ./requirements_linux_docker.txt
+RUN python3 -m pip install -r ./requirements.txt
 
 # Replace pillow with pillow-simd
 RUN python3 -m pip uninstall -y pillow && \

diff --git a/requirements_linux_docker.txt b/requirements_linux_docker.txt
@@ -0,0 +1,5 @@
+xformers==0.0.20
+bitsandbytes==0.39.1
+accelerate==0.19.0
+tensorboard==2.12.1
+tensorflow==2.12.0
diff --git a/setup/docker_setup.py b/setup/docker_setup.py
@@ -0,0 +1,3 @@
+from setuptools import setup, find_packages
+
+setup(name="library", version="1.0.3", packages=find_packages())