From 45f50a8631eeaf84120e4b78f4adec9aa3df6843 Mon Sep 17 00:00:00 2001 From: Theodore Chang Date: Sun, 29 Dec 2024 02:14:06 +0100 Subject: [PATCH] Update VTK version 9.4.1 --- Script/Fedora.Dockerfile | 4 ++-- Script/Ubuntu.Dockerfile | 4 ++-- Script/amd64/Rocky.Pre.CUDA.Dockerfile | 4 ++-- Script/amd64/Rocky.Pre.Dockerfile | 4 ++-- Script/arm64/Rocky.Pre.Dockerfile | 4 ++-- snapcraft.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Script/Fedora.Dockerfile b/Script/Fedora.Dockerfile index 29029f3d..94e9d2ee 100644 --- a/Script/Fedora.Dockerfile +++ b/Script/Fedora.Dockerfile @@ -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.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 && \ + wget -q https://www.vtk.org/files/release/9.4/VTK-9.4.1.tar.gz && tar xf VTK-9.4.1.tar.gz && \ + cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ./VTK-9.4.1 && \ make install -j"$(nproc)" && cd .. && rm -r vtk-build RUN git clone -b dev --depth 1 https://github.com/TLCFEM/suanPan.git diff --git a/Script/Ubuntu.Dockerfile b/Script/Ubuntu.Dockerfile index e2cd0413..fea3c27b 100644 --- a/Script/Ubuntu.Dockerfile +++ b/Script/Ubuntu.Dockerfile @@ -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.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 && \ + wget -q https://www.vtk.org/files/release/9.4/VTK-9.4.1.tar.gz && tar xf VTK-9.4.1.tar.gz && \ + cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ./VTK-9.4.1 && \ make install -j"$(nproc)" && cd .. && rm -r vtk-build RUN git clone -b dev --depth 1 https://github.com/TLCFEM/suanPan.git diff --git a/Script/amd64/Rocky.Pre.CUDA.Dockerfile b/Script/amd64/Rocky.Pre.CUDA.Dockerfile index 65ac8b7d..af4f8a13 100644 --- a/Script/amd64/Rocky.Pre.CUDA.Dockerfile +++ b/Script/amd64/Rocky.Pre.CUDA.Dockerfile @@ -18,8 +18,8 @@ RUN dnf config-manager --enable crb RUN dnf install -y libglvnd-devel gfortran rpm-build rpm-devel rpmdevtools cmake wget git ninja-build intel-oneapi-mkl-devel RUN mkdir vtk-build && cd vtk-build && \ - 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 && \ + wget -q https://www.vtk.org/files/release/9.4/VTK-9.4.1.tar.gz && tar xf VTK-9.4.1.tar.gz && \ + cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ./VTK-9.4.1 && \ make install -j"$(nproc)" && cd .. && rm -r vtk-build RUN dnf install -y procps diff --git a/Script/amd64/Rocky.Pre.Dockerfile b/Script/amd64/Rocky.Pre.Dockerfile index 920b3883..f1936a56 100644 --- a/Script/amd64/Rocky.Pre.Dockerfile +++ b/Script/amd64/Rocky.Pre.Dockerfile @@ -15,8 +15,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.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 && \ + wget -q https://www.vtk.org/files/release/9.4/VTK-9.4.1.tar.gz && tar xf VTK-9.4.1.tar.gz && \ + cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ./VTK-9.4.1 && \ make install -j"$(nproc)" && cd .. && rm -r vtk-build # ARG USERNAME=nonroot diff --git a/Script/arm64/Rocky.Pre.Dockerfile b/Script/arm64/Rocky.Pre.Dockerfile index 55a671fc..1d8b58a7 100644 --- a/Script/arm64/Rocky.Pre.Dockerfile +++ b/Script/arm64/Rocky.Pre.Dockerfile @@ -15,7 +15,7 @@ RUN mkdir tbb-build && cd tbb-build && cmake -DCMAKE_BUILD_TYPE=Release -DTBB_TE # part 3: vtk RUN mkdir vtk-build && cd vtk-build && \ - 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 && \ + wget -q https://www.vtk.org/files/release/9.4/VTK-9.4.1.tar.gz && tar xf VTK-9.4.1.tar.gz && \ + cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ./VTK-9.4.1 && \ cmake --build . --target install --config Release --parallel "$(nproc)" && \ cd .. && rm -r vtk-build diff --git a/snapcraft.yaml b/snapcraft.yaml index 1ba6ab2d..0c5f3cab 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -58,8 +58,8 @@ parts: - freeglut3-dev - libglvnd-dev override-build: | - wget -q https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.4.0-linux.tar.gz - tar xf VTK-9.4.0-linux.tar.gz + wget -q https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.4.1-linux.tar.gz + tar xf VTK-9.4.1-linux.tar.gz wget -q https://registrationcenter-download.intel.com/akdlm/IRC_NAS/246ea40e-5aa7-42a4-81fa-0c029dc8650f/intel-onemkl-2025.0.1.16_offline.sh sh ./intel-onemkl-2025.0.1.16_offline.sh -a --silent --eula accept craftctl default