From 73ce493dfdfffe651f6097ed22ae3791be70bb64 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Tue, 18 Jul 2023 14:57:33 +0800
Subject: [PATCH 1/9] fix hdf4

---
 package/hdf4/4.2.15/install.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package/hdf4/4.2.15/install.sh b/package/hdf4/4.2.15/install.sh
index dcadcb0..327ffe0 100755
--- a/package/hdf4/4.2.15/install.sh
+++ b/package/hdf4/4.2.15/install.sh
@@ -6,6 +6,10 @@ cd ${JARVIS_TMP}
 rm -rf hdf-4.2.15
 tar -xvf ${JARVIS_DOWNLOAD}/hdf-4.2.15.tar.gz
 cd hdf-4.2.15
-FFLAGS+='-fallow-argument-mismatch' ./configure --prefix=$1  --with-zlib=/usr/local --disable-fortran --with-jpeg=${LIBJPEG_PATH} --disable-netcdf
+sed -i '974c #if defined(__linux__) && defined __x86_64__ && !( defined SUN) || defined(__aarch64__)' hdf/src/hdfi.h
+sed -i '23660a LIBS="$LIBS -ltirpc"' configure
+sed -i '23662c CPPFLAGS="$SYSCPPFLAGS -I/usr/include/tirpc"' configure
+export CC=mpicc CXX=mpicxx FC=mpifort
+./configure --prefix=$1 --enable-production --with-zlib=/usr/lib64 --enable-fortran --enable-hdf4-xdr --disable-shared --build=arm-linux  --with-jpeg=${LIBJPEG_PATH} --disable-netcdf CFLAGS="-fPIC " CXXFLAGS="-fPIC" FFLAGS="-fPIC -fallow-argument-mismatch"
 make -j
 make install
-- 
Gitee


From 4a5e44aced51bec5bb7dca7d1d8ea646d9ed4fd5 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Tue, 18 Jul 2023 20:01:09 +0800
Subject: [PATCH 2/9] fix g2clib/1.6.0

---
 package/g2clib/1.6.0/install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/g2clib/1.6.0/install.sh b/package/g2clib/1.6.0/install.sh
index a29d992..54eb219 100755
--- a/package/g2clib/1.6.0/install.sh
+++ b/package/g2clib/1.6.0/install.sh
@@ -8,9 +8,11 @@ cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/g2clib-image/g2clib-1.6.0-patch.tar.gz
 cd g2clib-1.6.0-patch
 
-sed -i '22c INC=-I/glade/p/work/haley/dev/external/gnu/4.7.2/include -I${JASPER_PATH}/include' makefile
+sed -i '22c INC=-I/glade/p/work/haley/dev/external/gnu/4.7.2/include -I${JASPER_PATH}/include -I${LIBPNG_PATH}/include/libpng16' makefile
+sed -i '33c CC=clang' makefile
+sed -i '8c #include "png.h"' dec_png.c
 make all
 mkdir $1/lib
 mkdir $1/include 
 mv libgrib2c.a $1/lib/
-cp grib2.h $1/include/
\ No newline at end of file
+cp grib2.h $1/include/
-- 
Gitee


From 42354103c42ba9f9bd57cc7af715728dafa674b0 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Tue, 18 Jul 2023 20:05:31 +0800
Subject: [PATCH 3/9] add g2clib-clang

---
 package/g2clib/1.6.0/clang/install.sh | 18 ++++++++++++++++++
 package/g2clib/1.6.0/install.sh       |  4 +---
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100755 package/g2clib/1.6.0/clang/install.sh

diff --git a/package/g2clib/1.6.0/clang/install.sh b/package/g2clib/1.6.0/clang/install.sh
new file mode 100755
index 0000000..54eb219
--- /dev/null
+++ b/package/g2clib/1.6.0/clang/install.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -x
+set -e
+cd ${JARVIS_DOWNLOAD}
+rm -rf g2clib-image
+git clone https://gitee.com/linruoxuan/g2clib-image.git
+cd ${JARVIS_TMP}
+tar -xvf ${JARVIS_DOWNLOAD}/g2clib-image/g2clib-1.6.0-patch.tar.gz
+cd g2clib-1.6.0-patch
+
+sed -i '22c INC=-I/glade/p/work/haley/dev/external/gnu/4.7.2/include -I${JASPER_PATH}/include -I${LIBPNG_PATH}/include/libpng16' makefile
+sed -i '33c CC=clang' makefile
+sed -i '8c #include "png.h"' dec_png.c
+make all
+mkdir $1/lib
+mkdir $1/include 
+mv libgrib2c.a $1/lib/
+cp grib2.h $1/include/
diff --git a/package/g2clib/1.6.0/install.sh b/package/g2clib/1.6.0/install.sh
index 54eb219..41036a2 100755
--- a/package/g2clib/1.6.0/install.sh
+++ b/package/g2clib/1.6.0/install.sh
@@ -8,9 +8,7 @@ cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/g2clib-image/g2clib-1.6.0-patch.tar.gz
 cd g2clib-1.6.0-patch
 
