Skip to content

Commit

Permalink
Minor update
Browse files Browse the repository at this point in the history
  • Loading branch information
TLCFEM committed Oct 8, 2024
1 parent a2b1986 commit 4c6c62d
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dev-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ env:
IOMP: ''
COVERAGE: ''
jobs:
ubuntu-dev:
linux-dev:
if: ${{ !contains(github.event.head_commit.message, '[skip.linux]') && !contains(github.event.head_commit.message, '[skip.all]') }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 60
strategy:
matrix:
Expand Down
59 changes: 59 additions & 0 deletions .github/workflows/dev-daily.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Daily
on:
schedule:
- cron: '0 5 * * *'
workflow_dispatch:
env:
SP_TIME: ''
ARTIFACT: ''
jobs:
linux-daily:
runs-on: ubuntu-24.04
timeout-minutes: 60
strategy:
matrix:
build: [ Debug ]
compiler: [ { c: gcc, cpp: g++, fortran: gfortran } ]
avx: [ OFF ]
vtk: [ OFF ]
mkl: [ OFF ]
steps:
- name: Clone
uses: actions/checkout@v4
- name: Golang
uses: actions/setup-go@v5
with:
cache: false
- name: Dependency
run: |
echo "SP_TIME=-$(date +''%y%m%d'')" >> $GITHUB_ENV
sudo apt-get update && sudo apt-get install libglvnd-dev dpkg-dev xz-utils
- name: Compile
run: |
go build Checker/updater.go
mkdir build && cd build
cmake -DCMAKE_C_COMPILER=${{ matrix.compiler.c }} -DCMAKE_CXX_COMPILER=${{ matrix.compiler.cpp }} -DCMAKE_Fortran_COMPILER=${{ matrix.compiler.fortran }} -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DUSE_AVX2=${{ matrix.avx }} -DBUILD_MULTITHREAD=OFF -DCMAKE_INSTALL_PREFIX=dist ..
make install -j"$(nproc)" && make package
- name: Pack
run: |
cp updater build/dist/bin
file_name="suanPan-linux-debug-gcc-no-avx-openblas"
file_name+="${{ env.SP_TIME }}.tar.gz"
echo "ARTIFACT=$file_name" >> "$GITHUB_ENV"
tar czf $file_name -C build/dist .
- name: Upload
uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACT }}
path: ${{ env.ARTIFACT }}
- name: Test
run: |
export LD_LIBRARY_PATH=/home/runner/work/suanPan/suanPan/build/dist/lib
./build/dist/bin/suanPan -v
- name: Upload
uses: Difegue/action-megacmd@master
with:
args: put ${{ env.ARTIFACT }} /suanPan
env:
USERNAME: ${{ secrets.USERNAME }}
PASSWORD: ${{ secrets.PASSWORD }}
7 changes: 4 additions & 3 deletions .github/workflows/docker-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ name: Docker Base Image
on:
schedule:
- cron: '0 5 2 * *'
workflow_dispatch:
jobs:
env-image:
runs-on: ubuntu-latest
timeout-minutes: 60
ide-image:
runs-on: self-hosted
timeout-minutes: 240
steps:
- name: Clone
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ on:
push:
branches: [ dev ]
jobs:
ubuntu-dev:
linux:
if: ${{ !contains(github.event.head_commit.message, '[skip.all]') }}
runs-on: ubuntu-22.04
runs-on: self-hosted
timeout-minutes: 60
steps:
- name: Clone
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/master-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ env:
SP_TIME: ''
ARTIFACT: ''
jobs:
ubuntu-master:
runs-on: ubuntu-22.04
linux-master:
runs-on: ubuntu-24.04
timeout-minutes: 60
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion Script/Rocky.CUDA.Dockerfile
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_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 && \
Expand Down
2 changes: 1 addition & 1 deletion Script/Rocky.Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down

0 comments on commit 4c6c62d

Please sign in to comment.