diff --git a/MSVC/suanPan/suanPan/suanPan.vcxproj b/MSVC/suanPan/suanPan/suanPan.vcxproj index a6ab8289..8d1e760e 100644 --- a/MSVC/suanPan/suanPan/suanPan.vcxproj +++ b/MSVC/suanPan/suanPan/suanPan.vcxproj @@ -82,7 +82,7 @@ true SUANPAN_MT;SUANPAN_HDF5;SUANPAN_VTK;SUANPAN_MKL;SUANPAN_CUDA;SUANPAN_MAGMA;SUANPAN_AVX2;NDEBUG;_CONSOLE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;%(PreprocessorDefinitions) true - ../../..;../../../Include;../../../Include/hdf5;../../../Include/hdf5-vs;../../../Include/fmt/include;$(MAGMA_DIR)/include;$(VTK_DIR)/include/vtk-9.2;$(CUDA_PATH)/include;%(AdditionalIncludeDirectories) + ../../..;../../../Include;../../../Include/hdf5;../../../Include/hdf5-vs;../../../Include/fmt/include;$(MAGMA_DIR)/include;$(VTK_DIR)/include/vtk-9.4;$(CUDA_PATH)/include;%(AdditionalIncludeDirectories) true AdvancedVectorExtensions2 stdcpp20 @@ -96,7 +96,7 @@ true true ../../../Libs/vs;../../$(Configuration)/Libs;$(VTK_DIR)/lib;$(CUDA_PATH)/lib/x64;$(MAGMA_DIR)/lib;%(AdditionalLibraryDirectories) - cusparse.lib;cusolver.lib;cublas.lib;cudart.lib;amd.lib;arpack.lib;metis.lib;mumps_c.lib;mumps_f.lib;lis.lib;feast.lib;superlu.lib;libhdf5.lib;libhdf5_hl.lib;magma.lib;magma_sparse.lib;opengl32.lib;wsock32.lib;psapi.lib;dbghelp.lib;vtkcgns-9.2.lib;vtkChartsCore-9.2.lib;vtkCommonColor-9.2.lib;vtkCommonComputationalGeometry-9.2.lib;vtkCommonCore-9.2.lib;vtkCommonDataModel-9.2.lib;vtkCommonExecutionModel-9.2.lib;vtkCommonMath-9.2.lib;vtkCommonMisc-9.2.lib;vtkCommonSystem-9.2.lib;vtkCommonTransforms-9.2.lib;vtkDICOMParser-9.2.lib;vtkDomainsChemistry-9.2.lib;vtkDomainsChemistryOpenGL2-9.2.lib;vtkdoubleconversion-9.2.lib;vtkexodusII-9.2.lib;vtkexpat-9.2.lib;vtkFiltersAMR-9.2.lib;vtkFiltersCore-9.2.lib;vtkFiltersExtraction-9.2.lib;vtkFiltersFlowPaths-9.2.lib;vtkFiltersGeneral-9.2.lib;vtkFiltersGeneric-9.2.lib;vtkFiltersGeometry-9.2.lib;vtkFiltersHybrid-9.2.lib;vtkFiltersHyperTree-9.2.lib;vtkFiltersImaging-9.2.lib;vtkFiltersModeling-9.2.lib;vtkFiltersParallel-9.2.lib;vtkFiltersParallelImaging-9.2.lib;vtkFiltersPoints-9.2.lib;vtkFiltersProgrammable-9.2.lib;vtkFiltersSelection-9.2.lib;vtkFiltersSMP-9.2.lib;vtkFiltersSources-9.2.lib;vtkFiltersStatistics-9.2.lib;vtkFiltersTexture-9.2.lib;vtkFiltersTopology-9.2.lib;vtkFiltersVerdict-9.2.lib;vtkfmt-9.2.lib;vtkfreetype-9.2.lib;vtkGeovisCore-9.2.lib;vtkgl2ps-9.2.lib;vtkglew-9.2.lib;vtkhdf5_hl-9.2.lib;vtkhdf5-9.2.lib;vtkImagingColor-9.2.lib;vtkImagingCore-9.2.lib;vtkImagingFourier-9.2.lib;vtkImagingGeneral-9.2.lib;vtkImagingHybrid-9.2.lib;vtkImagingMath-9.2.lib;vtkImagingMorphological-9.2.lib;vtkImagingSources-9.2.lib;vtkImagingStatistics-9.2.lib;vtkImagingStencil-9.2.lib;vtkInfovisCore-9.2.lib;vtkInfovisLayout-9.2.lib;vtkInteractionImage-9.2.lib;vtkInteractionStyle-9.2.lib;vtkInteractionWidgets-9.2.lib;vtkIOAMR-9.2.lib;vtkIOAsynchronous-9.2.lib;vtkIOCesium3DTiles-9.2.lib;vtkIOCGNSReader-9.2.lib;vtkIOChemistry-9.2.lib;vtkIOCityGML-9.2.lib;vtkIOCONVERGECFD-9.2.lib;vtkIOCore-9.2.lib;vtkIOEnSight-9.2.lib;vtkIOExodus-9.2.lib;vtkIOExport-9.2.lib;vtkIOExportGL2PS-9.2.lib;vtkIOExportPDF-9.2.lib;vtkIOGeometry-9.2.lib;vtkIOHDF-9.2.lib;vtkIOImage-9.2.lib;vtkIOImport-9.2.lib;vtkIOInfovis-9.2.lib;vtkIOIOSS-9.2.lib;vtkIOLegacy-9.2.lib;vtkIOLSDyna-9.2.lib;vtkIOMINC-9.2.lib;vtkIOMotionFX-9.2.lib;vtkIOMovie-9.2.lib;vtkIONetCDF-9.2.lib;vtkIOOggTheora-9.2.lib;vtkIOParallel-9.2.lib;vtkIOParallelXML-9.2.lib;vtkIOPLY-9.2.lib;vtkIOSegY-9.2.lib;vtkIOSQL-9.2.lib;vtkioss-9.2.lib;vtkIOTecplotTable-9.2.lib;vtkIOVeraOut-9.2.lib;vtkIOVideo-9.2.lib;vtkIOXML-9.2.lib;vtkIOXMLParser-9.2.lib;vtkjpeg-9.2.lib;vtkjsoncpp-9.2.lib;vtkkissfft-9.2.lib;vtklibharu-9.2.lib;vtklibproj-9.2.lib;vtklibxml2-9.2.lib;vtkloguru-9.2.lib;vtklz4-9.2.lib;vtklzma-9.2.lib;vtkmetaio-9.2.lib;vtknetcdf-9.2.lib;vtkogg-9.2.lib;vtkParallelCore-9.2.lib;vtkParallelDIY-9.2.lib;vtkpng-9.2.lib;vtkpugixml-9.2.lib;vtkRenderingAnnotation-9.2.lib;vtkRenderingContext2D-9.2.lib;vtkRenderingContextOpenGL2-9.2.lib;vtkRenderingCore-9.2.lib;vtkRenderingFreeType-9.2.lib;vtkRenderingGL2PSOpenGL2-9.2.lib;vtkRenderingHyperTreeGrid-9.2.lib;vtkRenderingImage-9.2.lib;vtkRenderingLabel-9.2.lib;vtkRenderingLICOpenGL2-9.2.lib;vtkRenderingLOD-9.2.lib;vtkRenderingOpenGL2-9.2.lib;vtkRenderingSceneGraph-9.2.lib;vtkRenderingUI-9.2.lib;vtkRenderingVolume-9.2.lib;vtkRenderingVolumeOpenGL2-9.2.lib;vtkRenderingVtkJS-9.2.lib;vtksqlite-9.2.lib;vtksys-9.2.lib;vtkTestingRendering-9.2.lib;vtktheora-9.2.lib;vtktiff-9.2.lib;vtkverdict-9.2.lib;vtkViewsContext2D-9.2.lib;vtkViewsCore-9.2.lib;vtkViewsInfovis-9.2.lib;vtkWrappingTools-9.2.lib;vtkzlib-9.2.lib;%(AdditionalDependencies) + cusparse.lib;cusolver.lib;cublas.lib;cudart.lib;amd.lib;arpack.lib;metis.lib;mumps_c.lib;mumps_f.lib;lis.lib;feast.lib;superlu.lib;libhdf5.lib;libhdf5_hl.lib;magma.lib;magma_sparse.lib;opengl32.lib;wsock32.lib;psapi.lib;dbghelp.lib;vtkcgns-9.4.lib;vtkChartsCore-9.4.lib;vtkCommonColor-9.4.lib;vtkCommonComputationalGeometry-9.4.lib;vtkCommonCore-9.4.lib;vtkCommonDataModel-9.4.lib;vtkCommonExecutionModel-9.4.lib;vtkCommonMath-9.4.lib;vtkCommonMisc-9.4.lib;vtkCommonSystem-9.4.lib;vtkCommonTransforms-9.4.lib;vtkDICOMParser-9.4.lib;vtkDomainsChemistry-9.4.lib;vtkDomainsChemistryOpenGL2-9.4.lib;vtkdoubleconversion-9.4.lib;vtkexodusII-9.4.lib;vtkexpat-9.4.lib;vtkFiltersAMR-9.4.lib;vtkFiltersCore-9.4.lib;vtkFiltersExtraction-9.4.lib;vtkFiltersFlowPaths-9.4.lib;vtkFiltersGeneral-9.4.lib;vtkFiltersGeneric-9.4.lib;vtkFiltersGeometry-9.4.lib;vtkFiltersHybrid-9.4.lib;vtkFiltersHyperTree-9.4.lib;vtkFiltersImaging-9.4.lib;vtkFiltersModeling-9.4.lib;vtkFiltersParallel-9.4.lib;vtkFiltersParallelImaging-9.4.lib;vtkFiltersPoints-9.4.lib;vtkFiltersProgrammable-9.4.lib;vtkFiltersSelection-9.4.lib;vtkFiltersSMP-9.4.lib;vtkFiltersSources-9.4.lib;vtkFiltersStatistics-9.4.lib;vtkFiltersTexture-9.4.lib;vtkFiltersTopology-9.4.lib;vtkFiltersVerdict-9.4.lib;vtkfmt-9.4.lib;vtkfreetype-9.4.lib;vtkGeovisCore-9.4.lib;vtkgl2ps-9.4.lib;vtkglew-9.4.lib;vtkhdf5_hl-9.4.lib;vtkhdf5-9.4.lib;vtkImagingColor-9.4.lib;vtkImagingCore-9.4.lib;vtkImagingFourier-9.4.lib;vtkImagingGeneral-9.4.lib;vtkImagingHybrid-9.4.lib;vtkImagingMath-9.4.lib;vtkImagingMorphological-9.4.lib;vtkImagingSources-9.4.lib;vtkImagingStatistics-9.4.lib;vtkImagingStencil-9.4.lib;vtkInfovisCore-9.4.lib;vtkInfovisLayout-9.4.lib;vtkInteractionImage-9.4.lib;vtkInteractionStyle-9.4.lib;vtkInteractionWidgets-9.4.lib;vtkIOAMR-9.4.lib;vtkIOAsynchronous-9.4.lib;vtkIOCesium3DTiles-9.4.lib;vtkIOCGNSReader-9.4.lib;vtkIOChemistry-9.4.lib;vtkIOCityGML-9.4.lib;vtkIOCONVERGECFD-9.4.lib;vtkIOCore-9.4.lib;vtkIOEnSight-9.4.lib;vtkIOExodus-9.4.lib;vtkIOExport-9.4.lib;vtkIOExportGL2PS-9.4.lib;vtkIOExportPDF-9.4.lib;vtkIOGeometry-9.4.lib;vtkIOHDF-9.4.lib;vtkIOImage-9.4.lib;vtkIOImport-9.4.lib;vtkIOInfovis-9.4.lib;vtkIOIOSS-9.4.lib;vtkIOLegacy-9.4.lib;vtkIOLSDyna-9.4.lib;vtkIOMINC-9.4.lib;vtkIOMotionFX-9.4.lib;vtkIOMovie-9.4.lib;vtkIONetCDF-9.4.lib;vtkIOOggTheora-9.4.lib;vtkIOParallel-9.4.lib;vtkIOParallelXML-9.4.lib;vtkIOPLY-9.4.lib;vtkIOSegY-9.4.lib;vtkIOSQL-9.4.lib;vtkioss-9.4.lib;vtkIOTecplotTable-9.4.lib;vtkIOVeraOut-9.4.lib;vtkIOVideo-9.4.lib;vtkIOXML-9.4.lib;vtkIOXMLParser-9.4.lib;vtkjpeg-9.4.lib;vtkjsoncpp-9.4.lib;vtkkissfft-9.4.lib;vtklibharu-9.4.lib;vtklibproj-9.4.lib;vtklibxml2-9.4.lib;vtkloguru-9.4.lib;vtklz4-9.4.lib;vtklzma-9.4.lib;vtkmetaio-9.4.lib;vtknetcdf-9.4.lib;vtkogg-9.4.lib;vtkParallelCore-9.4.lib;vtkParallelDIY-9.4.lib;vtkpng-9.4.lib;vtkpugixml-9.4.lib;vtkRenderingAnnotation-9.4.lib;vtkRenderingContext2D-9.4.lib;vtkRenderingContextOpenGL2-9.4.lib;vtkRenderingCore-9.4.lib;vtkRenderingFreeType-9.4.lib;vtkRenderingGL2PSOpenGL2-9.4.lib;vtkRenderingHyperTreeGrid-9.4.lib;vtkRenderingImage-9.4.lib;vtkRenderingLabel-9.4.lib;vtkRenderingLICOpenGL2-9.4.lib;vtkRenderingLOD-9.4.lib;vtkRenderingOpenGL2-9.4.lib;vtkRenderingSceneGraph-9.4.lib;vtkRenderingUI-9.4.lib;vtkRenderingVolume-9.4.lib;vtkRenderingVolumeOpenGL2-9.4.lib;vtkRenderingVtkJS-9.4.lib;vtksqlite-9.4.lib;vtksys-9.4.lib;vtkTestingRendering-9.4.lib;vtktheora-9.4.lib;vtktiff-9.4.lib;vtkverdict-9.4.lib;vtkViewsContext2D-9.4.lib;vtkViewsCore-9.4.lib;vtkViewsInfovis-9.4.lib;vtkWrappingTools-9.4.lib;vtkzlib-9.4.lib;%(AdditionalDependencies) diff --git a/README.md b/README.md index b3a71c93..ade57d67 100644 --- a/README.md +++ b/README.md @@ -292,7 +292,7 @@ Additional libraries used in **suanPan** are listed as follows. - [**HDF5**](https://www.hdfgroup.org/solutions/hdf5/) version 1.10.6 - [**MUMPS**](https://mumps-solver.org/) version 5.7.3 - [**METIS**](http://glaros.dtc.umn.edu/gkhome/metis/metis/overview) version 5.1.0 -- [**VTK**](https://vtk.org/) version 9.2.6 +- [**VTK**](https://vtk.org/) version 9.4 - [**CUDA**](https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/) version 12.5 - [**MAGMA**](https://icl.utk.edu/magma/) version 2.8.0 - [**Armadillo**](http://arma.sourceforge.net/) version 14.2.1 diff --git a/Script/Rocky.Pre.CUDA.Dockerfile b/Script/Rocky.Pre.CUDA.Dockerfile index d60ce80b..65ac8b7d 100644 --- a/Script/Rocky.Pre.CUDA.Dockerfile +++ b/Script/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.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 dnf install -y procps diff --git a/Script/Rocky.Pre.Dockerfile b/Script/Rocky.Pre.Dockerfile index a369d799..920b3883 100644 --- a/Script/Rocky.Pre.Dockerfile +++ b/Script/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.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 # ARG USERNAME=nonroot diff --git a/snapcraft.yaml b/snapcraft.yaml index 8d465ab8..1ba6ab2d 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -43,7 +43,7 @@ parts: - -DUSE_AVX2=OFF - -DUSE_HDF5=ON - -DUSE_VTK=ON - - -DVTK_DIR=$CRAFT_PART_BUILD/lib/cmake/vtk-9.2/ + - -DVTK_DIR=$CRAFT_PART_BUILD/lib/cmake/vtk-9.4/ - -DUSE_MKL=ON - -DMKLROOT=/opt/intel/oneapi/mkl/latest - -DUSE_INTEL_OPENMP=OFF @@ -58,10 +58,10 @@ parts: - freeglut3-dev - libglvnd-dev override-build: | - wget -q https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-linux.tar.gz - tar xf VTK-9.2.6-linux.tar.gz - wget -q https://registrationcenter-download.intel.com/akdlm/IRC_NAS/79153e0f-74d7-45af-b8c2-258941adf58a/intel-onemkl-2025.0.0.940_offline.sh - sh ./intel-onemkl-2025.0.0.940_offline.sh -a --silent --eula accept + 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://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 stage-packages: - libgfortran5