-sed -i '22c INC=-I/glade/p/work/haley/dev/external/gnu/4.7.2/include -I${JASPER_PATH}/include -I${LIBPNG_PATH}/include/libpng16' makefile
-sed -i '33c CC=clang' makefile
-sed -i '8c #include "png.h"' dec_png.c
+sed -i '22c INC=-I/glade/p/work/haley/dev/external/gnu/4.7.2/include -I${JASPER_PATH}/include' makefile
 make all
 mkdir $1/lib
 mkdir $1/include 
-- 
Gitee


From b06b47e2ea7bd78c5f6cc6683c6227f91dd8dde1 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Thu, 20 Jul 2023 09:53:11 +0800
Subject: [PATCH 4/9] fix hmpi1.3.0

---
 package/hmpi/1.3.0/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/hmpi/1.3.0/install.sh b/package/hmpi/1.3.0/install.sh
index 0a1f847..a3f96d2 100755
--- a/package/hmpi/1.3.0/install.sh
+++ b/package/hmpi/1.3.0/install.sh
@@ -3,8 +3,8 @@ set -x
 set -e
 hmpi_version='1.3.0'
 . ${DOWNLOAD_TOOL} -u https://github.com/openucx/ucx/archive/refs/tags/v1.10.1.tar.gz -f hucx-${hmpi_version}-huawei.tar.gz
-. ${DOWNLOAD_TOOL} -u https://gitee.com/kunpengcompute/xucg/archive/refs/tags/v1.3.0-huawei.tar.gz -f xucg-${hmpi_version}-huawei.tar.gz
-. ${DOWNLOAD_TOOL} -u https://gitee.com/kunpengcompute/hmpi/archive/refs/tags/v1.3.0-huawei.tar.gz -f hmpi-${hmpi_version}-huawei.tar.gz
+. ${DOWNLOAD_TOOL} -u https://gitee.com/chenshaoheng/hmpi_v1.3.0/archive/refs/tags/xucg-v1.3.0.tar.gz -f xucg-${hmpi_version}-huawei.tar.gz
+. ${DOWNLOAD_TOOL} -u https://gitee.com/chenshaoheng/hmpi_v1.3.0/archive/refs/tags/hmpi-v1.3.0.tar.gz -f hmpi-${hmpi_version}-huawei.tar.gz
 cd ${JARVIS_TMP}
 . $CHECK_ROOT && yum install -y perl-Data-Dumper autoconf automake libtool binutils flex
 rm ucx-1.10.1 -rf
-- 
Gitee


From cd58e4daebb8d036a8c3aa8654ce4cbfcff1d2c1 Mon Sep 17 00:00:00 2001
From: chen-shaoheng <2649344332@qq.com>
Date: Thu, 20 Jul 2023 14:31:06 +0800
Subject: [PATCH 5/9] fix hmpi1.3.0

---
 package/hmpi/1.3.0/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/hmpi/1.3.0/install.sh b/package/hmpi/1.3.0/install.sh
index a3f96d2..75e20dd 100755
--- a/package/hmpi/1.3.0/install.sh
+++ b/package/hmpi/1.3.0/install.sh
@@ -3,8 +3,8 @@ set -x
 set -e
 hmpi_version='1.3.0'
 . ${DOWNLOAD_TOOL} -u https://github.com/openucx/ucx/archive/refs/tags/v1.10.1.tar.gz -f hucx-${hmpi_version}-huawei.tar.gz
-. ${DOWNLOAD_TOOL} -u https://gitee.com/chenshaoheng/hmpi_v1.3.0/archive/refs/tags/xucg-v1.3.0.tar.gz -f xucg-${hmpi_version}-huawei.tar.gz
-. ${DOWNLOAD_TOOL} -u https://gitee.com/chenshaoheng/hmpi_v1.3.0/archive/refs/tags/hmpi-v1.3.0.tar.gz -f hmpi-${hmpi_version}-huawei.tar.gz
+. ${DOWNLOAD_TOOL} -u https://github.com/chen-shaoheng/HMPI-1.3.0/archive/refs/tags/xucg-v1.3.0.tar.gz -f xucg-${hmpi_version}-huawei.tar.gz
+. ${DOWNLOAD_TOOL} -u https://github.com/chen-shaoheng/HMPI-1.3.0/archive/refs/tags/hmpi-v1.3.0.tar.gz -f hmpi-${hmpi_version}-huawei.tar.gz
 cd ${JARVIS_TMP}
 . $CHECK_ROOT && yum install -y perl-Data-Dumper autoconf automake libtool binutils flex
 rm ucx-1.10.1 -rf
