Minor update

TLCFEM · Oct 8, 2024 · a62a0f7 · a62a0f7
1 parent 8623b37
commit a62a0f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -393,10 +393,10 @@ endforeach ()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     file(READ "/etc/os-release" DISTRO_INFO)
-    string(REGEX MATCH "fedora|ubuntu" DIST ${DISTRO_INFO})
+    string(REGEX MATCH "fedora|ubuntu|Debian" DIST ${DISTRO_INFO})
 
     if (DIST OR BUILD_PACKAGE)
-        if ((DIST STREQUAL "ubuntu") OR (BUILD_PACKAGE MATCHES "DEB"))
+        if ((DIST STREQUAL "ubuntu") OR (DIST STREQUAL "Debian") OR (BUILD_PACKAGE MATCHES "DEB"))
             message(STATUS "Build DEB Package For Distribution: ${DIST}")
             set(CPACK_GENERATOR "DEB")
             # set(CPACK_DEBIAN_PACKAGE_DEPENDS "libstdc++6 libglvnd0 libgfortran5 libgomp1")

diff --git a/Script/Rocky.CUDA.Dockerfile b/Script/Rocky.CUDA.Dockerfile
@@ -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_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 -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 && \

diff --git a/Script/Rocky.Dockerfile b/Script/Rocky.Dockerfile
@@ -1,7 +1,7 @@
 FROM tlcfem/suanpan-env: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_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_VTK=ON -DUSE_AVX2=OFF -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/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 && \