facelift, FigRealSNR

Dockerfile

@@ -1,51 +1,20 @@
-# FROM pytorch/pytorch
-# FROM pytorch/pytorch:1.9.1-cuda11.1-cudnn8-devel
 FROM pytorch/pytorch:1.12.1-cuda11.3-cudnn8-runtime
 
-# docker pull pytorch/pytorch:1.10.0-cuda11.3-cudnn8-devel
 ENV PATH="/root/miniconda3/bin:$PATH"
-ARG PATH="/root/miniconda3/bin:$PATH"
-
-# RUN apt-get install libgl1 -y
-RUN apt-get update -y \
-	&& apt-get install wget -y \
-    && apt-get install libopenmpi-dev -y
-# RUN echo 'export PATH=/root/miniconda3/bin:$PATH' >> /root/.bashrc 
-
-# RUN apt-get install -y wget && rm -rf /var/lib/apt/lists/*
-
-RUN wget \
-    https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh \
-    && mkdir /root/.conda \
-    && bash Miniconda3-latest-Linux-x86_64.sh -b \
-    && rm -f Miniconda3-latest-Linux-x86_64.sh 
-RUN conda --version
-
-WORKDIR /colloidoscope
-COPY environment.yml .
-# from https://stackoverflow.com/questions/55123637/activate-conda-environment-in-docker
-RUN conda init bash \
-    && . ~/.bashrc \
-    && conda env create -f environment.yml \
-    && conda activate colloids \
-    && pip install ipython 
-
-# Keeps Python from generating .pyc files in the container
 ENV PYTHONDONTWRITEBYTECODE=1
-# Turns off buffering for easier container logging
 ENV PYTHONUNBUFFERED=1
 
-# COPY tests/test_gpu.py .
-# ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "colloids", "python3", "tests/test_gpu.py"]
-# ENTRYPOINT ["conda", "activate", "colloids"]
-
-WORKDIR /colloidoscope
-# Update pip
-# RUN pip3 install --upgrade pip
-# # Install pip requirements
-# COPY requirements.txt .
-# RUN python -m pip install -r requirements.txt
-
-
-
-# TODO use buildkit https://stackoverflow.com/questions/58018300/using-a-pip-cache-directory-in-docker-builds
+RUN apt-get update -y \
+    && apt-get install wget -y \
+    && apt-get install git -y \
+    && apt-get install libopenmpi-dev -y \
+    && apt-get install python3 python3-dev -y
+
+WORKDIR /app/
+COPY colloidoscope /app/colloidoscope/
+COPY examples /app/examples/
+COPY setup.py /app/setup.py
+COPY scripts /app/scripts/
+COPY tests /app/tests/
+
+RUN python3 -m pip install .

README.md

@@ -92,6 +92,6 @@ If you want to launch the container on a custom hard drive use:
 
 ## Contributions
 
-Thanks to yushi yang for contributing the position simulations and helping me with the entire project in general.
+Thanks to [Yushi Yang @yangyushi](https://github.com/yangyushi) for contributing the position simulations and helping me with the entire project in general.
 
 This project wraps explore_lif which is written by Mathieu Leocmach and C. Ybert.