From 64d17f44f5b90de9246039027dbc9b602fa3b960 Mon Sep 17 00:00:00 2001 From: Chaitanya <55046588+ChaitanyaChawak@users.noreply.github.com> Date: Mon, 17 Mar 2025 13:43:40 +0100 Subject: [PATCH 1/7] Update ci-build.yml --- .github/workflows/ci-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index a95c2e1..c5c54da 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -41,6 +41,7 @@ jobs: if: runner.os == 'Linux' run: | sudo apt-get update + sudo apt-get install -y build-essential sudo apt-get install -y libcfitsio-dev sudo apt-get install -y libfftw3-dev sudo apt-get install -y libarmadillo-dev From cda2c2e9ed8ea01f20dd679462f4c1df2d4a1cbd Mon Sep 17 00:00:00 2001 From: Chaitanya <55046588+ChaitanyaChawak@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:11:22 +0100 Subject: [PATCH 2/7] Update ci-build.yml --- .github/workflows/ci-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index c5c54da..b657dcb 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -100,12 +100,13 @@ jobs: - name: Install Linux Dependencies run: | sudo apt-get update + sudo apt-get install -y build-essential sudo apt-get install -y libcfitsio-dev sudo apt-get install -y python3 sudo apt-get install -y python3-pip - wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.1.0.tar.gz - tar -xvf v3.1.0.tar.gz - cd Catch2-3.1.0 + wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz + tar -xvf v3.8.0.tar.gz + cd Catch2-3.8.0 cmake -Bbuild -H. -DBUILD_TESTING=OFF sudo cmake --build build/ --target install cd From ee3d0d47b8611d008f0c420e05fa8a4748312cef Mon Sep 17 00:00:00 2001 From: Chaitanya <55046588+ChaitanyaChawak@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:17:18 +0100 Subject: [PATCH 3/7] Update ci-build.yml --- .github/workflows/ci-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index b657dcb..ce1a5a8 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -49,9 +49,9 @@ jobs: sudo apt-get install -y libsharp-dev sudo apt-get install -y libhealpix-cxx-dev sudo apt-get install -y healpy-data - wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.1.0.tar.gz - tar -xvf v3.1.0.tar.gz - cd Catch2-3.1.0 + wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz + tar -xvf v3.8.0.tar.gz + cd Catch2-3.8.0 cmake -Bbuild -H. -DBUILD_TESTING=OFF sudo cmake --build build/ --target install cd From 02d741a5e9a4680e7ef0200c80e4626d4c01a1c0 Mon Sep 17 00:00:00 2001 From: Chaitanya <55046588+ChaitanyaChawak@users.noreply.github.com> Date: Tue, 18 Mar 2025 16:49:51 +0100 Subject: [PATCH 4/7] Update Dockerfile --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb05c68..bdf883a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,12 @@ SHELL ["/bin/bash", "-c"] WORKDIR /workdir ARG DEBIAN_FRONTEND=noninteractive -ARG CC=gcc-9 -ARG CXX=g++-9 +ARG CC=gcc-13 +ARG CXX=g++-13 RUN apt-get update && \ apt-get install -y autoconf automake libtool pkg-config libgl1-mesa-glx && \ - apt-get install -y gcc-9 g++-9 && \ + apt-get install -y gcc-13 g++-13 && \ apt-get install -y cmake git wget && \ apt-get install -y libarmadillo-dev && \ apt-get install -y libcfitsio-dev && \ @@ -22,9 +22,9 @@ RUN apt-get update && \ apt-get install -y healpy-data && \ apt-get clean -RUN wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.1.0.tar.gz && \ - tar -xvf v3.1.0.tar.gz && \ - cd Catch2-3.1.0 && \ +RUN wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz && \ + tar -xvf v3.8.0.tar.gz && \ + cd Catch2-3.8.0 && \ cmake -Bbuild -H. -DBUILD_TESTING=OFF && \ cmake --build build/ --target install From 73e5714d915c98e9ac3a86ca916c74502cf269cc Mon Sep 17 00:00:00 2001 From: Chaitanya <55046588+ChaitanyaChawak@users.noreply.github.com> Date: Tue, 18 Mar 2025 19:02:34 +0100 Subject: [PATCH 5/7] Update Dockerfile libgl1 and libglx-mesa0 instead of libgl1-mesa-glx --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bdf883a..fe8b09d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ARG CC=gcc-13 ARG CXX=g++-13 RUN apt-get update && \ - apt-get install -y autoconf automake libtool pkg-config libgl1-mesa-glx && \ + apt-get install -y autoconf automake libtool pkg-config libgl1 libglx-mesa0 && \ apt-get install -y gcc-13 g++-13 && \ apt-get install -y cmake git wget && \ apt-get install -y libarmadillo-dev && \ From 005632cd335a7ecbbd82cf442217dd91a310ab0d Mon Sep 17 00:00:00 2001 From: chaitanya chawak Date: Wed, 19 Mar 2025 15:03:34 +0100 Subject: [PATCH 6/7] update Dockerfile --- .dockerignore | 1 + Dockerfile | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.dockerignore b/.dockerignore index 6e19512..989d80b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,3 @@ .dockerignore +.git Dockerfile diff --git a/Dockerfile b/Dockerfile index fe8b09d..9a0c6a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,9 +20,11 @@ RUN apt-get update && \ apt-get install -y libsharp-dev && \ apt-get install -y libhealpix-cxx-dev && \ apt-get install -y healpy-data && \ + apt-get install -y python3 python3-pip python3-venv && \ apt-get clean -RUN wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz && \ +RUN cd /home && \ + wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz && \ tar -xvf v3.8.0.tar.gz && \ cd Catch2-3.8.0 && \ cmake -Bbuild -H. -DBUILD_TESTING=OFF && \ @@ -30,27 +32,26 @@ RUN wget https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz && \ ENV HEALPIX /usr/share/healpy -RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh && \ - bash Miniconda3-latest-Linux-x86_64.sh -b -p /miniconda && \ - rm Miniconda3-latest-Linux-x86_64.sh - -ENV PATH /miniconda/bin:${PATH} - -RUN conda create -n sparse2d python=3.10 pip -y +RUN python3 -m venv /venv -ENV PATH /miniconda/envs/sparse2d/bin:${PATH} +RUN source /venv/bin/activate && \ + pip install --upgrade pip -RUN pip install pybind11 jupyter +RUN source /venv/bin/activate && \ + pip install jupyter COPY . /home -RUN cd /home && \ +RUN source /venv/bin/activate && \ + cd /home && \ mkdir build && \ cd build && \ cmake .. && \ - make && \ + make -j8 && \ make install ENV PYTHONPATH /home/build/src -RUN echo -e '#!/bin/bash\njupyter notebook --port=8888 --no-browser --ip=0.0.0.0 --allow-root' > /usr/bin/notebook && chmod +x /usr/bin/notebook +RUN echo "source /venv/bin/activate" >> ~/.bashrc + +RUN echo -e '#!/bin/bash\njupyter notebook --port=8888 --no-browser --ip=0.0.0.0 --allow-root' > /usr/bin/notebook && chmod +x /usr/bin/notebook \ No newline at end of file From 28701ef955ff5e40cbf4d72cd9e52407bf2a2877 Mon Sep 17 00:00:00 2001 From: Samuel Farrens Date: Tue, 8 Apr 2025 15:46:22 +0200 Subject: [PATCH 7/7] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a0c6a2..7b7e1b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,4 +54,4 @@ ENV PYTHONPATH /home/build/src RUN echo "source /venv/bin/activate" >> ~/.bashrc -RUN echo -e '#!/bin/bash\njupyter notebook --port=8888 --no-browser --ip=0.0.0.0 --allow-root' > /usr/bin/notebook && chmod +x /usr/bin/notebook \ No newline at end of file +RUN echo -e '#!/bin/bash\njupyter notebook --port=8888 --no-browser --ip=0.0.0.0 --allow-root' > /usr/bin/notebook && chmod +x /usr/bin/notebook