-- 
Gitee


From 4d592bea6ff63f8ec4f090e2a9074b72695de62f Mon Sep 17 00:00:00 2001
From: chen-shaoheng <2649344332@qq.com>
Date: Mon, 24 Jul 2023 17:34:16 +0800
Subject: [PATCH 6/9] fix hmpi-1.3.0

---
 package/hmpi/1.3.0/install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/hmpi/1.3.0/install.sh b/package/hmpi/1.3.0/install.sh
index 75e20dd..1fa4beb 100755
--- a/package/hmpi/1.3.0/install.sh
+++ b/package/hmpi/1.3.0/install.sh
@@ -11,7 +11,7 @@ rm ucx-1.10.1 -rf
 tar xf ${JARVIS_DOWNLOAD}/hucx-1.3.0-huawei.tar.gz
 cd ucx-1.10.1
 ./autogen.sh
-./contrib/configure-opt --prefix=$1/hucx --disable-numa --enable-mt CC=clang CXX=clang++ FC=flang CFLAGS="-Wno-unused-but-set-variable" CXXFLAGS="-Wno-unused-but-set-variable"
+./contrib/configure-opt --prefix=$1/hucx --disable-numa --enable-mt CC=clang CXX=clang++ FC=flang CFLAGS="-Wno-unused-but-set-variable -Wno-error=int-conversion" CXXFLAGS="-Wno-unused-but-set-variable -Wno-error=int-conversion"
 make -j
 make -j install
 cd -
@@ -19,6 +19,7 @@ export LD_LIBRARY_PATH=$1/hucx/lib:$LD_LIBRARY_PATH
 export C_INCLUDE_PATH=$1/hucx/include:$C_INCLUDE_PATH
 export CPLUS_INCLUDE_PATH=$1/hucx/include:$CPLUS_INCLUDE_PATH
 
+export CFLAGS="-Wno-unused-but-set-variable -Wno-error=int-conversion" CXXFLAGS="-Wno-unused-but-set-variable -Wno-error=int-conversion"
 rm xucg-v1.3.0-huawei/ -rf
 tar xf ${JARVIS_DOWNLOAD}/xucg-1.3.0-huawei.tar.gz
 cd xucg-v1.3.0-huawei/
@@ -35,7 +36,7 @@ rm hmpi-v1.3.0-huawei/ -rf
 tar xf ${JARVIS_DOWNLOAD}/hmpi-1.3.0-huawei.tar.gz
 cd hmpi-v1.3.0-huawei/
 ./autogen.pl
-./configure --prefix=$1 --with-platform=contrib/platform/mellanox/optimized --enable-mpi1-compatibility --with-ucx=$1/hucx --with-ucg=$1/xucg CC=clang CXX=clang++ FC=flang
+./configure --prefix=$1 --with-platform=contrib/platform/mellanox/optimized --enable-mpi1-compatibility --with-ucx=$1/hucx --with-ucg=$1/xucg CC=clang CXX=clang++ FC=flang 
 make -j
 make -j install
 cd -
-- 
Gitee


From 2a2c140614008da0bab21bdbda1a100cb9c03fb7 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Mon, 24 Jul 2023 18:24:36 +0800
Subject: [PATCH 7/9] fix hmpi1.3.0

---
 package/hmpi/1.3.0/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/hmpi/1.3.0/install.sh b/package/hmpi/1.3.0/install.sh
index 1fa4beb..9785ec8 100755
--- a/package/hmpi/1.3.0/install.sh
+++ b/package/hmpi/1.3.0/install.sh
@@ -36,7 +36,7 @@ rm hmpi-v1.3.0-huawei/ -rf
 tar xf ${JARVIS_DOWNLOAD}/hmpi-1.3.0-huawei.tar.gz
 cd hmpi-v1.3.0-huawei/
 ./autogen.pl
-./configure --prefix=$1 --with-platform=contrib/platform/mellanox/optimized --enable-mpi1-compatibility --with-ucx=$1/hucx --with-ucg=$1/xucg CC=clang CXX=clang++ FC=flang 
+./configure --prefix=$1 --with-platform=contrib/platform/mellanox/optimized --enable-mpi1-compatibility --with-ucx=$1/hucx --with-ucg=$1/xucg CC=clang CXX=clang++ FC=flang
 make -j
 make -j install
 cd -
