From 6d91672cc999a3ce6151738b2b56fd609bb31444 Mon Sep 17 00:00:00 2001 From: blackgaryc Date: Wed, 29 Jun 2022 14:45:31 +0000 Subject: [PATCH 1/4] add mfem --- package/mfem/4.4/install.sh | 10 ++++++ templates/mfem/4.4/data.mfem.amd.cpu.config | 34 +++++++++++++++++++++ test/test-mfem.sh | 25 +++++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 package/mfem/4.4/install.sh create mode 100644 templates/mfem/4.4/data.mfem.amd.cpu.config create mode 100644 test/test-mfem.sh diff --git a/package/mfem/4.4/install.sh b/package/mfem/4.4/install.sh new file mode 100644 index 00000000..54402bb9 --- /dev/null +++ b/package/mfem/4.4/install.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -x +set -e +. ${DOWNLOAD_TOOL} -u https://github.com/mfem/mfem/archive/refs/tags/v4.4.tar.gz +cd ${JARVIS_TMP} +rm -rf mfem-4.4 +tar -xvf ${JARVIS_DOWNLOAD}/v4.4.tar.gz +cd mfem-4.4 +make serial -j 4 +make install \ No newline at end of file diff --git a/templates/mfem/4.4/data.mfem.amd.cpu.config b/templates/mfem/4.4/data.mfem.amd.cpu.config new file mode 100644 index 00000000..23afbd70 --- /dev/null +++ b/templates/mfem/4.4/data.mfem.amd.cpu.config @@ -0,0 +1,34 @@ +[SERVER] +11.11.11.11 + +[DEPENDENCY] +set -e +set -x +./jarvis -install gcc/9.3.0 com +module purge +module use ./software/modulefiles +module load gcc/9.3.0 +export CC=`which gcc` +export CXX=`which g++` +export FC=`which gfortran` +[ENV] +module purge +module use ${JARVIS_ROOT}/software/modulefiles +module load gcc/9.3.0 +export CC=`which gcc` +export CXX=`which g++` +export FC=`which gfortran` + +[APP] +app_name = mfem +build_dir = ${JARVIS_ROOT} +binary_dir = +case_dir = + +[BUILD] +./jarvis -install mfem/4.4 gcc + +[RUN] +run = +binary = +node = 1 diff --git a/test/test-mfem.sh b/test/test-mfem.sh new file mode 100644 index 00000000..1ceaf621 --- /dev/null +++ b/test/test-mfem.sh @@ -0,0 +1,25 @@ +#!/bin/bash +cd .. +# release mfem src code +rm -rf tmp/mfem-4.4 +tar xzvf ./downloads/mfem-4.4.tar.gz -C tmp/ +# copy templates +cp -rf templates/mfem/4.4/data.mfem.amd.cpu.config ./ +# switch to config +./jarvis -use data.mfem.amd.cpu.config +# install dependency +./jarvis -dp +# generate environment +./jarvis -e +# environment setup +source env.sh +# build +./jarvis -b +# run +# ./jarvis -r +# # perf +# ./jarvis -p +# # kperf +# ./jarvis -kp +# # gpu nsysperf +# ./jarvis -gp \ No newline at end of file -- Gitee From 350fb42b022279e3c54c0a373eebe70ba956439d Mon Sep 17 00:00:00 2001 From: blackgaryc Date: Wed, 29 Jun 2022 14:51:36 +0000 Subject: [PATCH 2/4] update --- package/mfem/4.4/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mfem/4.4/install.sh b/package/mfem/4.4/install.sh index 54402bb9..5415573a 100644 --- a/package/mfem/4.4/install.sh +++ b/package/mfem/4.4/install.sh @@ -6,5 +6,5 @@ cd ${JARVIS_TMP} rm -rf mfem-4.4 tar -xvf ${JARVIS_DOWNLOAD}/v4.4.tar.gz cd mfem-4.4 -make serial -j 4 -make install \ No newline at end of file +make serial -j +make install PREFIX=$1 \ No newline at end of file -- Gitee From 50735bf952a2680d6561dc8ee2ce72ac876ad1a3 Mon Sep 17 00:00:00 2001 From: blackgaryc Date: Thu, 30 Jun 2022 22:14:58 +0800 Subject: [PATCH 3/4] update --- container/openeuler-gcc-9.3.0-mfem.def | 34 +++++++++++++++++++++ templates/mfem/4.4/data.mfem.amd.cpu.config | 2 +- test/test-mfem.sh | 12 +------- 3 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 container/openeuler-gcc-9.3.0-mfem.def diff --git a/container/openeuler-gcc-9.3.0-mfem.def b/container/openeuler-gcc-9.3.0-mfem.def new file mode 100644 index 00000000..b45e03fc --- /dev/null +++ b/container/openeuler-gcc-9.3.0-mfem.def @@ -0,0 +1,34 @@ +BootStrap: docker +From: openeuler/openeuler + +%environment + source /etc/profile || true + cd /hpcrunner + source env.sh + +%post + # Install the necessary development environment + yum install -y environment-modules git dmidecode pciutils wget vim + # Install base gcc + yum install -y gcc gcc-c++ gcc-gfortran glibc-devel make libgfortran + # install network package + yum install -y tcsh tcl lsof tk bc + source /etc/profile || true + git config --global http.sslVerify false + git clone https://gitee.com/openeuler/hpcrunner + cd hpcrunner + source ./init.sh + ./jarvis -i + # Switch config + ./jarvis -use templates/mfem/4.4/data.mfem.amd.cpu.config + # install dependency + ./jarvis -dp + # build hpc + ./jarvis -b + # run hpc + ./jarvis -r + # clean tmp directory + #rm -rf downloads tmp + +%labels + Author blackgaryc \ No newline at end of file diff --git a/templates/mfem/4.4/data.mfem.amd.cpu.config b/templates/mfem/4.4/data.mfem.amd.cpu.config index 23afbd70..1b7d896b 100644 --- a/templates/mfem/4.4/data.mfem.amd.cpu.config +++ b/templates/mfem/4.4/data.mfem.amd.cpu.config @@ -29,6 +29,6 @@ case_dir = ./jarvis -install mfem/4.4 gcc [RUN] -run = +run = make test binary = node = 1 diff --git a/test/test-mfem.sh b/test/test-mfem.sh index 1ceaf621..56e233b2 100644 --- a/test/test-mfem.sh +++ b/test/test-mfem.sh @@ -9,17 +9,7 @@ cp -rf templates/mfem/4.4/data.mfem.amd.cpu.config ./ ./jarvis -use data.mfem.amd.cpu.config # install dependency ./jarvis -dp -# generate environment -./jarvis -e -# environment setup -source env.sh # build ./jarvis -b # run -# ./jarvis -r -# # perf -# ./jarvis -p -# # kperf -# ./jarvis -kp -# # gpu nsysperf -# ./jarvis -gp \ No newline at end of file +./jarvis -r -- Gitee From 224a0366b3b706731594de9d4ce56d061b536210 Mon Sep 17 00:00:00 2001 From: blackgaryc Date: Sat, 2 Jul 2022 14:59:44 +0800 Subject: [PATCH 4/4] update --- package/mfem/4.4/install.sh | 1 + templates/mfem/4.4/data.mfem.amd.cpu.config | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mfem/4.4/install.sh b/package/mfem/4.4/install.sh index 5415573a..66ac7f62 100644 --- a/package/mfem/4.4/install.sh +++ b/package/mfem/4.4/install.sh @@ -5,6 +5,7 @@ set -e cd ${JARVIS_TMP} rm -rf mfem-4.4 tar -xvf ${JARVIS_DOWNLOAD}/v4.4.tar.gz +sed -i 's/>= MINSIGSTKSZ.*/;/' mfem-4.4/tests/unit/catch.hpp cd mfem-4.4 make serial -j make install PREFIX=$1 \ No newline at end of file diff --git a/templates/mfem/4.4/data.mfem.amd.cpu.config b/templates/mfem/4.4/data.mfem.amd.cpu.config index 1b7d896b..2c5c6825 100644 --- a/templates/mfem/4.4/data.mfem.amd.cpu.config +++ b/templates/mfem/4.4/data.mfem.amd.cpu.config @@ -29,6 +29,6 @@ case_dir = ./jarvis -install mfem/4.4 gcc [RUN] -run = make test +run = cd ${JARVIS_ROOT}/tmp/mfem-4.4 && make test binary = -node = 1 +nodes = 1 -- Gitee