removed unnecessary files and fixed shap errors

EpistasisLab · Dec 31, 2022 · 6e81fc3 · 6e81fc3
1 parent afcee4b
commit 6e81fc3
Show file tree

Hide file tree

Showing 205 changed files with 17 additions and 149,576 deletions.
diff --git a/docker/lab/Dockerfile b/docker/lab/Dockerfile
@@ -47,11 +47,17 @@ ARG docker_filepath=docker/lab/files
 RUN mkdir /root/wheel
 COPY ${wheel_directory}/*.whl /root/wheel/
 COPY ${docker_filepath}/requirements.txt /root/
-RUN if [ ${USE_WHEELS} -eq 1 ] ; then pip install --no-index --find-links=/root/wheel -r /root/requirements.txt ; else pip install --no-cache-dir -r /root/requirements.txt ; fi
+RUN if [ ${USE_WHEELS} -eq 1 ] ; \
+    then pip install --no-index --find-links=/root/wheel -r /root/requirements.txt ; \
+    else pip install --no-cache-dir -r /root/requirements.txt ; \
+  fi
 RUN rm /root/wheel/*.whl
 
-## Webserver
+# these requirements need to be built, using wheels throws errors
+COPY ${docker_filepath}/requirements-build.txt /root/
+RUN pip install --no-cache-dir -r /root/requirements-build.txt
 
+## Webserver
 RUN rm /etc/apache2/sites-enabled/*
 COPY ${docker_filepath}/ports.conf /etc/apache2/
 RUN cp  /etc/apache2/mods-available/rewrite* /etc/apache2/mods-enabled \

diff --git a/...r/lab/files/requirements-surprise-x64.txt → docker/lab/files/requirements-build.txt b/...r/lab/files/requirements-surprise-x64.txt → docker/lab/files/requirements-build.txt
diff --git a/docker/lab/files/requirements-raspberrypi.txt b/docker/lab/files/requirements-raspberrypi.txt
diff --git a/docker/lab/files/requirements-surprise-arm64.txt b/docker/lab/files/requirements-surprise-arm64.txt
diff --git a/docker/lab/files/requirements.txt b/docker/lab/files/requirements.txt
@@ -8,4 +8,3 @@ xgboost==1.6.2
 simplejson==3.17.2
 requests==2.25.1
 joblib==1.2.0
--e git+https://github.com/lacava/surprise.git@1.1.1.1#egg=scikit-surprise
diff --git a/docker/machine/Dockerfile b/docker/machine/Dockerfile
@@ -34,9 +34,16 @@ RUN apt-get update --fix-missing && apt-get install -y \
 RUN mkdir /root/wheel
 COPY ${wheel_directory}/*.whl /root/wheel/
 COPY ${docker_filepath}/requirements.txt /root/
-RUN if [ ${USE_WHEELS} -eq 1 ] ; then pip install --no-index --find-links=/root/wheel -r /root/requirements.txt ; else pip install --no-cache-dir -r /root/requirements.txt ; fi
+RUN if [ ${USE_WHEELS} -eq 1 ] ; \
+    then pip install --no-index --find-links=/root/wheel -r /root/requirements.txt ; \
+    else pip install --no-cache-dir -r /root/requirements.txt ; \
+  fi
 RUN rm -rf /root/wheel
 
+# these requirements need to be built, using wheels throws errors
+COPY ${docker_filepath}/requirements-build.txt /root/
+RUN pip install --no-cache-dir -r /root/requirements-build.txt
+
 # setup node environment
 RUN npm install -g pm2 --silent --progress=false
 

diff --git a/docker/machine/files/requirements-build.txt b/docker/machine/files/requirements-build.txt
@@ -0,0 +1 @@
+shap==0.39.0
diff --git a/docker/machine/files/requirements-raspberrypi.txt b/docker/machine/files/requirements-raspberrypi.txt
diff --git a/docker/machine/files/requirements.txt b/docker/machine/files/requirements.txt
@@ -9,4 +9,3 @@ pydot==1.4.2
 requests==2.25.1
 xgboost==1.6.2
 joblib==1.2.0
-shap==0.37.0
diff --git a/docker/machine/files/requirements_shap.txt b/docker/machine/files/requirements_shap.txt