-- 
Gitee


From 91b75f1e9b34ba58daa08ff095067ac231eb39bf Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Mon, 24 Jul 2023 10:34:47 +0000
Subject: [PATCH 8/9] Revert "fix hmpi1.3.0"

This reverts commit cd58e4daebb8d036a8c3aa8654ce4cbfcff1d2c1.
---
 package/hmpi/1.3.0/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/hmpi/1.3.0/install.sh b/package/hmpi/1.3.0/install.sh
index 9785ec8..e0eae74 100755
--- a/package/hmpi/1.3.0/install.sh
+++ b/package/hmpi/1.3.0/install.sh
@@ -3,8 +3,8 @@ set -x
 set -e
 hmpi_version='1.3.0'
 . ${DOWNLOAD_TOOL} -u https://github.com/openucx/ucx/archive/refs/tags/v1.10.1.tar.gz -f hucx-${hmpi_version}-huawei.tar.gz
-. ${DOWNLOAD_TOOL} -u https://github.com/chen-shaoheng/HMPI-1.3.0/archive/refs/tags/xucg-v1.3.0.tar.gz -f xucg-${hmpi_version}-huawei.tar.gz
-. ${DOWNLOAD_TOOL} -u https://github.com/chen-shaoheng/HMPI-1.3.0/archive/refs/tags/hmpi-v1.3.0.tar.gz -f hmpi-${hmpi_version}-huawei.tar.gz
+. ${DOWNLOAD_TOOL} -u https://gitee.com/chenshaoheng/hmpi_v1.3.0/archive/refs/tags/xucg-v1.3.0.tar.gz -f xucg-${hmpi_version}-huawei.tar.gz
+. ${DOWNLOAD_TOOL} -u https://gitee.com/chenshaoheng/hmpi_v1.3.0/archive/refs/tags/hmpi-v1.3.0.tar.gz -f hmpi-${hmpi_version}-huawei.tar.gz
 cd ${JARVIS_TMP}
 . $CHECK_ROOT && yum install -y perl-Data-Dumper autoconf automake libtool binutils flex
 rm ucx-1.10.1 -rf
-- 
Gitee


From 193eace67b942ac71de97d83359b88cfcb45bbb4 Mon Sep 17 00:00:00 2001
From: chenshaoheng <chenshaoheng3@h-partners.com>
Date: Tue, 25 Jul 2023 01:08:41 +0000
Subject: [PATCH 9/9] Revert "fix hmpi-1.3.0"

This reverts commit 4d592bea6ff63f8ec4f090e2a9074b72695de62f.
---
 package/hmpi/1.3.0/install.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/hmpi/1.3.0/install.sh b/package/hmpi/1.3.0/install.sh
index e0eae74..a3f96d2 100755
--- a/package/hmpi/1.3.0/install.sh
+++ b/package/hmpi/1.3.0/install.sh
@@ -11,7 +11,7 @@ rm ucx-1.10.1 -rf
 tar xf ${JARVIS_DOWNLOAD}/hucx-1.3.0-huawei.tar.gz
 cd ucx-1.10.1
 ./autogen.sh
-./contrib/configure-opt --prefix=$1/hucx --disable-numa --enable-mt CC=clang CXX=clang++ FC=flang CFLAGS="-Wno-unused-but-set-variable -Wno-error=int-conversion" CXXFLAGS="-Wno-unused-but-set-variable -Wno-error=int-conversion"
+./contrib/configure-opt --prefix=$1/hucx --disable-numa --enable-mt CC=clang CXX=clang++ FC=flang CFLAGS="-Wno-unused-but-set-variable" CXXFLAGS="-Wno-unused-but-set-variable"
 make -j
 make -j install
 cd -
@@ -19,7 +19,6 @@ export LD_LIBRARY_PATH=$1/hucx/lib:$LD_LIBRARY_PATH
 export C_INCLUDE_PATH=$1/hucx/include:$C_INCLUDE_PATH
 export CPLUS_INCLUDE_PATH=$1/hucx/include:$CPLUS_INCLUDE_PATH
 
-export CFLAGS="-Wno-unused-but-set-variable -Wno-error=int-conversion" CXXFLAGS="-Wno-unused-but-set-variable -Wno-error=int-conversion"
 rm xucg-v1.3.0-huawei/ -rf
 tar xf ${JARVIS_DOWNLOAD}/xucg-1.3.0-huawei.tar.gz
 cd xucg-v1.3.0-huawei/
-- 
Gitee