Skip to content

Commit

Permalink
Relocate files
Browse files Browse the repository at this point in the history
  • Loading branch information
TLCFEM committed Dec 12, 2024
1 parent 38b02ca commit 5798bd0
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
file: ./Script/Rocky.${{ matrix.arch }}.Dockerfile
file: ./Script/${{ matrix.arch }}/Rocky.Dockerfile
platforms: linux/${{ matrix.arch }}
push: true
tags: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
file: ./Script/Rocky.Pre.${{ matrix.arch }}.Dockerfile
file: ./Script/${{ matrix.arch }}/Rocky.Pre.Dockerfile
platforms: linux/${{ matrix.arch }}
push: true
tags: tlcfem/suanpan-env:latest
Expand Down
4 changes: 2 additions & 2 deletions Script/Fedora.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ RUN echo "[oneAPI]" > /etc/yum.repos.d/oneAPI.repo && \
RUN dnf upgrade --refresh -y && dnf install -y libglvnd-devel gcc g++ gfortran rpm-build rpm-devel rpmdevtools cmake wget git intel-oneapi-mkl-devel

RUN mkdir vtk-build && cd vtk-build && \
wget -q https://www.vtk.org/files/release/9.2/VTK-9.2.6.tar.gz && tar xf VTK-9.2.6.tar.gz && \
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ./VTK-9.2.6 && \
wget -q https://www.vtk.org/files/release/9.4/VTK-9.4.0.tar.gz && tar xf VTK-9.4.0.tar.gz && \
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ./VTK-9.4.0 && \
make install -j"$(nproc)" && cd .. && rm -r vtk-build

RUN git clone -b dev --depth 1 https://github.com/TLCFEM/suanPan.git
Expand Down
4 changes: 2 additions & 2 deletions Script/Ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ RUN echo "deb https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/source
RUN apt-get update -y && apt-get install -y gcc g++ gfortran cmake git intel-oneapi-mkl-devel libxt-dev freeglut3-dev libxcursor-dev file dpkg-dev

RUN mkdir vtk-build && cd vtk-build && \
wget -q https://www.vtk.org/files/release/9.2/VTK-9.2.6.tar.gz && tar xf VTK-9.2.6.tar.gz && \
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ./VTK-9.2.6 && \
wget -q https://www.vtk.org/files/release/9.4/VTK-9.4.0.tar.gz && tar xf VTK-9.4.0.tar.gz && \
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ./VTK-9.4.0 && \
make install -j"$(nproc)" && cd .. && rm -r vtk-build

RUN git clone -b dev --depth 1 https://github.com/TLCFEM/suanPan.git
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM tlcfem/suanpan-env-cuda:latest AS build

RUN git clone -b dev --depth 1 https://github.com/TLCFEM/suanPan.git
RUN cd suanPan && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_AVX2=OFF -DUSE_VTK=ON -DUSE_MKL=ON -DMKLROOT=/opt/intel/oneapi/mkl/latest/ -DUSE_INTEL_OPENMP=OFF -DLINK_DYNAMIC_MKL=OFF -DCMAKE_INSTALL_PREFIX=suanPan-linux-mkl-vtk -DBUILD_PACKAGE=RPM ..
RUN cd suanPan && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_AVX2=OFF -DUSE_VTK=ON -DUSE_MKL=ON -DMKLROOT=/opt/intel/oneapi/mkl/latest/ -DUSE_INTEL_OPENMP=OFF -DLINK_DYNAMIC_MKL=OFF -DUSE_CUDA=ON -DCMAKE_INSTALL_PREFIX=suanPan-linux-mkl-vtk -DBUILD_PACKAGE=RPM ..
RUN cd suanPan/build && make install -j"$(nproc)" && make package
RUN cd suanPan/build && cp suanPan*.rpm / && \
tar czf /suanPan-linux-mkl-vtk.tar.gz suanPan-linux-mkl-vtk && \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 5798bd0

Please sign in to comment.