diff --git a/README.md b/README.md index be87946e2930864f247482e2380ca1a0b167bc67..fadee3c1cc6752d4a0fb804b21d235da441ad7a2 100644 --- a/README.md +++ b/README.md @@ -4,23 +4,9 @@ ### 项目背景 HPC被喻为是IT行业“金字塔上的明珠”，其部署、编译、运行、性能采集分析的门槛非常高，不同的机器上部署HPC应用耗费大量精力，而且很多情况下需要同时部署ARM/X86两套环境进行验证，增加了很多的重复性工作，无法聚焦核心算法优化。 -![贾维斯功能概览](./images/jarvis.png) -## 项目特色 -- 支持ARM/X86,一键部署，采用业界权威依赖目录结构管理海量依赖，自动生成module file -- 根据HPC配置实现一键编译运行、一键CPU/GPU性能采集、一键Benchmark. -- 所有配置仅用一个文件记录，HPC应用部署到不同的机器仅需修改配置文件. -- 日志管理系统自动记录HPC应用部署过程中的所有信息. -- 软件本身无需编译开箱即用，仅依赖Python环境. -- HPC应用容器化-目前QE已经实现，参考container目录. -- (未来) 集成HPC领域常用性能调优手段、核心算法. -- (未来) 集群性能分析工具. -- (未来) 智能调优. -## 贾维斯开发规划 - -![RoadMap](./images/roadmap.png) ## 环境依赖 @@ -182,28 +168,13 @@ A： 步骤3：在原来环境下进行后续安装操作 ``` +Q2：软件会安装到哪里？ +``` +A： +按照模板开发规则，应用在使用jarvis安装后，会安装的${JARVIS_TMP}目录，默认情况，为保障安装速度，${JARVIS_TMP}路径为 ‘/tmp’，如果需要修改${JARVIS_TMP}指向路径可修改init.sh,并重新source +``` # 欢迎贡献 +小的改进或修复总是值得赞赏的，可以提交一个issue或者在hpc.openeuler.org进行讨论。 +[查看Jarvis贡献方法](README_CONTRIBUTING.md) -贾维斯项目欢迎您的专业技能和热情参与！ - -小的改进或修复总是值得赞赏的；先从文档开始可能是一个很好的起点。如果您正在考虑做出更大贡献，请提交一个issue或者在hpc.openeuler.org进行讨论。 - -编写代码并不是为贾维斯做出贡献的唯一方法。您还可以： - -- 贡献安装脚本 -- 帮助我们测试新的HPC应用 -- 开发教程、演示 -- 为我们宣传 -- 帮助新的贡献者加入 - -请添加openEuler HPC SIG微信群了解更多HPC部署调优知识 - -![微信群](./images/wechat-group-qr.png) - -# 技术文章 - -揭开HPC应用的神秘面纱：https://zhuanlan.zhihu.com/p/489828346 - -我和容器有个约会：https://zhuanlan.zhihu.com/p/499544308 -贾维斯：完美而凛然HPC应用管家 https://zhuanlan.zhihu.com/p/518460349 diff --git a/CONTRIBUTING.md b/README_CONTRIBUTING.md similarity index 48% rename from CONTRIBUTING.md rename to README_CONTRIBUTING.md index 0ae5e1a1621aebc0d271eb8e7eec4f1493f743eb..680804338a304f81238f306fec456602448f71c2 100644 --- a/CONTRIBUTING.md +++ b/README_CONTRIBUTING.md @@ -1,3 +1,35 @@ +# 贾维斯项目欢迎您的专业技能和热情参与！ + +小的改进或修复总是值得赞赏的；先从文档开始可能是一个很好的起点。如果您正在考虑做出更大贡献，请提交一个issue或者在hpc.openeuler.org进行讨论。 + +编写代码并不是为贾维斯做出贡献的唯一方法。您还可以： + +- 贡献安装脚本 +- 帮助我们测试新的HPC应用 +- 开发教程、演示 +- 为我们宣传 +- 帮助新的贡献者加入 + + + +## 贾维斯项目特色 +![贾维斯功能概览](./images/jarvis.png) +- 支持ARM/X86,一键部署，采用业界权威依赖目录结构管理海量依赖，自动生成module file +- 根据HPC配置实现一键编译运行、一键CPU/GPU性能采集、一键Benchmark. +- 所有配置仅用一个文件记录，HPC应用部署到不同的机器仅需修改配置文件. +- 日志管理系统自动记录HPC应用部署过程中的所有信息. +- 软件本身无需编译开箱即用，仅依赖Python环境. +- HPC应用容器化-目前QE已经实现，参考container目录. +- (未来) 集成HPC领域常用性能调优手段、核心算法. +- (未来) 集群性能分析工具. +- (未来) 智能调优. + +## 贾维斯开发规划 + +![RoadMap](./images/roadmap.png) + +# **代码合入指导** + ## **GITEE提交前提工作** **1.设置SSH** @@ -56,7 +88,8 @@ git push origin new_branch https://gitee.com/iotwins/hpcrunner -**FAQ** + +## **FAQ** **1.某次commit的信息提交错误怎么办？** @@ -81,4 +114,42 @@ Successfully rebased and updated xxx **1.3 git push** 提交到远程仓库： -git push --force origin master \ No newline at end of file +git push --force origin master + + +# HPCRunner 开发者注意事项 +## 1、使用安装HPCKIT的方式替代单独安装HMPI、BISHENG以及数学库 +建议使用如下方式安装并使能hpckit +``` +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/224.0.0/HPCKit/24.0.0/modulefiles +module purge +module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi +``` +不建议使用如下方式 +``` +./jarvis -install hmpi/1.1.1 clang +module use software/moduledeps/bisheng2.1.0 +module load hmpi/1.1.1 +``` +## 2、开发模板路径禁止使用绝对路径 +如不建议使用如下方式 +``` +export JARVIS_ROOT=/hpcrunner +``` + + + + + + +# 技术文章 + +揭开HPC应用的神秘面纱：https://zhuanlan.zhihu.com/p/489828346 + +我和容器有个约会：https://zhuanlan.zhihu.com/p/499544308 + +贾维斯：完美而凛然HPC应用管家 https://zhuanlan.zhihu.com/p/518460349 + +更多信息请添加openEuler HPC SIG微信群了解更多HPC部署调优知识 +![微信群](./images/wechat-group-qr.png) diff --git "a/doc/ mumps/5.1.2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mumps\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/ mumps/5.1.2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mumps\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 1d244009931bcedbe3cc18216eeba95de8a29563..769dbe2c439f4181924b976424372b43d26b2a91 100644 --- "a/doc/ mumps/5.1.2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mumps\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/ mumps/5.1.2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mumps\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -370,6 +370,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/bowtie2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204bowtie2\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/bowtie2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204bowtie2\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 6fa3ecebcb2582f330f6c3f684932931379db529..2f958714c1cf4234c1732f56a501ba96f2d08fe0 100644 --- "a/doc/bowtie2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204bowtie2\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/bowtie2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204bowtie2\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -256,6 +256,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` \ No newline at end of file diff --git "a/doc/duns/\343\200\212\345\237\272\344\272\216openEuler\347\232\204duns\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/duns/\343\200\212\345\237\272\344\272\216openEuler\347\232\204duns\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 501fbc232370f6a4ea131e388434ee2d754c455c..77a57850443bd03b1dcf1cc6131bc1e301deb04f 100644 --- "a/doc/duns/\343\200\212\345\237\272\344\272\216openEuler\347\232\204duns\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/duns/\343\200\212\345\237\272\344\272\216openEuler\347\232\204duns\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -255,6 +255,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` \ No newline at end of file diff --git "a/doc/imb/2021.3/\343\200\212\345\237\272\344\272\216openEuler\347\232\204imb\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/imb/2021.3/\343\200\212\345\237\272\344\272\216openEuler\347\232\204imb\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index b8370613a52ecb545397e500f7b121060569fb59..7a114afbfc1e3499cd40309ba6373100b4b19a55 100644 --- "a/doc/imb/2021.3/\343\200\212\345\237\272\344\272\216openEuler\347\232\204imb\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/imb/2021.3/\343\200\212\345\237\272\344\272\216openEuler\347\232\204imb\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -282,6 +282,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/mfem/4.4/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mfem\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/mfem/4.4/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mfem\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index b5069e39681ccf08fd689f6e3cf56b6c5908d9c5..350c6b30db4376032a758bc60035756e3cd46433 100644 --- "a/doc/mfem/4.4/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mfem\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/mfem/4.4/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mfem\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -318,6 +318,6 @@ singularity build --sandbox mfem-sandbox mfem-4.4-arm.sif #进入沙盒 singularity shell -w mfem-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/mumps/5.1.2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mumps\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/mumps/5.1.2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mumps\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 1d244009931bcedbe3cc18216eeba95de8a29563..769dbe2c439f4181924b976424372b43d26b2a91 100644 --- "a/doc/mumps/5.1.2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mumps\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/mumps/5.1.2/\343\200\212\345\237\272\344\272\216openEuler\347\232\204mumps\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -370,6 +370,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/ncl_nco_ncview/\343\200\212\345\237\272\344\272\216openEuler\347\232\204ncl_nco_ncview\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/ncl_nco_ncview/\343\200\212\345\237\272\344\272\216openEuler\347\232\204ncl_nco_ncview\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index de5c3bd3d3e668b9e7ee23b744fb50496084cd48..98405a22d7148c5b69fe67410d649f063d6c94d3 100644 --- "a/doc/ncl_nco_ncview/\343\200\212\345\237\272\344\272\216openEuler\347\232\204ncl_nco_ncview\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/ncl_nco_ncview/\343\200\212\345\237\272\344\272\216openEuler\347\232\204ncl_nco_ncview\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -569,6 +569,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/opencoarrays/\343\200\212\345\237\272\344\272\216openEuler\347\232\204opencoarrays\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/opencoarrays/\343\200\212\345\237\272\344\272\216openEuler\347\232\204opencoarrays\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 6446ea2878aed3a8a1168e41cf65ecb9352a122f..f7d55f8857b570cc4c9d40a124edf2f0ef0f2422 100644 --- "a/doc/opencoarrays/\343\200\212\345\237\272\344\272\216openEuler\347\232\204opencoarrays\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/opencoarrays/\343\200\212\345\237\272\344\272\216openEuler\347\232\204opencoarrays\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -364,6 +364,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` \ No newline at end of file diff --git "a/doc/petsc/3.18.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204petsc\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/petsc/3.18.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204petsc\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 9b596f43ccee1ed892f98ac758766f935f10659d..277cb0686ae788e3c5cb31a1c181a234dc40ca52 100644 --- "a/doc/petsc/3.18.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204petsc\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/petsc/3.18.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204petsc\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -357,6 +357,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/qmcpack/3.13.0/\343\200\212\345\237\272\344\272\216openEuler\347\232\204QMCPACK\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/qmcpack/3.13.0/\343\200\212\345\237\272\344\272\216openEuler\347\232\204QMCPACK\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 15b2c4ed04fe5abd860b070701313989ead22ebc..8fd8392c86d661e9a2b5c6f761467a64b2e9875d 100644 --- "a/doc/qmcpack/3.13.0/\343\200\212\345\237\272\344\272\216openEuler\347\232\204QMCPACK\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/qmcpack/3.13.0/\343\200\212\345\237\272\344\272\216openEuler\347\232\204QMCPACK\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -375,6 +375,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/scotch/7.0.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204scotch\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/scotch/7.0.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204scotch\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 34ec51fffaa2bde69d90fc63e4b9e3ae3c7984ff..05f3ef25020defc3e72271b3b0ad993ac6e81550 100644 --- "a/doc/scotch/7.0.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204scotch\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/scotch/7.0.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204scotch\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -320,6 +320,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/slepc/3.18.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204slepc\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/slepc/3.18.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204slepc\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 0e59cff1b1569d2edb23a2c9342da492a4a945f4..246551d18b32696a06ab249475754d47143c126e 100644 --- "a/doc/slepc/3.18.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204slepc\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/slepc/3.18.1/\343\200\212\345\237\272\344\272\216openEuler\347\232\204slepc\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -365,6 +365,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/stream/\343\200\212\345\237\272\344\272\216openEuler\347\232\204stream\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/stream/\343\200\212\345\237\272\344\272\216openEuler\347\232\204stream\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index c00548a940ee85a26b2acb1409d1cf48b8976c65..0fbd2d345684f5bcef4d3989c5a63bc86df3826d 100644 --- "a/doc/stream/\343\200\212\345\237\272\344\272\216openEuler\347\232\204stream\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/stream/\343\200\212\345\237\272\344\272\216openEuler\347\232\204stream\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -270,6 +270,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` \ No newline at end of file diff --git "a/doc/trinity/\343\200\212\345\237\272\344\272\216openEuler\347\232\204Trinity\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/trinity/\343\200\212\345\237\272\344\272\216openEuler\347\232\204Trinity\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 1c0bffd2d1b546752acf7fb56d4e4fd02d0ffd26..1735d0ae0453140f8ffb23be91da5d48b7bce876 100644 --- "a/doc/trinity/\343\200\212\345\237\272\344\272\216openEuler\347\232\204Trinity\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/trinity/\343\200\212\345\237\272\344\272\216openEuler\347\232\204Trinity\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -313,6 +313,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git "a/doc/wannier90/\343\200\212\345\237\272\344\272\216openEuler\347\232\204wannier90\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" "b/doc/wannier90/\343\200\212\345\237\272\344\272\216openEuler\347\232\204wannier90\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" index 413d1286ca466cb287884e4b2aa353e6c24c67af..545dcb5f5f4e669d44ae58c09ed562fc9858a66d 100644 --- "a/doc/wannier90/\343\200\212\345\237\272\344\272\216openEuler\347\232\204wannier90\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" +++ "b/doc/wannier90/\343\200\212\345\237\272\344\272\216openEuler\347\232\204wannier90\350\275\257\344\273\266\347\247\273\346\244\215\346\214\207\345\215\227\343\200\213.md" @@ -340,6 +340,6 @@ singularity build --sandbox image-sandbox name-of-image.sif #进入沙盒 singularity shell -w image-sandbox #在沙盒中运行内置的测试案例 -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -r ``` diff --git a/init.sh b/init.sh index 44cd7e2d2f61b5748edcc87e6931541a17098d31..706deb387c99081cc9b324d5940a71e118a23ccc 100644 --- a/init.sh +++ b/init.sh @@ -6,20 +6,20 @@ chmod -R +x ./test chmod +x ./*.sh chmod +x jarvis mkdir -p tmp -export JARVIS_ROOT=${CUR_PATH} +export JARVIS_ROOT=${CUR_PATH} #hpcrunner所在路径 export JARVIS_COMPILER=${CUR_PATH}/software/compiler export JARVIS_MPI=${CUR_PATH}/software/mpi export JARVIS_LIBS=${CUR_PATH}/software/libs export JARVIS_UTILS=${CUR_PATH}/software/utils -export JARVIS_DOWNLOAD=${CUR_PATH}/downloads +export JARVIS_DOWNLOAD=${CUR_PATH}/downloads #应用包下载存放路径 export JARVIS_MODULES=${CUR_PATH}/software/modulefiles export JARVIS_MODULEDEPS=${CUR_PATH}/software/moduledeps -export JARVIS_TMP=/tmp +export JARVIS_TMP=/tmp #应用安装路径 export JARVIS_TMP_DOWNLOAD=${CUR_PATH}/tmp export JARVIS_EXE=${CUR_PATH}/exe -export JARVIS_PROXY=https://github.com -export UseGitee=1 - +export JARVIS_PROXY=https://github.com #github网络代理，默认使用官方源 +export UseGitee=1 #下载源是否优先使用gitee，1代表优先使用 +export UseLatest=0 #依赖是否优先安装最新版，1代表优先使用 export DOWNLOAD_TOOL=${CUR_PATH}/package/common/download.sh export CHECK_DEPS=${CUR_PATH}/package/common/check_deps.sh diff --git a/package/hdf5/1.13.0/clang/install.sh b/package/hdf5/1.13.0/clang/install.sh new file mode 100644 index 0000000000000000000000000000000000000000..02fb45ee69f03427210c76c0d8c335a8ef653d5d --- /dev/null +++ b/package/hdf5/1.13.0/clang/install.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -x +set -e +. $CHECK_ROOT && yum -y install zlib zlib-devel +hdf5_big_version='1.13' +hdf5_version="${hdf5_big_version}.0" +. ${DOWNLOAD_TOOL} -u https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${hdf5_big_version}/hdf5-${hdf5_version}/src/hdf5-${hdf5_version}.tar.gz +cd ${JARVIS_TMP} +rm -rf hdf5-${hdf5_version} +tar -xvf ${JARVIS_DOWNLOAD}/hdf5-${hdf5_version}.tar.gz +cd hdf5-${hdf5_version} +export CC=mpicc CXX=mpicxx FC=mpif90 F77=mpif90 +./configure --prefix=$1 --enable-fortran --enable-static=yes --with-zlib=/usr/lib --enable-parallel --enable-shared CFLAGS="-O3 -fPIC -Wno-incompatible-pointer-types-discards-qualifiers -Wno-non-literal-null-conversion" FCFLAGS="-O3 -fPIC" LDFLAGS="-Wl,--build-id" +sed -i '11835c wl="-Wl,"' libtool +make -j16 +make install diff --git a/package/hpckit/2024.12.30/install.sh b/package/hpckit/24.0.0/install.sh similarity index 100% rename from package/hpckit/2024.12.30/install.sh rename to package/hpckit/24.0.0/install.sh diff --git a/package/hpckit/2024.3.30/install.sh b/package/hpckit/24.0.RC1/install.sh similarity index 100% rename from package/hpckit/2024.3.30/install.sh rename to package/hpckit/24.0.RC1/install.sh diff --git a/package/hpckit/2024.6.30/install.sh b/package/hpckit/24.0.RC2/install.sh similarity index 100% rename from package/hpckit/2024.6.30/install.sh rename to package/hpckit/24.0.RC2/install.sh diff --git a/package/hpckit/2025.3.30/install.sh b/package/hpckit/25.0.0/install.sh similarity index 100% rename from package/hpckit/2025.3.30/install.sh rename to package/hpckit/25.0.0/install.sh diff --git a/package/hpckit/latest/install.sh b/package/hpckit/latest/install.sh index 3aeed9a88ea94474b108835e270355086d75232c..10e534c65438495075f70d6b7214a7bac7c317b2 100644 --- a/package/hpckit/latest/install.sh +++ b/package/hpckit/latest/install.sh @@ -1,4 +1,4 @@ #!/bin/bash set -e -export hpckit_ver=`curl https://mirrors.huaweicloud.com/kunpeng/archive/HPC/HPCKit/| awk -F "HPCKit_" '{print $2}'|awk -F "_Linux-aarch64" '{print $1}'|awk '{lines[NR]=$0} END{print lines[NR-1]}'` +export hpckit_ver=` curl https://mirrors.huaweicloud.com/kunpeng/archive/HPC/HPCKit/| awk -F "HPCKit_" '{print $2}'|grep -v "RC"|awk -F "_Linux-aarch64" '{print $1}'|awk '{lines[NR]=$0} END{print lines[NR-1]}'` ../meta.sh $1 \ No newline at end of file diff --git a/package/netcdf/4.9.3/clang/install.sh b/package/netcdf/4.9.3/clang/install.sh new file mode 100644 index 0000000000000000000000000000000000000000..a64d1ba5747d41a72bac5fb62b59dfb86f82efa7 --- /dev/null +++ b/package/netcdf/4.9.3/clang/install.sh @@ -0,0 +1,36 @@ +#!/bin/bash +set -x +set -e +set -o posix +export netcdf_c_version='4.9.3' +export netcdf_f_version='4.6.2' +#!/bin/bash +. ${DOWNLOAD_TOOL} -u $JARVIS_PROXY/Unidata/netcdf-fortran/archive/refs/tags/v${netcdf_f_version}.tar.gz -f netcdf-fortran-${netcdf_f_version}.tar.gz +. ${DOWNLOAD_TOOL} -u $JARVIS_PROXY/Unidata/netcdf-c/archive/refs/tags/v${netcdf_c_version}.tar.gz -f netcdf-c-${netcdf_c_version}.tar.gz +cd ${JARVIS_TMP} +rm -rf netcdf-c-${netcdf_c_version} netcdf-fortran-${netcdf_f_version} +tar -xvf ${JARVIS_DOWNLOAD}/netcdf-c-${netcdf_c_version}.tar.gz +tar -xvf ${JARVIS_DOWNLOAD}/netcdf-fortran-${netcdf_f_version}.tar.gz +cd netcdf-c-${netcdf_c_version} +if [ x"$(arch)" = xaarch64 ];then + build_type='--build=aarch64-unknown-linux-gnu' +else + build_type='' +fi +export CC=mpicc CXX=mpicxx FC=mpifort +export HDF5_DIR=${HDF5_CLANG_PATH} +export PNETCDF_DIR=${PNETCDF_PATH} +./configure --prefix=$1 ${build_type} --enable-shared --enable-netcdf-4 --disable-dap --with-pic --disable-doxygen --enable-static --enable-pnetcdf --enable-largefile CPPFLAGS="-O3 -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${PNETCDF_DIR}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${PNETCDF_DIR}/lib -I${HDF5_DIR}/include -I${PNETCDF_DIR}/include" + +make -j16 +make install + +export PATH=$1/bin:$PATH +export LD_LIBRARY_PATH=$1/lib:$LD_LIBRARY_PATH +export NETCDF=${1} + +cd ../netcdf-fortran-${netcdf_f_version} +./configure --prefix=$1 ${build_type} --enable-shared --with-pic --disable-doxygen --enable-largefile CPPFLAGS="-O3 -I${HDF5_DIR}/include -I${1}/include" LDFLAGS="-L${HDF5_DIR}/lib -L${1}/lib -Wl,-rpath=${HDF5_DIR}/lib -Wl,-rpath=${1}/lib" CFLAGS="-O3 -L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" CXXFLAGS="-O3 -L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include" FCFLAGS="-O3 -L${HDF5_DIR}/lib -L${1}/lib -I${HDF5_DIR}/include -I${1}/include -L${$HPCKIT_PATH}/HPCKit/25.0.0/hmpi/bisheng/hmpi/lib" + +make -j16 +make install diff --git a/package/pnetcdf/1.14.0/install.sh b/package/pnetcdf/1.14.0/install.sh new file mode 100644 index 0000000000000000000000000000000000000000..5c10d3a7fd8f71265749155476b0b94fc498b5b5 --- /dev/null +++ b/package/pnetcdf/1.14.0/install.sh @@ -0,0 +1,11 @@ +#!/bin/bash +set -x +set -e +pnetcdf_version='1.14.0' +. ${DOWNLOAD_TOOL} -u https://parallel-netcdf.github.io/Release/pnetcdf-${pnetcdf_version}.tar.gz +cd ${JARVIS_TMP} +tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_version}.tar.gz +cd pnetcdf-${pnetcdf_version} +./configure --prefix=$1 MPIF77="mpif77" +make -j +make install diff --git a/package/pnetcdf/latest/install.sh b/package/pnetcdf/latest/install.sh new file mode 100644 index 0000000000000000000000000000000000000000..a75af2dc75f2c9d1809a0cd0d7eeb64123d7550c --- /dev/null +++ b/package/pnetcdf/latest/install.sh @@ -0,0 +1,11 @@ +#!/bin/bash +set -x +set -e +pnetcdf_version=`curl https://parallel-netcdf.github.io/wiki/Download.html|awk -F "../Release/pnetcdf-" '{print $2}'|awk -F ".tar.gz" '{print $1}'|awk NF|awk NR==1` +. ${DOWNLOAD_TOOL} -u https://parallel-netcdf.github.io/Release/pnetcdf-${pnetcdf_version}.tar.gz +cd ${JARVIS_TMP} +tar zxvf ${JARVIS_DOWNLOAD}/pnetcdf-${pnetcdf_version}.tar.gz +cd pnetcdf-${pnetcdf_version} +./configure --prefix=$1 MPIF77="mpif77" +make -j +make install diff --git a/src/containerService.py b/src/containerService.py index 348a1e5b047b03b925a29ad984e7e35ec74a16dd..e48c557fea7f6b187f297bea1bf497140c427537 100644 --- a/src/containerService.py +++ b/src/containerService.py @@ -15,7 +15,7 @@ From: {image} %environment source /etc/profile || true - cd /hpcrunner + cd $JARVIS_ROOT source env.sh %post diff --git a/src/installService.py b/src/installService.py index 778ff83f1681a5b1d5a593b9c3d8b14c761c12e2..e57afc416ea0dc28d16069ae8e699848d0a64997 100644 --- a/src/installService.py +++ b/src/installService.py @@ -37,14 +37,22 @@ class InstallService: self.UTILS_PATH = os.path.join(self.SOFTWARE_PATH, 'utils') self.json = JSONService(self.INSTALL_INFO_PATH) - def get_version_info(self, info, reg = r'(\d+)\.(\d+)\.(\d+)'): + def get_version_info(self, info, reg = r'\d+(?:\.\d+)*'): + matched_group = re.search(reg ,info) + group_len = 0 if not matched_group: return None - mversion = matched_group.group(1) - mid_ver = matched_group.group(2) - last_ver = matched_group.group(3) - return ( mversion, f'{mversion}.{mid_ver}.{last_ver}') + # 统计非None的组（排除未匹配的嵌套组） + digit_groups = [g for g in matched_group.groups()[::2] if g is not None] + group_len = len(digit_groups) + version_str = matched_group.group(0) + for i in range(1, group_len): + print(matched_group[i]) + version_str += '.' + matched_group[i] + print (version_str) + return (version_str,version_str) + def gen_compiler_dict(self, cname, version): return {"cname": cname, "cmversion": version[0], self.FULL_VERSION: version[1]} @@ -97,20 +105,14 @@ class InstallService: ucg_path = self.get_cmd_output('which ucg_info')[0] else: ucg_path = self.get_cmd_output('which ucx_info')[0] - ver_dict = {('2','2.0.0'): ('1','1.3.0')} - ucg_path = os.path.dirname(ucg_path) ucg_path = os.path.dirname(ucg_path) - libucg_path = os.path.join(ucg_path, "lib") - libucg_so_flag = "libucg.so." + libr_path = os.path.join(ucg_path, "../../../../../") + print(libr_path) version = None - for file_name in os.listdir(libucg_path): - if libucg_so_flag in file_name: - version = self.get_version_info(file_name) - if version in ver_dict: - return ver_dict[version] - elif version: - break - return version + for version in os.listdir(libr_path): + print(version) + return self.get_version_info(version) + return self.get_version_info(version) def get_hmpi_info(self): hmpi_v2_info = (self.get_cmd_output('ucx_info -c | grep -i BUILT')[0]).upper() @@ -241,7 +243,7 @@ class InstallService: return False mpi_str = mpi_info["name"]+mpi_info[self.FULL_VERSION] print("Use MPI: "+mpi_str) - install_path = os.path.join(install_path, mpi_str) + #install_path = os.path.join(install_path, mpi_str) return install_path def get_install_path(self, software_info, env_info): diff --git a/templates/CESM/2.1.3/data.cesm.arm.cpu.singularity.config b/templates/CESM/2.1.3/data.cesm.arm.cpu.singularity.config index 2f8197d1b940e0f43a927087ef6ea1443c95d225..57cc9a32c817d527f88baa375f1c3468159de37a 100644 --- a/templates/CESM/2.1.3/data.cesm.arm.cpu.singularity.config +++ b/templates/CESM/2.1.3/data.cesm.arm.cpu.singularity.config @@ -51,7 +51,7 @@ case_dir = $CESM_PATH/cime/scripts/$case_name_1 [BUILD] set -e set -x -cd /hpcrunner +cd $JARVIS_ROOT ./jarvis -e source ./env.sh tar -zxvf /mnt/CESM-release-cesm2.1.3.src.tgz -C /hpcrunner diff --git a/templates/CESM/2.1.5/data.cesm.arm.cpu.sve.config b/templates/CESM/2.1.5/data.cesm.arm.cpu.sve.config index b48ee8a392950f6fc9734813d86b4614dbbc0784..7935d3e0ecfc6344bc8bf0ed10a6a7ee3215d135 100644 --- a/templates/CESM/2.1.5/data.cesm.arm.cpu.sve.config +++ b/templates/CESM/2.1.5/data.cesm.arm.cpu.sve.config @@ -9,8 +9,8 @@ set -x set -e . $CHECK_ROOT && yum install -y perl-XML-LibXML -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi @@ -32,7 +32,7 @@ module load bisheng/kml2.5.0/kml bisheng/kml2.5.0/kblas/pthread [ENV] module purge -module use ${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ @@ -70,7 +70,7 @@ sed -i '466s|.*| openmpi |' cime/config/cesm/machines/confi sed -i "469,474s|\$ENV%{HOME}|$TEST_DIR|g" cime/config/cesm/machines/config_machines.xml -export module_line1=" ${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles" +export module_line1=" ${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles" export module_line2=" bisheng/compiler4.1.0/bishengmodule" export module_line3=" bisheng/hmpi2.4.3/hmpi" export module_line4=" /home/drh/hpcrunner-bak/software/moduledeps/bisheng4.1.0-hmpi2.4.3" diff --git a/templates/MOM/6/data.mom.arm.clang.cpu.config b/templates/MOM/6/data.mom.arm.clang.cpu.config index 70da8fe723d9c86b1b8e60559154f19df1c2a281..7d7564eaefc73325cdbc9d1ac43da84827cfb7f3 100644 --- a/templates/MOM/6/data.mom.arm.clang.cpu.config +++ b/templates/MOM/6/data.mom.arm.clang.cpu.config @@ -33,7 +33,7 @@ binary_dir = /hpcrunner/siesta/ case_dir = [BUILD] -cd /hpcrunner +cd $JARVIS_ROOT git clone https://github.com/NOAA-GFDL/MOM6-examples.git MOM6-examples cd MOM6-examples git submodule init @@ -46,7 +46,7 @@ git submodule update tools/python/MIDAS cd src/MOM6 git submodule init git submodule update -cd /hpcrunner/MOM6-examples +cd $JARVIS_ROOT/MOM6-examples sed -i '31c\pid_t gettid(void)' src/FMS/affinity/affinity.c @@ -62,13 +62,13 @@ sed -i '95c\ FFLAGS := -I${HMPI_PATH}/include -ffree-form -fdefault-double-8 - sed -i '99c\ FFLAGS_REPRO = -O2' linux-bs.mk sed -i '112c\ CPPFLAGS += ${HMPI_PATH}/include' linux-bs.mk -cd /hpcrunner/MOM6-examples +cd $JARVIS_ROOT/MOM6-examples mkdir -p build/bs/shared/repro/ && cd build/bs/shared/repro/ ../../../../src/mkmf/bin/list_paths -l ../../../../src/FMS ../../../../src/mkmf/bin/mkmf -t ../../../../src/mkmf/templates/linux-bs.mk -p libfms.a -c "-Duse_libMPI -Duse_netCDF -DSPMD" path_names make NETCDF=3 REPRO=1 libfms.a -j -cd /hpcrunner/MOM6-examples +cd $JARVIS_ROOT/MOM6-examples mkdir -p build/bs/ocean_only/repro/ && cd build/bs/ocean_only/repro/ ../../../../src/mkmf/bin/list_paths -l ./ ../../../../src/MOM6/{config_src/infra/FMS1,config_src/memory/dynamic_symmetric,config_src/drivers/solo_driver,config_src/external,src/{*,*/*}}/ ../../../../src/mkmf/bin/mkmf -t ../../../../src/mkmf/templates/linux-bs.mk -o '-I../../shared/repro' -p 'MOM6 -L../../shared/repro -lfms' -c "-Duse_libMPI -Duse_netCDF -DSPMD" path_names diff --git a/templates/MOM/6/data.mom.arm.sve-test.cpu.config b/templates/MOM/6/data.mom.arm.sve-test.cpu.config index b3a63935fe317dcab0b1117e8489d91ce598c58c..db5913b8f289dc7e1b7b94c36bc8ac55f7a5798e 100644 --- a/templates/MOM/6/data.mom.arm.sve-test.cpu.config +++ b/templates/MOM/6/data.mom.arm.sve-test.cpu.config @@ -34,7 +34,7 @@ binary_dir = /hpcrunner/siesta/ case_dir = [BUILD] -cd /hpcrunner +cd $JARVIS_ROOT git clone --recursive https://gh.api.99988866.xyz/https://github.com/NOAA-GFDL/MOM6-examples.git MOM6-examples cd MOM6-examples #git submodule init @@ -47,7 +47,7 @@ cd MOM6-examples cd src/MOM6 #git submodule init #git submodule update -cd /hpcrunner/MOM6-examples +cd $JARVIS_ROOT/MOM6-examples sed -i '31c\pid_t gettid(void)' src/FMS/affinity/affinity.c @@ -63,13 +63,13 @@ sed -i '95c\ FFLAGS := -I${HMPI_PATH}/include -ffree-form -fdefault-double-8 - sed -i '99c\ FFLAGS_REPRO = -O2' linux-bs.mk sed -i '112c\ CPPFLAGS += ${HMPI_PATH}/include' linux-bs.mk -cd /hpcrunner/MOM6-examples +cd $JARVIS_ROOT/MOM6-examples mkdir -p build/bs/shared/repro/ && cd build/bs/shared/repro/ ../../../../src/mkmf/bin/list_paths -l ../../../../src/FMS ../../../../src/mkmf/bin/mkmf -t ../../../../src/mkmf/templates/linux-bs.mk -p libfms.a -c "-Duse_libMPI -Duse_netCDF -DSPMD" path_names make NETCDF=3 REPRO=1 libfms.a -j -cd /hpcrunner/MOM6-examples +cd $JARVIS_ROOT/MOM6-examples mkdir -p build/bs/ocean_only/repro/ && cd build/bs/ocean_only/repro/ ../../../../src/mkmf/bin/list_paths -l ./ ../../../../src/MOM6/{config_src/infra/FMS1,config_src/memory/dynamic_symmetric,config_src/drivers/solo_driver,config_src/external,src/{*,*/*}}/ ../../../../src/mkmf/bin/mkmf -t ../../../../src/mkmf/templates/linux-bs.mk -o '-I../../shared/repro' -p 'MOM6 -L../../shared/repro -lfms' -c "-Duse_libMPI -Duse_netCDF -DSPMD" path_names diff --git a/templates/MOM/6/data.mom.arm.sve.cpu.config b/templates/MOM/6/data.mom.arm.sve.cpu.config index f9d771258cf16bfc45d27a06f7267ddb45fd7347..28edb3ca32893b9ded0cd35dbb58fcf0bdb15b2c 100644 --- a/templates/MOM/6/data.mom.arm.sve.cpu.config +++ b/templates/MOM/6/data.mom.arm.sve.cpu.config @@ -34,7 +34,7 @@ binary_dir = /hpcrunner/siesta/ case_dir = [BUILD] -cd /hpcrunner +cd $JARVIS_ROOT git clone https://github.com/NOAA-GFDL/MOM6-examples.git MOM6-examples cd MOM6-examples git submodule init @@ -47,7 +47,7 @@ git submodule update tools/python/MIDAS cd src/MOM6 git submodule init git submodule update -cd /hpcrunner/MOM6-examples +cd $JARVIS_ROOT/MOM6-examples sed -i '31c\pid_t gettid(void)' src/FMS/affinity/affinity.c @@ -63,13 +63,13 @@ sed -i '95c\ FFLAGS := -I${HMPI_PATH}/include -ffree-form -fdefault-double-8 - sed -i '99c\ FFLAGS_REPRO = -O2' linux-bs.mk sed -i '112c\ CPPFLAGS += ${HMPI_PATH}/include' linux-bs.mk -cd /hpcrunner/MOM6-examples +cd $JARVIS_ROOT/MOM6-examples mkdir -p build/bs/shared/repro/ && cd build/bs/shared/repro/ ../../../../src/mkmf/bin/list_paths -l ../../../../src/FMS ../../../../src/mkmf/bin/mkmf -t ../../../../src/mkmf/templates/linux-bs.mk -p libfms.a -c "-Duse_libMPI -Duse_netCDF -DSPMD" path_names make NETCDF=3 REPRO=1 libfms.a -j -cd /hpcrunner/MOM6-examples +cd $JARVIS_ROOT/MOM6-examples mkdir -p build/bs/ocean_only/repro/ && cd build/bs/ocean_only/repro/ ../../../../src/mkmf/bin/list_paths -l ./ ../../../../src/MOM6/{config_src/infra/FMS1,config_src/memory/dynamic_symmetric,config_src/drivers/solo_driver,config_src/external,src/{*,*/*}}/ ../../../../src/mkmf/bin/mkmf -t ../../../../src/mkmf/templates/linux-bs.mk -o '-I../../shared/repro' -p 'MOM6 -L../../shared/repro -lfms' -c "-Duse_libMPI -Duse_netCDF -DSPMD" path_names diff --git a/templates/ParaFEM/5.0.3/data.parafem.arm.cpu.hpckit.config b/templates/ParaFEM/5.0.3/data.parafem.arm.cpu.hpckit.config index a51f7cc57cefcecffa0f52881be81dc5a9606bad..fecc1068e17b4cbf3c80c09edbb5d026bfb56fef 100644 --- a/templates/ParaFEM/5.0.3/data.parafem.arm.cpu.hpckit.config +++ b/templates/ParaFEM/5.0.3/data.parafem.arm.cpu.hpckit.config @@ -11,13 +11,13 @@ set -e set -x module purge -./jarvis -install hpckit/2024.12.30 any -source software/utils/hpckit/2024.12.30/HPCKit/latest/setvars.sh --use-bisheng --force +./jarvis -install hpckit/24.0.0 any +source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --use-bisheng --force export CC=`which clang` export CXX=`which clang++` export FC=`which flang` -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/hmpi2.4.3/hmpi echo "Check the source code" @@ -32,12 +32,12 @@ tar -xvzf ${JARVIS_DOWNLOAD}/parafem.5.0.3.tar.gz set -e set -x module purge -./jarvis -install hpckit/2024.12.30 any -source software/utils/hpckit/2024.12.30/HPCKit/latest/setvars.sh --use-bisheng --force +./jarvis -install hpckit/24.0.0 any +source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --use-bisheng --force export CC=`which clang` export CXX=`which clang++` export FC=`which flang` -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/hmpi2.4.3/hmpi diff --git a/templates/RSEM/1.3.3/data.rsem.arm.cpu.hpckit.config b/templates/RSEM/1.3.3/data.rsem.arm.cpu.hpckit.config index 2a9553af00ffa26e592234e5ec0a6aae5b4833b0..0de5131739f17d4ae209b666ea7e988a9ff68b98 100644 --- a/templates/RSEM/1.3.3/data.rsem.arm.cpu.hpckit.config +++ b/templates/RSEM/1.3.3/data.rsem.arm.cpu.hpckit.config @@ -13,8 +13,8 @@ set -e set -x module purge -./jarvis -install hpckit/2024.12.30 any -source software/utils/hpckit/2024.12.30/HPCKit/latest/setvars.sh --use-bisheng --force +./jarvis -install hpckit/24.0.0 any +source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --use-bisheng --force export CC=`which clang` export CXX=`which clang++` export FC=`which flang` @@ -50,8 +50,8 @@ fi set -e set -x module purge -./jarvis -install hpckit/2024.12.30 any -source software/utils/hpckit/2024.12.30/HPCKit/latest/setvars.sh --use-bisheng --force +./jarvis -install hpckit/24.0.0 any +source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --use-bisheng --force export CC=`which clang` export CXX=`which clang++` export FC=`which flang` diff --git a/templates/acessiii/acesiii.arm.bisheng.hpckit.config b/templates/acessiii/acesiii.arm.bisheng.hpckit.config index a02880932316b1d0e17ee2577b53c6acb9987f86..923c882fa91237eb6185b3124f89ec890fc8aa64 100644 --- a/templates/acessiii/acesiii.arm.bisheng.hpckit.config +++ b/templates/acessiii/acesiii.arm.bisheng.hpckit.config @@ -6,8 +6,8 @@ acesiii/master ${JARVIS_PROXY}/madbosun/acesiii/archive/refs/heads/master.zip ac [DEPENDENCY] module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi module load bisheng/kml2.5.0/kml @@ -19,7 +19,7 @@ unzip ${JARVIS_DOWNLOAD}/acesiii-master.zip -d ${JARVIS_ROOT}/software/apps/ [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi module load bisheng/kml2.5.0/kml @@ -37,8 +37,8 @@ sed -i 's/mktemp/mkstemp/' src/sia/sip/sip_instructions/generate_scratch_filenam sed -i 's/SERIAL_CPP="g++"/SERIAL_CPP=mpicxx/g' configure ./configure FCFLAGS="-D__fortran -D__fortran77 -fPIC -DMPIF2C -DMPI2 -ffast-math -march=armv8-a -mtune=tsv110 -std=f77" CFLAGS="-DMPIF2C -DMPI2 -DC_SUFFIX -DCB_SUFFIX -DMPI2 -Wno-return-type -Wno-int-conversion" CXXFLAGS="-DMPIF2C -DC_SUFFIX -DCB_SUFFIX -DMPI2" CC=mpicc CXX=mpicxx FC=mpifort sed -i '21s/^\(\s*\).*/\1SIAL_COMPILER_LIBS= -lstdc++ -lsip1 -lsip2 -lsial -lsip_shared -lframelib -laces2 -lgeopt -lsymcor -laces2 -lerd -loed -ldup -lsip1 -lsip2 $(LIBS) -lflang -lflangmain/' src/sial_compiler/compiler/Makefile -sed -i '24c LIB_DIRS:=-L../../../lib $(LIB_DIRS) -L${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/latest/compiler/bisheng/lib' src/sial_compiler/compiler/Makefile -sed -i '16c LIBS:= -lstdc++ -lsip1 -lsip2 -lsialinst -lsip_shared -lframelib -laces2 -lgeopt -lsymcor -laces2 -lprop_ints -lerd -loed -lecp -ldup -lsip1 -lsip2 -lsialinst -lsip1 -lsip2 $(LIBS) -lflang -lflangmain -L${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/latest/compiler/bisheng/lib -L${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib/neon -L${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib/neon/kblas/pthread -lklapack_full -lkblas' src/main/Makefile +sed -i '24c LIB_DIRS:=-L../../../lib $(LIB_DIRS) -L${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/latest/compiler/bisheng/lib' src/sial_compiler/compiler/Makefile +sed -i '16c LIBS:= -lstdc++ -lsip1 -lsip2 -lsialinst -lsip_shared -lframelib -laces2 -lgeopt -lsymcor -laces2 -lprop_ints -lerd -loed -lecp -ldup -lsip1 -lsip2 -lsialinst -lsip1 -lsip2 $(LIBS) -lflang -lflangmain -L${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/latest/compiler/bisheng/lib -L${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.0.0/kml/bisheng/lib/neon -L${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.0.0/kml/bisheng/lib/neon/kblas/pthread -lklapack_full -lkblas' src/main/Makefile make [CLEAN] diff --git a/templates/bcftools/1.10.2/data.bcftools.arm.cpu.hpckit.config b/templates/bcftools/1.10.2/data.bcftools.arm.cpu.hpckit.config index ffa13df18964fc9c63decc3186d3742d6147c732..d216ba9ca59d735dc20f33bf9a8c80452c9b73f1 100644 --- a/templates/bcftools/1.10.2/data.bcftools.arm.cpu.hpckit.config +++ b/templates/bcftools/1.10.2/data.bcftools.arm.cpu.hpckit.config @@ -13,8 +13,8 @@ module purge yum install zlib-devel bzip2 bzip2-devel xz-devel libcurl-devel -y -./jarvis -install hpckit/2024.12.30 any -source software/utils/hpckit/2024.12.30/HPCKit/latest/setvars.sh --use-bisheng --force +./jarvis -install hpckit/24.0.0 any +source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --use-bisheng --force export CC=`which clang` export CXX=`which clang++` export FC=`which flang` @@ -32,7 +32,7 @@ mkdir -p bcftools-1.10.2/Install set -e set -x module purge -source software/utils/hpckit/2024.12.30/HPCKit/latest/setvars.sh --use-bisheng --force +source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --use-bisheng --force export CC=`which clang` export CXX=`which clang++` export FC=`which flang` diff --git a/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config b/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config index 3c72e1c5e79ae94a93f21b3b1c297915396a5846..e39f3a37c93bf390a26a6ff0d082f2be90b94835 100644 --- a/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config +++ b/templates/berkeleygw/3.0.1/berkeleygw.arm.bisheng.hpckit.config @@ -9,8 +9,8 @@ BerkeleyGW/3.0.1 [DEPENDENCY] module purge -./jarvis -install hpckit/2024.12.30 any -module use ./software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +./jarvis -install hpckit/24.0.0 any +module use ./software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module use ./software/moduledeps module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi @@ -28,7 +28,7 @@ mkdir -p ${JARVIS_ROOT}/software/apps/berkeleygw [ENV] module purge -module use ./software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +module use ./software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module use ./software/moduledeps module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi @@ -64,8 +64,8 @@ C_DEBUGFLAG = REMOVE = /bin/rm -f FFTWLIB = \${JARVIS_LIBS}/bisheng4.1.0/hmpi2.4.3/fftw/3.3.8/lib/libfftw3.a FFTWINCLUDE = \${JARVIS_LIBS}/bisheng4.1.0/hmpi2.4.3/fftw/3.3.8/include -LAPACKLIB = -L\${JARVIS_UTILS}/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib/neon -lklapack_full -L\${JARVIS_UTILS}/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib/neon/kblas/pthread -lkblas -SCALAPACKLIB = -L\${JARVIS_UTILS}/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib/neon -lkscalapack_full \$(LAPACKLIB) +LAPACKLIB = -L\${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/neon -lklapack_full -L\${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/neon/kblas/pthread -lkblas +SCALAPACKLIB = -L\${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/neon -lkscalapack_full \$(LAPACKLIB) TESTSCRIPT = make check-parallel EOF diff --git a/templates/bowtie2/2.4.1/data.bowtie2.arm.cpu.config b/templates/bowtie2/2.4.1/data.bowtie2.arm.cpu.config index 621718b9918c9a342777197aebb2859b9e3ecd95..de178c6e2c83dcbe70c2482953ff7c88848cdade 100644 --- a/templates/bowtie2/2.4.1/data.bowtie2.arm.cpu.config +++ b/templates/bowtie2/2.4.1/data.bowtie2.arm.cpu.config @@ -9,13 +9,13 @@ case2 http://hgdownload.cse.ucsc.edu/goldenPath/mm10/bigZips/chromFa.tar.gz set -e set -x module purge -./jarvis -install package/hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +./jarvis -install package/hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule mkdir -p ${JARVIS_ROOT}/case diff --git a/templates/bwa/0.7.17/data.bwa.arm.cpu.config b/templates/bwa/0.7.17/data.bwa.arm.cpu.config index 414a291c3fe2758150a7476053ec61b4c88516b2..ff91edd5165f4fbd54ff3fffa71569e58b218172 100644 --- a/templates/bwa/0.7.17/data.bwa.arm.cpu.config +++ b/templates/bwa/0.7.17/data.bwa.arm.cpu.config @@ -12,13 +12,13 @@ case3 https://ftp.ncbi.nlm.nih.gov/genomes/all/GCA/000/001/405/GCA_000001405.15_ set -e set -x module purge -./jarvis -install package/hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +./jarvis -install package/hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule export PATH=$JARVIS_ROOT/software/apps/bisheng/bwa/0.7.17:$PATH mkdir -p ${JARVIS_ROOT}/case diff --git a/templates/cdo/1.9.8/cdo.arm.hpckit.config b/templates/cdo/1.9.8/cdo.arm.hpckit.config index c2175693f6242be716be36bbae4421f96b244727..2bb7e19c7cbdf0df8f1eff35f64907640f7999b8 100644 --- a/templates/cdo/1.9.8/cdo.arm.hpckit.config +++ b/templates/cdo/1.9.8/cdo.arm.hpckit.config @@ -5,8 +5,8 @@ cdo/1.9.8 https://code.mpimet.mpg.de/attachments/download/20826/cdo-1.9.8.tar.gz [DEPENDENCY] -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi @@ -24,7 +24,7 @@ module load grib_api/1.21.0 [ENV] -module use ${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ diff --git a/templates/code_aster/14.6.0/code_aster.arm.cpu.kgcc.hmpi.config b/templates/code_aster/14.6.0/code_aster.arm.cpu.kgcc.hmpi.config index 6641f78be120c1c1f05149bf4d36d9319b34d737..7a20f9d6461dbbac38e0815887ef1d61500b3a8f 100644 --- a/templates/code_aster/14.6.0/code_aster.arm.cpu.kgcc.hmpi.config +++ b/templates/code_aster/14.6.0/code_aster.arm.cpu.kgcc.hmpi.config @@ -9,9 +9,9 @@ set -e set -x yum install -y vim tar git wget automake autoconf libtool make cmake -./jarvis -install hpckit/2024.12.30 any -source software/utils/hpckit/2024.12.30/HPCKit/latest/setvars.sh --use-bisheng --force -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --use-bisheng --force +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` @@ -26,7 +26,7 @@ tar -xvf ${JARVIS_DOWNLOAD}/aster-full-src-14.6.0-1.noarch.tar.gz mkdir -p CODE-ASTER [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` diff --git a/templates/dealii/9.6.2/dealii.arm.bisheng.hpckit.config b/templates/dealii/9.6.2/dealii.arm.bisheng.hpckit.config index 5b1c812bb69d5a8987b653a1a54e7addff20c83d..f05767d50ff581797e3d790e0dc9ccf67db3b2b4 100644 --- a/templates/dealii/9.6.2/dealii.arm.bisheng.hpckit.config +++ b/templates/dealii/9.6.2/dealii.arm.bisheng.hpckit.config @@ -7,15 +7,15 @@ dealii/9.6.2 ${JARVIS_PROXY}/dealii/dealii/releases/download/v9.6.2/dealii-9.6.2 [DEPENDENCY] set -e module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles mkdir -p ${JARVIS_ROOT}/software/apps/dealii tar -zxvf ${JARVIS_DOWNLOAD}/dealii-9.6.2.tar.gz -C ${JARVIS_TMP_DOWNLOAD} [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi module load bisheng/kml2.5.0/kml @@ -32,7 +32,7 @@ case_dir = ${JARVIS_ROOT}/software/apps/dealii/examples/step-23/ mkdir build cd build/ # disabled -DDEAL_II_WITH_TBB=OFF; or Customise to specify compatible TBB versions enabled -DTBB_DIR=xxx -CC=mpicc CXX=mpicxx FC=mpifort cmake .. -DCMAKE_INSTALL_PREFIX=${JARVIS_ROOT}/software/apps/dealii -DDEAL_II_WITH_MPI=ON -DCMAKE_BUILD_TYPE=Release -DDEAL_II_WITH_TBB=OFF -DBLAS_LIBRARIES=${JARVIS_UTILS}/hpckit/2024.12.30/HPCKit/latest/kml/bisheng/lib/neon/kblas/pthread/libkblas.so -DLAPACK_LIBRARIES=${JARVIS_UTILS}/hpckit/2024.12.30/HPCKit/latest/kml/bisheng/lib/neon/libklapack_full.so +CC=mpicc CXX=mpicxx FC=mpifort cmake .. -DCMAKE_INSTALL_PREFIX=${JARVIS_ROOT}/software/apps/dealii -DDEAL_II_WITH_MPI=ON -DCMAKE_BUILD_TYPE=Release -DDEAL_II_WITH_TBB=OFF -DBLAS_LIBRARIES=${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/latest/kml/bisheng/lib/neon/kblas/pthread/libkblas.so -DLAPACK_LIBRARIES=${JARVIS_UTILS}/hpckit/24.0.0/HPCKit/latest/kml/bisheng/lib/neon/libklapack_full.so # physical memory >= 64G sed -i 's/\${DEAL_II_MPIEXEC_NUMPROC_FLAG}/--allow-run-as-root \${DEAL_II_MPIEXEC_NUMPROC_FLAG}/g' share/deal.II/macros/macro_deal_ii_add_test.cmake make -j diff --git a/templates/deepmd-kit/2.2.10/deepmdkit.arm.cpu.kgcc.hmpi.config b/templates/deepmd-kit/2.2.10/deepmdkit.arm.cpu.kgcc.hmpi.config index 4d31578c4cb44de90398eeede23b94728412d1a8..04e50e9f2c2312517f214ebde15158451c77b937 100644 --- a/templates/deepmd-kit/2.2.10/deepmdkit.arm.cpu.kgcc.hmpi.config +++ b/templates/deepmd-kit/2.2.10/deepmdkit.arm.cpu.kgcc.hmpi.config @@ -12,8 +12,8 @@ module purge ./jarvis -install package/anaconda3/2024.10 any module use ./software/modulefiles source ${JARVIS_ROOT}/software/utils/anaconda3/2024.10/etc/profile.d/conda.sh -./jarvis -install hpckit/2024.12.30 any -module use ./software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use ./software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` export CXX=`which g++` @@ -25,7 +25,7 @@ git clone -b v2.2.10 https://github.com/deepmodeling/deepmd-kit #使用wget获 module purge module use ./software/modulefiles source ${JARVIS_ROOT}/software/utils/anaconda3/2024.10/etc/profile.d/conda.sh -module use ./software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ./software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` export CXX=`which g++` diff --git a/templates/espressomd/4.1.4/data.espressomd.arm.cpu.bisheng.hmpi.config b/templates/espressomd/4.1.4/data.espressomd.arm.cpu.bisheng.hmpi.config index 9b3a939d4e4ac597c86e6a479e5e170c98b243ed..6683dc5a8d1a04d98faf3beb785f4efc39332d49 100644 --- a/templates/espressomd/4.1.4/data.espressomd.arm.cpu.bisheng.hmpi.config +++ b/templates/espressomd/4.1.4/data.espressomd.arm.cpu.bisheng.hmpi.config @@ -15,8 +15,8 @@ yum install libxml2-devel libxslt-devel cmake -y pip3 install numpy --upgrade --force-reinstall pip3 install cython sudo dnf install python3-devel -y -./jarvis -install hpckit/2024.12.30 any -module use ./software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use ./software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=`which clang` @@ -39,7 +39,7 @@ export Boost_INCLUDE_PATH=${JARVIS_ROOT}/boost/1_72_0/include [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=`which clang` diff --git a/templates/fds/6.7.4/data.fds.arm.clang.cpu.config b/templates/fds/6.7.4/data.fds.arm.clang.cpu.config index 8f1fd8740b8573d050906d2cc7894382629ddf14..b927cd97d9338b95f9a1bcf2f11fe3277dfe524e 100644 --- a/templates/fds/6.7.4/data.fds.arm.clang.cpu.config +++ b/templates/fds/6.7.4/data.fds.arm.clang.cpu.config @@ -7,8 +7,8 @@ FDS/6.7.4 https://github.com/firemodels/fds/archive/refs/tags/FDS6.7.4.tar.gz [DEPENDENCY] module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=`which mpicc` export CXX=`which mpicxx` @@ -19,8 +19,8 @@ tar -xvf ${JARVIS_DOWNLOAD}/FDS6.7.4.tar.gz [ENV] module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=`which mpicc` export CXX=`which mpicxx` diff --git a/templates/fds/6.7.4/data.fds.arm.sve.cpu.config b/templates/fds/6.7.4/data.fds.arm.sve.cpu.config index 103b24e11a15c73e2457cdd759c5317c32b4ed06..0d729c9599b033e7832f0a7818c79f43e109dedc 100644 --- a/templates/fds/6.7.4/data.fds.arm.sve.cpu.config +++ b/templates/fds/6.7.4/data.fds.arm.sve.cpu.config @@ -6,8 +6,8 @@ FDS/6.7.4 https://github.com/firemodels/fds/archive/refs/tags/FDS6.7.4.tar.gz [DEPENDENCY] -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=mpicc FC=mpifort CXX=mpicxx @@ -15,7 +15,7 @@ export CC=mpicc FC=mpifort CXX=mpicxx [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=mpicc FC=mpifort CXX=mpicxx diff --git a/templates/gadget2/2.3.5/data.gadget2.arm.cpu.kgcc.config b/templates/gadget2/2.3.5/data.gadget2.arm.cpu.kgcc.config index 6727f253c68b2e21ad172ed490f4a7304bde4b35..a82284067263311427551c5d67933b4ebf8f572b 100644 --- a/templates/gadget2/2.3.5/data.gadget2.arm.cpu.kgcc.config +++ b/templates/gadget2/2.3.5/data.gadget2.arm.cpu.kgcc.config @@ -8,8 +8,8 @@ gadget2/2.3.5 https://github.com/gadget-framework/gadget2/archive/refs/tags/v2.3 set -e set -x yum install -y libX11 libX11-devel -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` @@ -18,7 +18,7 @@ export FC=`which gfortran` tar -xzvf ${JARVIS_DOWNLOAD}/gadget2-v2.3.5.tar.gz [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` diff --git a/templates/gptl/8.1.1/gptl.arm.cpu.kgcc.hmpi.config b/templates/gptl/8.1.1/gptl.arm.cpu.kgcc.hmpi.config index 3748116b4c5dabc45579f0627e046189f0cef66f..384c52c17db5f210dd9b27a77d78bb095e2e980e 100644 --- a/templates/gptl/8.1.1/gptl.arm.cpu.kgcc.hmpi.config +++ b/templates/gptl/8.1.1/gptl.arm.cpu.kgcc.hmpi.config @@ -9,8 +9,8 @@ set -e set -x yum install libunwind libunwind-devel cmake make autoconf automake libtool -y module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` export CXX=`which g++` @@ -20,7 +20,7 @@ mkdir -p GPTL [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` export CXX=`which g++` diff --git a/templates/gromacs/2024.2/data.gromacs.arm.cpu.config b/templates/gromacs/2024.2/data.gromacs.arm.cpu.config index d369d9c06d59bf7a2bdd158ae84e082767dc3f4e..c4a0c8221f6b81c006e800d65c6885e52a5de1e1 100644 --- a/templates/gromacs/2024.2/data.gromacs.arm.cpu.config +++ b/templates/gromacs/2024.2/data.gromacs.arm.cpu.config @@ -7,14 +7,14 @@ Testcase https://repository.prace-ri.eu/ueabs/GROMACS/2.2/GROMACS_TestCaseC.tar. [DEPENDENCY] module purge -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module load bisheng/kml2.5.0/kblas/pthread bisheng/kml2.5.0/kml [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module load bisheng/kml2.5.0/kblas/pthread bisheng/kml2.5.0/kml export PATH=$JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/gromacs-2024.2/bin:$PATH @@ -31,7 +31,7 @@ tar -xf ${JARVIS_DOWNLOAD}/gromacs-2024.2.tar.gz cd gromacs-2024.2 mkdir -p build cd build -export KML_LIB_PATH=${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib +export KML_LIB_PATH=${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib cmake ../ -DCMAKE_INSTALL_PREFIX=$JARVIS_ROOT/software/apps/bisheng4.1.0-hmpi2.4.3/gromacs-2024.2 -DCMAKE_BUILD_TYPE=Release -DGMX_MPI=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DMPI_C_COMPILER=mpicc -DMPI_CXX_COMPILER=mpicxx -DGMX_INSTALL_LEGACY_API=ON -DGMX_HWLOC=ON -DGMX_EXTERNAL_LAPACK=ON -DGMX_LAPACK_USER=$KML_LIB_PATH/sve/libklapack_full.so -DGMX_EXTERNAL_BLAS=ON -DGMX_BLAS_USER=$KML_LIB_PATH/sve/kblas/pthread/libkblas.so -DGMX_SIMD=ARM_SVE -DGMX_OPENMP=ON -DGMX_FFT_LIBRARY=fftw3 -DFFTWF_LIBRARY=$KML_LIB_PATH/noarch/libfftw3f.so -DCMAKE_CXX_FLAGS="-L$KML_LIB_PATH/noarch -lkm" -DGMX_SIMD_ARM_SVE_LENGTH=256 make -j diff --git a/templates/hisat/2.1.0/data.hisat.arm.cpu.bisheng.config b/templates/hisat/2.1.0/data.hisat.arm.cpu.bisheng.config index 2d8528ce627a7083d73245e26c27778e933cd1bb..ea58ff144d988f5634dec1a7bd6f989e33ad9547 100644 --- a/templates/hisat/2.1.0/data.hisat.arm.cpu.bisheng.config +++ b/templates/hisat/2.1.0/data.hisat.arm.cpu.bisheng.config @@ -12,8 +12,8 @@ Drosophila_melanogaster.BDGP6.dna.toplevel.fa http://ftp.ensembl.org/pub/release set -e set -x -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule tar -vzxf ${JARVIS_DOWNLOAD}/hisat2-2.1.0.tar.gz @@ -31,7 +31,7 @@ mv Drosophila_melanogaster.BDGP6.dna.toplevel.fa genome.fa [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule diff --git a/templates/homer/4.11/data.homer.arm.cpu.hpckit.config b/templates/homer/4.11/data.homer.arm.cpu.hpckit.config index 306ea39f42bcd766980337d163be9af1dfee8b63..da10edcf01fa2e7dbc1c15d8962d82d126399c4c 100644 --- a/templates/homer/4.11/data.homer.arm.cpu.hpckit.config +++ b/templates/homer/4.11/data.homer.arm.cpu.hpckit.config @@ -12,8 +12,8 @@ set -e set -x module purge -./jarvis -install hpckit/2024.12.30 any -source software/utils/hpckit/2024.12.30/HPCKit/latest/setvars.sh --force +./jarvis -install hpckit/24.0.0 any +source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --force export CC=`which gcc` export CXX=`which g++` export FC=`which gfortran` @@ -37,7 +37,7 @@ gzip -dk ${JARVIS_DOWNLOAD}/hg19_RefSeq.bed.gz -c > ${JARVIS_ROOT}/workloads/hom set -e set -x module purge -source software/utils/hpckit/2024.12.30/HPCKit/latest/setvars.sh --force +source software/utils/hpckit/24.0.0/HPCKit/latest/setvars.sh --force export CC=`which gcc` export CXX=`which g++` export FC=`which gfortran` diff --git a/templates/kallisto-bustools_python/0.51.1/data.kallisto.arm.cpu.kgcc.config b/templates/kallisto-bustools_python/0.51.1/data.kallisto.arm.cpu.kgcc.config index 03effe4fa6bf63f8adb4330c3a710ef20a09715e..827b5e78f32ac92e8a60b48b668eaa1712cede9e 100644 --- a/templates/kallisto-bustools_python/0.51.1/data.kallisto.arm.cpu.kgcc.config +++ b/templates/kallisto-bustools_python/0.51.1/data.kallisto.arm.cpu.kgcc.config @@ -12,8 +12,8 @@ yum install -y autoconf automake libtool yum -y install xz-devel yum install libarchive -y module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` export CXX=`which g++` @@ -25,7 +25,7 @@ tar -xzvf ${JARVIS_DOWNLOAD}/kallisto-0.51.1.tar.gz [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi export CC=`which gcc` export CXX=`which g++` diff --git a/templates/lammps/2023.8.2/data.lammps.arm.cpu.sve.hpckit.config b/templates/lammps/2023.8.2/data.lammps.arm.cpu.sve.hpckit.config index 2b17b6b129fbb8b93c391f7d9d3a883c29cbdf85..6a0ab2c6ff18f720b8ddfba2cd61829f9381c5da 100644 --- a/templates/lammps/2023.8.2/data.lammps.arm.cpu.sve.hpckit.config +++ b/templates/lammps/2023.8.2/data.lammps.arm.cpu.sve.hpckit.config @@ -31,7 +31,7 @@ cd ${JARVIS_ROOT}/software/apps/bisheng4.1.0-hmpi2.4.3/ tar -xvf ${JARVIS_DOWNLOAD}/lammps-2Aug2023.tar.gz cd lammps-2Aug2023/src HPCKIT=${JARVIS_ROOT}/software/utils/hpckit/2025.3.30/HPCKit -sed -i "10c\CCFLAGS = -g -O3 -fopenmp -mcpu=hip09 -mllvm -force-customized-pipeline=true -I${HPCKIT}/latest/compiler/bisheng/include/c++/v1 -L${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/latest/compiler/bisheng/lib -std=c++11 -stdlib=libc++ -lc++ -lc++abi" MAKE/Makefile.mpi +sed -i "10c\CCFLAGS = -g -O3 -fopenmp -mcpu=hip09 -mllvm -force-customized-pipeline=true -I${HPCKIT}/latest/compiler/bisheng/include/c++/v1 -L${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/latest/compiler/bisheng/lib -std=c++11 -stdlib=libc++ -lc++ -lc++abi" MAKE/Makefile.mpi sed -i "15c\LINKFLAGS = -g -O3 -fopenmp -mcpu=hip09 -mllvm -force-customized-pipeline=true -L${HPCKIT}/latest/compiler/bisheng/lib -std=c++11 -stdlib=libc++ -lc++ -lc++abi" MAKE/Makefile.mpi sed -i "53c\FFT_INC = -I${HPCKIT}/latest/kml/bisheng/include" MAKE/Makefile.mpi sed -i "54c\FFT_PATH = -L${HPCKIT}/latest/kml/bisheng/lib/sve" MAKE/Makefile.mpi diff --git a/templates/likwid/5.2.2/likwid.arm.cpu.bisheng.hmpi.config b/templates/likwid/5.2.2/likwid.arm.cpu.bisheng.hmpi.config index 9d277e31e5d6d9a6427801cf698a275f9208a607..46318faaa9e79907981c277cef3a73c09dd70d44 100644 --- a/templates/likwid/5.2.2/likwid.arm.cpu.bisheng.hmpi.config +++ b/templates/likwid/5.2.2/likwid.arm.cpu.bisheng.hmpi.config @@ -9,8 +9,8 @@ set -e set -x module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=`which clang` export CXX=`which clang++` @@ -20,7 +20,7 @@ mkdir -p LIKWID [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=`which clang` export CXX=`which clang++` diff --git a/templates/lmod/8.7.15/data.lmod.arm.cpu.kgcc.config b/templates/lmod/8.7.15/data.lmod.arm.cpu.kgcc.config index aff02680d859befa78e8870a94bd490ff6872d1b..f52a93c8ffc7100c651224dcb4b4641a17543cd6 100644 --- a/templates/lmod/8.7.15/data.lmod.arm.cpu.kgcc.config +++ b/templates/lmod/8.7.15/data.lmod.arm.cpu.kgcc.config @@ -10,8 +10,8 @@ set -e set -x yum install lua-* tcl-devel make cmake -y module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule export CC=`which gcc` export CXX=`which g++` @@ -21,7 +21,7 @@ mkdir -p Lmod [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule export CC=`which gcc` export CXX=`which g++` diff --git a/templates/meep/1.17.1/data.meep.arm.cpu.config b/templates/meep/1.17.1/data.meep.arm.cpu.config index b552d9230b3df59558fb30a7d8860ee44ca8aaf4..ecc593fce14f7c644744ffb17ef104631fa7d2fd 100644 --- a/templates/meep/1.17.1/data.meep.arm.cpu.config +++ b/templates/meep/1.17.1/data.meep.arm.cpu.config @@ -14,14 +14,14 @@ meep/1.17.1 https://codeload.github.com/NanoComp/meep/tar.gz/v1.17.1 meep-1.17.1 set -e set -x module purge -./jarvis -install package/hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +./jarvis -install package/hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule module add bisheng/hmpi2.4.3/hmpi [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule module add bisheng/hmpi2.4.3/hmpi export MEEP_DEPENDENCIES_DIR=${JARVIS_ROOT}/MEEP_DEPENDENCIES diff --git a/templates/meep/data.meep.arm.cpu.config b/templates/meep/data.meep.arm.cpu.config index 5a66be5b2892fbc680467414c18e45b9047c2382..946e2e845f901f24beee69bf13ca7f3f52771d22 100644 --- a/templates/meep/data.meep.arm.cpu.config +++ b/templates/meep/data.meep.arm.cpu.config @@ -9,14 +9,14 @@ libGDSII/0.21 https://codeload.github.com/HomerReid/libGDSII/tar.gz/v0.21 libGDS meep/1.17.1 https://codeload.github.com/NanoComp/meep/tar.gz/v1.17.1 meep-1.17.1.tar.gz [DEPENDENCY] -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=clang CXX=clang++ FC=flang diff --git a/templates/memkind/1.13.0/data.memkind.arm.cpu.bisheng.config b/templates/memkind/1.13.0/data.memkind.arm.cpu.bisheng.config index 1b0b81a7637ad8609f2ccf1b9599f6d4c8c7c4aa..d706eeb194257bac787a053be1c43588ce1c7a90 100644 --- a/templates/memkind/1.13.0/data.memkind.arm.cpu.bisheng.config +++ b/templates/memkind/1.13.0/data.memkind.arm.cpu.bisheng.config @@ -7,8 +7,8 @@ set -e set -x module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add bisheng/compiler4.1.0/bishengmodule export CC=`which clang` export CXX=`which clang++` @@ -18,7 +18,7 @@ source ${JARVIS_ROOT}/spack/share/spack/setup-env.sh [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add bisheng/compiler4.1.0/bishengmodule export CC=`which clang` export CXX=`which clang++` diff --git a/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config b/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config index df258bd683fe6d575c3772c91a7b60644cbaf13c..35727f37243de944ff539fe3fbdd52529a62255b 100644 --- a/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config +++ b/templates/meso_grapes/6.0/data.meso_grapes.arm.cpu.bisheng.hmpi.config @@ -8,8 +8,8 @@ set -e set -x ./CHECK_ROOT && yum install -y time.aarch64 zlib.aarch64 zlib-devel.aarch64 libtirpc.aarch64 libtirpc-devel.aarch64 numactl.aarch64 module purge -./jarvis -install hpckit/2024.12.30 com -module use ./software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 com +module use ./software/compiler/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi export CC=mpicc CXX=mpicxx FC=mpifort @@ -24,7 +24,7 @@ module load netcdf-clang/4.8.1 [ENV] #!/bin/bash module purge -module use ${JARVIS_ROOT}/software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ${JARVIS_ROOT}/software/compiler/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/compiler4.1.0/bishengmodule module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3 module load bisheng/hmpi2.4.3/hmpi @@ -33,7 +33,7 @@ module load pnetcdf/1.12.3 module load netcdf-clang/4.8.1 module load bisheng/kml2.5.0/kml export NETCDF_LIB=${NETCDF_CLANG_PATH}/lib -export KML_LIB=${JARVIS_ROOT}/software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib/noarch +export KML_LIB=${JARVIS_ROOT}/software/compiler/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib/noarch export HMG_LIB=${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/hmg export LD_LIBRARY_PATH=${HMG_LIB}:$LD_LIBRARY_PATH @@ -52,7 +52,7 @@ if [ -d "./GRAPES_MESO_262794_6.0_gz" ]; then fi tar -zxvf $JARVIS_DOWNLOAD/GRAPES_MESO_262794_6.0_gz_20241230.tar.gz cd ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/hmg -KML_PATH=${JARVIS_ROOT}/software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng +KML_PATH=${JARVIS_ROOT}/software/compiler/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng mpicxx sharedlib.cpp -fPIC -shared -std=c++17 -stdlib=libc++ -w -march=armv8.3-a+fp16 -O3 -mcpu=hip09 -ffast-math -lm -lc++ -I/${KML_PATH}/include -L/${KML_PATH}/lib/sve/ -lkscasolver -lkservice -lklapack_full -L/${KML_PATH}/lib/sve/kblas/pthread -lkblas -o libgmg_P32D16.so cd ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/grapes_model sed -i '19c OPTFLAGS_INTELC = -O3 -Wno-implicit-function-declaration -Wno-implicit-int -mcpu=hip09' ${JARVIS_ROOT}/GRAPES_MESO_262794_6.0_gz/fcst/grapes_model/config/configure.grapes.KUNPENG diff --git a/templates/minighost/1.0/data.minighost.arm.cpu.gcc.hmpi.config b/templates/minighost/1.0/data.minighost.arm.cpu.gcc.hmpi.config index d7d98582cd8020eb3705195b35940b4d0cecfa22..b1805dc63f7820f1a3de5771bec713f054686d14 100644 --- a/templates/minighost/1.0/data.minighost.arm.cpu.gcc.hmpi.config +++ b/templates/minighost/1.0/data.minighost.arm.cpu.gcc.hmpi.config @@ -8,8 +8,8 @@ miniGhost/v1.0 https://github.com/Mantevo/miniGhost/archive/refs/heads/master.zi set -e set -x -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi unzip ${JARVIS_DOWNLOAD}/miniGhost-master.zip @@ -21,7 +21,7 @@ sed -i '36,$d' Makefile echo ' PROTOCOL = -D_MG_MPI -MPI_LOC = '"${JARVIS_ROOT}"'/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/hmpi/gcc/hmpi +MPI_LOC = '"${JARVIS_ROOT}"'/software/utils/hpckit/24.0.0/HPCKit/24.12.30/hmpi/gcc/hmpi MPI_INCLUDE = -I$(MPI_LOC)/include # State precision: -D_REAL4 and/or -D_REAL8. REAL_PRECISION = -D_MG_REAL8 @@ -48,7 +48,7 @@ FFLAGS += -D_MG_CHECKPT NCPATH= LNCDF=-L$(NCPATH)/lib LD=$(FC) -LDFLAGS=$(CFLAGS) $(FFLAGS) -L'"${JARVIS_ROOT}"'/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/hmpi/gcc/hmpi -lmpi_mpifh +LDFLAGS=$(CFLAGS) $(FFLAGS) -L'"${JARVIS_ROOT}"'/software/utils/hpckit/24.0.0/HPCKit/24.12.30/hmpi/gcc/hmpi -lmpi_mpifh #LDFLAGS=$(CFLAGS) $(FFLAGS) #LDFLAGS=$(FFLAGS) LIBS= @@ -57,7 +57,7 @@ include make_targets ' >> Makefile [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi diff --git a/templates/minimap2/master/data.minimap2.arm.cpu.bisheng.config b/templates/minimap2/master/data.minimap2.arm.cpu.bisheng.config index 617f3264bc90b4cac19e13c11a8f68216e403cbe..0c150c0fd8f4a2200cb755e1518051accad261c3 100644 --- a/templates/minimap2/master/data.minimap2.arm.cpu.bisheng.config +++ b/templates/minimap2/master/data.minimap2.arm.cpu.bisheng.config @@ -8,15 +8,15 @@ minimap2/master https://github.com/lh3/minimap2/archive/master.zip minimap2-mast set -e set -x -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule yum install wget git gcc-c++ zlib -y unzip ${JARVIS_DOWNLOAD}/minimap2-master.zip [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule diff --git a/templates/mopac/22.0.4/data.container-mopac-sve.arm.cpu.config b/templates/mopac/22.0.4/data.container-mopac-sve.arm.cpu.config index 8f2c684ad3702a2b4a23a113392dccb9b74ca4e7..e674358ea17fcfbbae4588b03d4959cc3fe942bc 100644 --- a/templates/mopac/22.0.4/data.container-mopac-sve.arm.cpu.config +++ b/templates/mopac/22.0.4/data.container-mopac-sve.arm.cpu.config @@ -18,7 +18,7 @@ module use software/moduledeps/bisheng4.0.0-hmpi2.4.1 module add openblas/0.3.14 [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=mpicc CXX=mpicxx FC=mpifort diff --git a/templates/mopac/22.0.4/data.container-mopac.arm.cpu.config b/templates/mopac/22.0.4/data.container-mopac.arm.cpu.config index 2aeb840af098e6f668c1243c1a78989ff459fb2a..6dc8834777795c748323258c0a077488cc7144f9 100644 --- a/templates/mopac/22.0.4/data.container-mopac.arm.cpu.config +++ b/templates/mopac/22.0.4/data.container-mopac.arm.cpu.config @@ -6,8 +6,8 @@ mopac/22.0.4 https://github.com/openmopac/mopac/archive/refs/tags/v22.0.4.tar.gz [DEPENDENCY] -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=mpicc CXX=mpicxx FC=mpifort @@ -22,7 +22,7 @@ module use ./software/moduledeps/bisheng4.1.0-hmpi2.4.3 module add openblas/0.3.14 [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=mpicc CXX=mpicxx FC=mpifort diff --git a/templates/mopac/22.0.4/data.mopac-common.arm.cpu.config b/templates/mopac/22.0.4/data.mopac-common.arm.cpu.config index 0fbf77e7ed26d85732d651e304bf42ede7d7df01..7cff8b57ea20db8ee55209c31cacda4faef06cdd 100644 --- a/templates/mopac/22.0.4/data.mopac-common.arm.cpu.config +++ b/templates/mopac/22.0.4/data.mopac-common.arm.cpu.config @@ -6,8 +6,8 @@ mopac/22.0.4 https://github.com/openmopac/mopac/archive/refs/tags/v22.0.4.tar.gz [DEPENDENCY] -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi module add gcc/kml2.5.0/kml @@ -15,7 +15,7 @@ module unload gcc/kml2.5.0/kblas/pthread module add gcc/kml2.5.0/kblas/omp [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi module add gcc/kml2.5.0/kml @@ -40,7 +40,7 @@ tar -xf ${JARVIS_DOWNLOAD}/v22.0.4.tar.gz yum install numactl-libs -y cd mopac-22.0.4 mkdir build && cd build -export KML_LIB_PATH=${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/kml/gcc/lib +export KML_LIB_PATH=${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.12.30/kml/gcc/lib cmake -DCMAKE_INSTALL_PREFIX=${JARVIS_ROOT}/software/apps/gcc12.3.1/hmpi2.4.3/mopac/22.0.4 .. -DCMAKE_EXE_LINKER_FLAGS="-L$KML_LIB_PATH -L$KML_LIB_PATH/sve -lkml_rt -lklapack_full -lkscalapack_full" make -j make install diff --git a/templates/mpb/1.11.1/data.mpb.arm.cpu.config b/templates/mpb/1.11.1/data.mpb.arm.cpu.config index 5ad8f5e699df5f0569fd5aa354c89e88a0634345..b241c1b93ab0bbad4163d84fffa6e4436ae8af4b 100644 --- a/templates/mpb/1.11.1/data.mpb.arm.cpu.config +++ b/templates/mpb/1.11.1/data.mpb.arm.cpu.config @@ -14,14 +14,14 @@ mpb/1.11.1 https://github.com/NanoComp/mpb/archive/v1.11.1.tar.gz mpb-v1.11.1.ta set -e set -x module purge -./jarvis -install package/hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +./jarvis -install package/hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule module add bisheng/hmpi2.4.3/hmpi [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule module add bisheng/hmpi2.4.3/hmpi export MPB_DEPENDENCIES_DIR=${JARVIS_ROOT}/MPB_DEPENDENCIES diff --git a/templates/must/1.8.0/data.must.arm.cpu.kgcc.config b/templates/must/1.8.0/data.must.arm.cpu.kgcc.config index a34c6622f0a2fe967d1873acdf3a1a6166aa396d..62ef231bc3cf797b30e6b1f7ab14be34f3a42f5b 100644 --- a/templates/must/1.8.0/data.must.arm.cpu.kgcc.config +++ b/templates/must/1.8.0/data.must.arm.cpu.kgcc.config @@ -9,8 +9,8 @@ set -e set -x yum install cmake make texinfo -y module purge -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule export CC=`which gcc` export CXX=`which g++` @@ -29,7 +29,7 @@ tar -xvf ${JARVIS_DOWNLOAD}/MUST-v1.8.0-rc1.tar.gz [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module add gcc/compiler12.3.1/gccmodule export CC=`which gcc` export CXX=`which g++` diff --git a/templates/namd/2.13/data.namd.arm.cpu.config b/templates/namd/2.13/data.namd.arm.cpu.config index 226f25b9388e66a7368006e8e8ea92763e3820b1..18b225858e86f3f84b0513528a5ef546558322d8 100644 --- a/templates/namd/2.13/data.namd.arm.cpu.config +++ b/templates/namd/2.13/data.namd.arm.cpu.config @@ -6,8 +6,8 @@ namd/2.13 https://www.ks.uiuc.edu/Research/namd/2.13/download/412487/NAMD_2.13_S tcl/8.5 http://www.ks.uiuc.edu/Research/namd/libraries/tcl8.5.9-linux-arm64-threaded.tar.gz [DEPENDENCY] -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi @@ -18,7 +18,7 @@ module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ module load fftw/3.3.8 [ENV] -module use ${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ diff --git a/templates/ncl/6.3.0/data.NCL.arm-container-bisheng-sve.cpu.config b/templates/ncl/6.3.0/data.NCL.arm-container-bisheng-sve.cpu.config index 4ae41a17f1c3d3230ef379ff274cac9fec953ca8..50329f29bad10d05538316fce34e9ee0899a243d 100644 --- a/templates/ncl/6.3.0/data.NCL.arm-container-bisheng-sve.cpu.config +++ b/templates/ncl/6.3.0/data.NCL.arm-container-bisheng-sve.cpu.config @@ -218,7 +218,7 @@ cat config/Site.local make Everything 2>&1 |tee make.log mkdir /hpcrunner/software/utils/ncl/6.3.0/clang/share/ncarg/database/rangs ln -s /hpcrunner/software/utils/ncl/6.3.0/clang/share/ncarg/* /hpcrunner/software/utils/ncl/6.3.0/clang/lib/ncarg/ -cd /hpcrunner/software/utils/ncl/6.3.0/clang/share/ncarg/database/rangs +cd $JARVIS_ROOT/software/utils/ncl/6.3.0/clang/share/ncarg/database/rangs wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(0\).zip --no-ch wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(1\).zip --no-ch wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(2\).zip --no-ch diff --git a/templates/ncl/6.3.0/data.NCL.arm-container-bisheng.cpu.config b/templates/ncl/6.3.0/data.NCL.arm-container-bisheng.cpu.config index abec83ebeb62c943902683d37ac3835b4111503c..ca573b8b25e87d838c8ee7141e1ec0d2e5bfffb1 100644 --- a/templates/ncl/6.3.0/data.NCL.arm-container-bisheng.cpu.config +++ b/templates/ncl/6.3.0/data.NCL.arm-container-bisheng.cpu.config @@ -218,7 +218,7 @@ cat config/Site.local make Everything 2>&1 |tee make.log mkdir /hpcrunner/software/utils/ncl/6.3.0/clang/share/ncarg/database/rangs ln -s /hpcrunner/software/utils/ncl/6.3.0/clang/share/ncarg/* /hpcrunner/software/utils/ncl/6.3.0/clang/lib/ncarg/ -cd /hpcrunner/software/utils/ncl/6.3.0/clang/share/ncarg/database/rangs +cd $JARVIS_ROOT/software/utils/ncl/6.3.0/clang/share/ncarg/database/rangs wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(0\).zip --no-ch wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(1\).zip --no-ch wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(2\).zip --no-ch diff --git a/templates/ncl/6.3.0/data.NCL.arm-container.cpu.config b/templates/ncl/6.3.0/data.NCL.arm-container.cpu.config index d9fd25bb7b8746d1f19529a705479313d6b3313e..e8b85f604f904498145ebf8ae87c7ff8bc16fe17 100644 --- a/templates/ncl/6.3.0/data.NCL.arm-container.cpu.config +++ b/templates/ncl/6.3.0/data.NCL.arm-container.cpu.config @@ -215,7 +215,7 @@ cat config/Site.local make Everything 2>&1 |tee make.log mkdir /hpcrunner/software/utils/ncl/6.3.0/clang/share/ncarg/database/rangs ln -s /hpcrunner/software/utils/ncl/6.3.0/clang/share/ncarg/* /hpcrunner/software/utils/ncl/6.3.0/clang/lib/ncarg/ -cd /hpcrunner/software/utils/ncl/6.3.0/clang/share/ncarg/database/rangs +cd $JARVIS_ROOT/software/utils/ncl/6.3.0/clang/share/ncarg/database/rangs wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(0\).zip --no-ch wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(1\).zip --no-ch wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(2\).zip --no-ch diff --git a/templates/ncl/6.6.2/data.NCL.arm-container-bisheng.cpu.config b/templates/ncl/6.6.2/data.NCL.arm-container-bisheng.cpu.config index 4a31d70b261d713de16a48fe4c7355ef87a999b4..fa42e1b167a3ec8b670fab6b46478ae46cbc752b 100644 --- a/templates/ncl/6.6.2/data.NCL.arm-container-bisheng.cpu.config +++ b/templates/ncl/6.6.2/data.NCL.arm-container-bisheng.cpu.config @@ -203,7 +203,7 @@ cat config/Site.local make Everything 2>&1 |tee make.log ln -s /hpcrunner/software/utils/ncl/6.6.2/clang/share/ncarg/* /hpcrunner/software/utils/ncl/6.6.2/clang/lib/ncarg/ -cd /hpcrunner/software/utils/ncl/6.6.2/clang/lib/ncarg/database/rangs +cd $JARVIS_ROOT/software/utils/ncl/6.6.2/clang/lib/ncarg/database/rangs wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(0\).zip --no-ch wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(1\).zip --no-ch wget https://www.io-warnemuende.de/files/staff/rfeistel/download/rangs\(2\).zip --no-ch diff --git a/templates/ncview/2.1.5/data.ncview.arm.cpu.config b/templates/ncview/2.1.5/data.ncview.arm.cpu.config index a3c243afca548bc9c2ba3413ea3a9123ac833aa8..8f1ffbdcde584b93f75fb536e0fa59636ccb7868 100644 --- a/templates/ncview/2.1.5/data.ncview.arm.cpu.config +++ b/templates/ncview/2.1.5/data.ncview.arm.cpu.config @@ -8,8 +8,8 @@ ncview/2.1.5 https://src.fedoraproject.org/repo/pkgs/ncview/ncview-2.1.5.tar.gz/ set -x set -e module purge -./jarvis -install package/hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +./jarvis -install package/hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule module add bisheng/hmpi2.4.3/hmpi module use software/moduledeps @@ -23,7 +23,7 @@ module add bisheng4.1.0-hmpi2.4.3/pnetcdf/1.12.3 [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/latest/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/latest/modulefiles module add bisheng/compiler4.1.0/bishengmodule module add bisheng/hmpi2.4.3/hmpi module use software/moduledeps diff --git a/templates/nwchem/6.8.1/data.nwchem-new.arm.cpu.config b/templates/nwchem/6.8.1/data.nwchem-new.arm.cpu.config index bb77392c15d556b736f9da337f74d57d506dc9d4..10c03cd196215f2e160d5c07fa2f68dc1499e064 100644 --- a/templates/nwchem/6.8.1/data.nwchem-new.arm.cpu.config +++ b/templates/nwchem/6.8.1/data.nwchem-new.arm.cpu.config @@ -25,7 +25,7 @@ module use ./software/moduledeps/bisheng3.2.0 module load hmpi/2.3.0 export CC=clang CXX=clang++ FC=flang export PMIX_INSTALL_PREFIX=${OPAL_PREFIX} -cd /hpcrunner +cd $JARVIS_ROOT CUR_PATH=$(pwd) export JARVIS_ROOT=${CUR_PATH} export JARVIS_TMP=${CUR_PATH}/tmp diff --git a/templates/nwchem/6.8.1/data.nwchem-sve.arm.cpu.config b/templates/nwchem/6.8.1/data.nwchem-sve.arm.cpu.config index 1db99956347b6e0a2d031c1afc3ccff98c59c2c1..e3929537d83e39e4987ad597ddfee3687b8d9d74 100644 --- a/templates/nwchem/6.8.1/data.nwchem-sve.arm.cpu.config +++ b/templates/nwchem/6.8.1/data.nwchem-sve.arm.cpu.config @@ -25,7 +25,7 @@ module use ./software/moduledeps/bisheng3.2.0 module load hmpi/2.3.0 export CC=clang CXX=clang++ FC=flang export PMIX_INSTALL_PREFIX=${OPAL_PREFIX} -cd /hpcrunner +cd $JARVIS_ROOT CUR_PATH=$(pwd) export JARVIS_ROOT=${CUR_PATH} export JARVIS_TMP=${CUR_PATH}/tmp diff --git a/templates/nwchem/6.8.1/data.nwchem.arm.cpu.hpckit.config b/templates/nwchem/6.8.1/data.nwchem.arm.cpu.hpckit.config index 3cb277a7a243d09c53fe39b6d3b3a287ed0b86b6..3df60aca59716a7609740591814b566dd93b2326 100644 --- a/templates/nwchem/6.8.1/data.nwchem.arm.cpu.hpckit.config +++ b/templates/nwchem/6.8.1/data.nwchem.arm.cpu.hpckit.config @@ -6,15 +6,15 @@ nwchem/6.8.1 https://codeload.github.com/NWChemgit/NWChem/tar.gz/6.8.1-release n ga/5.6.5 https://github.com/edoapra/ga/releases/download/v5.6.5/ga-5.6.5.tar.gz [DEPENDENCY] -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module load gcc/compiler12.3.1/gccmodule export CC=mpicc FC=mpifort CXX=mpicxx [ENV] -module use ${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module load gcc/compiler12.3.1/gccmodule diff --git a/templates/openbabel/3.1.1/data.openbabel.arm.cpu.bisheng.hmpi.config b/templates/openbabel/3.1.1/data.openbabel.arm.cpu.bisheng.hmpi.config index 6ab7007c36c720148b167cd71f8d1b4ff3df9157..8cabb27d7a9bae19aee500672bdad476d3dacc1b 100644 --- a/templates/openbabel/3.1.1/data.openbabel.arm.cpu.bisheng.hmpi.config +++ b/templates/openbabel/3.1.1/data.openbabel.arm.cpu.bisheng.hmpi.config @@ -10,8 +10,8 @@ set -e set -x yum install zlib-devel git cmake make git vim tar time glibc-headers gcc-c++ python3-devel -y -./jarvis -install hpckit/2024.12.30 any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=`which clang` @@ -26,7 +26,7 @@ tar xvf ${JARVIS_DOWNLOAD}/eigen-3.4.0.tar.gz mv eigen-3.4.0 ${JARVIS_ROOT}/openbabel-openbabel-3-1-1/ [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=`which clang` diff --git a/templates/openfoam/11/data.openfoam.new.SVE.cpu.config b/templates/openfoam/11/data.openfoam.new.SVE.cpu.config index c28ec972961781c1bbefd1a031febde1a1c073b6..2dfa85ef3e80f75f8b6d3717d435b7235b55d8ce 100644 --- a/templates/openfoam/11/data.openfoam.new.SVE.cpu.config +++ b/templates/openfoam/11/data.openfoam.new.SVE.cpu.config @@ -9,14 +9,14 @@ ThirdParty/v11 https://github.com/OpenFOAM/ThirdParty-11/archive/refs/tags/versi set -x set -e -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=mpicc FC=mpifort CXX=mpicxx [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi export CC=mpicc FC=mpifort CXX=mpicxx diff --git a/templates/palabos/2.1/data.palabos-common.arm.cpu.config b/templates/palabos/2.1/data.palabos-common.arm.cpu.config index d37e9ace820c7ebe1467881e12f9ba250697c084..5777f62473eca5d8c78e1cce42d8d7a90bfd981d 100644 --- a/templates/palabos/2.1/data.palabos-common.arm.cpu.config +++ b/templates/palabos/2.1/data.palabos-common.arm.cpu.config @@ -6,8 +6,8 @@ palabos/2.1 https://gitlab.com/unigespc/palabos/-/archive/v2.1r0/palabos-v2.1r0. [DEPENDENCY] -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi @@ -21,7 +21,7 @@ yum install ImageMagick -y module add python3/3.6.8 [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module use software/moduledeps/bisheng4.1.0 diff --git a/templates/palabos/2.1/data.palabos.arm.cpu.config b/templates/palabos/2.1/data.palabos.arm.cpu.config index faae46cafaa4c6b0bc5bf7bdd4bbbf0ef4cfc63d..36426b4aaf25b9ca5488cc411e843096bedfdd88 100644 --- a/templates/palabos/2.1/data.palabos.arm.cpu.config +++ b/templates/palabos/2.1/data.palabos.arm.cpu.config @@ -25,7 +25,7 @@ module use ./software/moduledeps/bisheng3.2.0 module load hmpi/2.3.0 export CC=clang CXX=clang++ FC=flang export PMIX_INSTALL_PREFIX=${OPAL_PREFIX} -cd /hpcrunner +cd $JARVIS_ROOT CUR_PATH=$(pwd) export JARVIS_ROOT=${CUR_PATH} export JARVIS_TMP=${CUR_PATH}/tmp diff --git a/templates/plink/1.9/data.plink.arm-920.cpu.config b/templates/plink/1.9/data.plink.arm-920.cpu.config index 93a82925c8d0405ca2fdac5642e66a42d48aee20..a1236b032d9bb411aee47aedf79c23e0ee07c7b6 100644 --- a/templates/plink/1.9/data.plink.arm-920.cpu.config +++ b/templates/plink/1.9/data.plink.arm-920.cpu.config @@ -9,8 +9,8 @@ yum install make cmake gcc g++ -y dnf install openblas-devel zstd-devel zlib-devel -y module purge -./jarvis -install hpckit/2024.12.30 com -module use ./software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 com +module use ./software/compiler/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load gcc/compiler12.3.1/gccmodule module load gcc/kml2.5.0/kml @@ -20,7 +20,7 @@ unzip ${JARVIS_DOWNLOAD}/plink-master.zip [ENV] module purge -module use ./software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ./software/compiler/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load gcc/compiler12.3.1/gccmodule module load gcc/kml2.5.0/kml @@ -31,9 +31,9 @@ binary_dir = ${JARVIS_TMP_DOWNLOAD}/plink-ng-master/bin case_dir = [BUILD] -grep -rl "\-llapack -lblas -lcblas -latlas" | xargs sed -i 's%\-llapack -lblas -lcblas -latlas%-L\${JARVIS_COMPILER}/hpckit/2024.12.30/HPCKit/24.12.30/kml/gcc/lib/neon/kblas/pthread -L\${JARVIS_COMPILER}/hpckit/2024.12.30/HPCKit/24.12.30/kml/gcc/lib/neon -lkblas -lklapack_full -fopenmp%g' -grep -rl "\-llapack -lcblas -lblas" | xargs sed -i 's%\-llapack -lcblas -lblas%\-L\${JARVIS_COMPILER}/hpckit/2024.12.30/HPCKit/24.12.30/kml/gcc/lib/neon/kblas/pthread -L\${JARVIS_COMPILER}/hpckit/2024.12.30/HPCKit/24.12.30/kml/gcc/lib/neon -lkblas -lklapack_full -fopenmp%g' -grep -rl "\-llapack -lf77blas -latlas" | xargs sed -i 's%\-llapack -lf77blas -latlas%\-L\${JARVIS_COMPILER}/hpckit/2024.12.30/HPCKit/24.12.30/kml/gcc/lib/neon/kblas/pthread -L\${JARVIS_COMPILER}/hpckit/2024.12.30/HPCKit/24.12.30/kml/gcc/lib/neon -lkblas -lklapack_full -fopenmp%g' +grep -rl "\-llapack -lblas -lcblas -latlas" | xargs sed -i 's%\-llapack -lblas -lcblas -latlas%-L\${JARVIS_COMPILER}/hpckit/24.0.0/HPCKit/24.12.30/kml/gcc/lib/neon/kblas/pthread -L\${JARVIS_COMPILER}/hpckit/24.0.0/HPCKit/24.12.30/kml/gcc/lib/neon -lkblas -lklapack_full -fopenmp%g' +grep -rl "\-llapack -lcblas -lblas" | xargs sed -i 's%\-llapack -lcblas -lblas%\-L\${JARVIS_COMPILER}/hpckit/24.0.0/HPCKit/24.12.30/kml/gcc/lib/neon/kblas/pthread -L\${JARVIS_COMPILER}/hpckit/24.0.0/HPCKit/24.12.30/kml/gcc/lib/neon -lkblas -lklapack_full -fopenmp%g' +grep -rl "\-llapack -lf77blas -latlas" | xargs sed -i 's%\-llapack -lf77blas -latlas%\-L\${JARVIS_COMPILER}/hpckit/24.0.0/HPCKit/24.12.30/kml/gcc/lib/neon/kblas/pthread -L\${JARVIS_COMPILER}/hpckit/24.0.0/HPCKit/24.12.30/kml/gcc/lib/neon -lkblas -lklapack_full -fopenmp%g' sed -i 's%cblas.h%kblas.h%g' 1.9/plink_matrix.h sed -i 's%cblas.h%kblas.h%g' 2.0/plink2_matrix.h cd 1.9/ diff --git a/templates/prottest/3.4.2/data.prottest.arm.cpu.config b/templates/prottest/3.4.2/data.prottest.arm.cpu.config index 07e92bb1cd0eb3eda5efdd31555a39e2773385f4..e10bbf019e518594a410f54300eb3bb63d3a018d 100644 --- a/templates/prottest/3.4.2/data.prottest.arm.cpu.config +++ b/templates/prottest/3.4.2/data.prottest.arm.cpu.config @@ -9,8 +9,8 @@ set -e set -x yum install -y ant module purge -./jarvis -install hpckit/2024.12.30 com -module use ./software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 com +module use ./software/compiler/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi export CC=mpicc CXX=mpicxx FC=mpifort @@ -23,7 +23,7 @@ tar -xzvf ${JARVIS_DOWNLOAD}/prottest3-3.4.2-release.tar.gz [ENV] module purge -module use ${JARVIS_ROOT}/software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ${JARVIS_ROOT}/software/compiler/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/compiler4.1.0/bishengmodule module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3 module load phyml/3.3 diff --git a/templates/psi4/1.3.2/data.psi4-common.arm.cpu.config b/templates/psi4/1.3.2/data.psi4-common.arm.cpu.config index 64fc231693a723b4a8b28cf6b6485c7f659f1665..c5fefdddd2bd41fc79cfea89869587fb4b8d5ecf 100644 --- a/templates/psi4/1.3.2/data.psi4-common.arm.cpu.config +++ b/templates/psi4/1.3.2/data.psi4-common.arm.cpu.config @@ -6,8 +6,8 @@ psi4/1.3.2 https://github.com/psi4/psi4/archive/v1.3.2.tar.gz [DEPENDENCY] -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add gcc/compiler12.3.1/gccmodule gcc/hmpi2.4.3/hmpi diff --git a/templates/qe/7.3/data.qe-common.arm.cpu.config b/templates/qe/7.3/data.qe-common.arm.cpu.config index 25a3f370c3b546b9143c8b01bdd5ba20c75cae23..5486eed9b42da40e568c9fb507694e0d41fa1e92 100644 --- a/templates/qe/7.3/data.qe-common.arm.cpu.config +++ b/templates/qe/7.3/data.qe-common.arm.cpu.config @@ -7,19 +7,19 @@ bench/master $JARVIS_PROXY/QEF/benchmarks/archive/refs/heads/master.zip [DEPENDENCY] module purge -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi [ENV] module purge -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi -export KML_LIB=$JARVIS_UTILS/hpckit/2024.12.30/HPCKit/24.12.30/kml/bisheng/lib +export KML_LIB=$JARVIS_UTILS/hpckit/24.0.0/HPCKit/24.12.30/kml/bisheng/lib export BLAS_PATH=$KML_LIB/sve/kblas/omp export LAPACK_PATH=$KML_LIB/sve export KM_LIB=$KML_LIB/noarch diff --git a/templates/qe/7.3/data.qe.arm-920.cpu.config b/templates/qe/7.3/data.qe.arm-920.cpu.config index 6bfe2e1fdea770e5ba087a7efd70d89ff89ae6bf..214b86a0fbc8d1576f2aeef127abd6c562825e4e 100644 --- a/templates/qe/7.3/data.qe.arm-920.cpu.config +++ b/templates/qe/7.3/data.qe.arm-920.cpu.config @@ -28,7 +28,7 @@ module load kml-bisheng/2.2.0 export BLAS_LIBS="-L${JARVIS_ROOT}/software/libs/bisheng3.2.0/kml-bisheng/1.7.0/lib/kblas/omp -lkblas" export LAPACK_LIBS="-L${JARVIS_ROOT}/software/libs/bisheng3.2.0/kml-bisheng/1.7.0/lib -lklapack_full" -cd /hpcrunner +cd $JARVIS_ROOT CUR_PATH=$(pwd) export JARVIS_ROOT=${CUR_PATH} export JARVIS_TMP=${CUR_PATH}/tmp diff --git a/templates/qe/7.3/data.qe.arm-sve.cpu.config b/templates/qe/7.3/data.qe.arm-sve.cpu.config index b2b093607ce3a51cfbfd8985c637ae7f4f9f878e..12373327721475b95ef74522862a223dbc77a5b4 100644 --- a/templates/qe/7.3/data.qe.arm-sve.cpu.config +++ b/templates/qe/7.3/data.qe.arm-sve.cpu.config @@ -28,7 +28,7 @@ module load kml-bisheng/2.2.0 export BLAS_LIBS="-L${JARVIS_ROOT}/software/libs/bisheng3.2.0/kml-bisheng/2.2.0/lib/kblas/omp -lkblas" export LAPACK_LIBS="-L${JARVIS_ROOT}/software/libs/bisheng3.2.0/kml-bisheng/2.2.0/lib -lklapack_full" -cd /hpcrunner +cd $JARVIS_ROOT CUR_PATH=$(pwd) export JARVIS_ROOT=${CUR_PATH} export JARVIS_TMP=${CUR_PATH}/tmp diff --git a/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config index 8643ebb0cabaa72c2c351c8abf9854268c0482d2..4f82a04096b9d5e45e51130561c827f805e071a1 100644 --- a/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config +++ b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config @@ -11,8 +11,8 @@ set -x yum install -y python3 python3-devel cmake module purge -./jarvis -install hpckit/2024.12.30 com -module use ./software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install hpckit/24.0.0 com +module use ./software/compiler/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi export CC=mpicc CXX=mpicxx FC=mpifort @@ -52,7 +52,7 @@ unzip ${JARVIS_DOWNLOAD}/QGIS-final-3_34_7.zip [ENV] module purge -module use ./software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ./software/compiler/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi export CPATH=${OPAL_PREFIX}/include:$CPATH diff --git a/templates/qmcpack/3.17.1/data.qmcpack-common.arm.cpu.config b/templates/qmcpack/3.17.1/data.qmcpack-common.arm.cpu.config index d83bdb09a4c199699a7c788dc4fb23e977533a69..b4ea037ca65147b7c4bc115c35fe615588e6a77a 100644 --- a/templates/qmcpack/3.17.1/data.qmcpack-common.arm.cpu.config +++ b/templates/qmcpack/3.17.1/data.qmcpack-common.arm.cpu.config @@ -7,8 +7,8 @@ qmcpack/3.17.1 ${JARVIS_PROXY}/QMCPACK/qmcpack/archive/refs/tags/v3.17.1.tar.gz [DEPENDENCY] set -e set -x -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi @@ -35,7 +35,7 @@ sed -i '10c ./configure --prefix=$1 --enable-fortran --enable-static=yes --enabl module load hdf5-clang/1.10.1 [ENV] -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module add bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module use software/moduledeps/bisheng4.1.0 diff --git a/templates/qp2/2.2.2/qp2.arm.bisheng.hpckit.py3.config b/templates/qp2/2.2.2/qp2.arm.bisheng.hpckit.py3.config index df2e0779ac3d657f61b6397352cb6a6c44c0e848..857a08ba16795dbfb71a3aa3a349165852998e6b 100755 --- a/templates/qp2/2.2.2/qp2.arm.bisheng.hpckit.py3.config +++ b/templates/qp2/2.2.2/qp2.arm.bisheng.hpckit.py3.config @@ -7,8 +7,8 @@ QuantumPackage/qp2/2.2.2 [DEPENDENCY] set -e module purge -./jarvis -install hpckit/2025.3.30 any -module use ./software/utils/hpckit/2025.3.30/HPCKit/latest/modulefiles +./jarvis -install hpckit/25.0.0 any +module use ./software/utils/hpckit/25.0.0/HPCKit/latest/modulefiles module load bisheng/compiler4.2.0/bishengmodule module load bisheng/hmpi25.0.0/hmpi module load bisheng/kml25.0.0/kml @@ -28,7 +28,7 @@ git submodule update --init --recursive [ENV] module purge -module use ./software/utils/hpckit/2025.3.30/HPCKit/latest/modulefiles +module use ./software/utils/hpckit/25.0.0/HPCKit/latest/modulefiles module load bisheng/compiler4.2.0/bishengmodule module load bisheng/hmpi25.0.0/hmpi module load bisheng/kml25.0.0/kml @@ -53,7 +53,7 @@ sed -i '328s/\(.\/configure\)/CFLAGS="-O3 -fPIC -Wno-deprecated-non-prototype" \ # fix compiler zeromq error: ISO C++ requires the name after '::~generic_mtrie_t ()' sed -i '282a\ sed -i \"s\/\\~generic_mtrie_t\/\\~generic_mtrie_t\\/\" src\/generic_mtrie_impl.hpp' configure #If you don't have HDF5, use trexio-nohdf5,; use trexio need add --with-hdf5=$HDF5_PATH -sed -i '235s/$/\ CPPFLAGS="-I\${JARVIS_UTILS}\/hpckit\/2025.3.30\/HPCKit\/25.0.0\/hmpi\/bisheng\/hmpi\/include" --with-hdf5=\${JARVIS_LIBS}\/bisheng4.2.0\/hmpi25.0.0\/hdf5-clang\/1.12.1/' configure +sed -i '235s/$/\ CPPFLAGS="-I\${JARVIS_UTILS}\/hpckit\/25.0.0\/HPCKit\/25.0.0\/hmpi\/bisheng\/hmpi\/include" --with-hdf5=\${JARVIS_LIBS}\/bisheng4.2.0\/hmpi25.0.0\/hdf5-clang\/1.12.1/' configure sed -i 's/make check \&\&//' configure ./configure -i zlib ./configure -i ninja @@ -81,8 +81,8 @@ sed -i 's/derf/erf/g' src/dft_utils_func/routines_exc_sr_lda.irp.f cat > config/flang_hmpi.cfg <&1 | tee -a compile.log + +[CLEAN] +./clean -a + +[RUN] +run = mpirun --allow-run-as-root -n 32 -x OMP_NUM_THREADS=1 -bind-to core ${WRF_DIR}/run/wrf.exe +binary = +nodes = 1 + diff --git a/templates/wrfda/3.9.1/data.wrfda-sve.arm.cpu.config b/templates/wrfda/3.9.1/data.wrfda-sve.arm.cpu.config index 36a1ee76dc4ba9f2213ecccc94df75c34fcdf1ea..b0cd6072c1234e5e4d44fa3ecf8faf0b9656f994 100644 --- a/templates/wrfda/3.9.1/data.wrfda-sve.arm.cpu.config +++ b/templates/wrfda/3.9.1/data.wrfda-sve.arm.cpu.config @@ -51,7 +51,7 @@ export JASPERINC=${JASPER_PATH}/include export WRF_DIR=${WRF_DIR} export RTTOV=${RTTOV_PATH} export MPI_LIB="-L$MPI_LIB -lmpi -lomp" -export PATH=$PATH:/hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/wrfda/3.9.1/var/da:/hpcrunner/software/libs/bisheng4.0.0/hmpi2.4.1/wrfda/3.9.1/run +export PATH=$PATH:$JARVIS_ROOT/software/libs/bisheng4.0.0/hmpi2.4.1/wrfda/3.9.1/var/da:$JARVIS_ROOT/software/libs/bisheng4.0.0/hmpi2.4.1/wrfda/3.9.1/run [APP] app_name = wrfda diff --git a/templates/ww3/6.07.1/ww3.arm.cpu.config b/templates/ww3/6.07.1/ww3.arm.cpu.config index 5cb8959b0502af556d63d474a735925dd9bf3503..f185d0964be5f86801228ebb58181808fe128d58 100644 --- a/templates/ww3/6.07.1/ww3.arm.cpu.config +++ b/templates/ww3/6.07.1/ww3.arm.cpu.config @@ -5,8 +5,8 @@ ww3/6.07.1 https://github.com/NOAA-EMC/WW3/archive/refs/tags/6.07.1.tar.gz WW3-6.07.1.tar.gz [DEPENDENCY] -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +./jarvis -install package/hpckit/24.0.0/ any +module use software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi @@ -21,7 +21,7 @@ module load pnetcdf/1.11.2 module load netcdf-clang/4.7.4 [ENV] -module use ${JARVIS_ROOT}/software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module use ${JARVIS_ROOT}/software/utils/hpckit/24.0.0/HPCKit/24.12.30/modulefiles module purge module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi module use ${JARVIS_ROOT}/software/moduledeps/bisheng4.1.0-hmpi2.4.3/ diff --git "a/\350\264\276\347\273\264\346\226\257\345\274\200\345\217\221\350\200\205\346\263\250\346\204\217\344\272\213\351\241\271.md" "b/\350\264\276\347\273\264\346\226\257\345\274\200\345\217\221\350\200\205\346\263\250\346\204\217\344\272\213\351\241\271.md" deleted file mode 100644 index 11cc5ca875bc01fd1e663f57400d7144d16553bf..0000000000000000000000000000000000000000 --- "a/\350\264\276\347\273\264\346\226\257\345\274\200\345\217\221\350\200\205\346\263\250\346\204\217\344\272\213\351\241\271.md" +++ /dev/null @@ -1,17 +0,0 @@ -# HPCRunner 开发者注意事项 -# 1、使用安装HPCKIT的方式替代单独安装HMPI、BISHENG以及数学库 -建议使用如下方式安装并使能hpckit -``` -./jarvis -install package/hpckit/2024.12.30/ any -module use software/utils/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles -module purge -module load bisheng/compiler4.1.0/bishengmodule bisheng/hmpi2.4.3/hmpi -``` -不建议使用如下方式 -``` -./jarvis -install hmpi/1.1.1 clang -module use software/moduledeps/bisheng2.1.0 -module load hmpi/1.1.1 -``` - -export JARVIS_ROOT=/hpcrunner