diff --git a/dereferencing_fix.patch b/dereferencing_fix.patch deleted file mode 100644 index a1c4ae9cc263db2d12c41c05416e52ab3c7b9108..0000000000000000000000000000000000000000 --- a/dereferencing_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git ga-5.7.2/armci/src/include/armci.h ga-5.7.2/armci/src/include/armci.h -index 62de274f..fa7dfcdf 100644 ---- ga-5.7.2/armci/src/include/armci.h -+++ ga-5.7.2/armci/src/include/armci.h -@@ -374,8 +374,8 @@ extern void ARMCI_SET_AGGREGATE_HANDLE(armci_hdl_t* nb_handle); - - extern void ARMCI_UNSET_AGGREGATE_HANDLE(armci_hdl_t* nb_handle); - --#define ARMCI_INIT_HANDLE(hdl) do {((double *)((hdl)->data))[0]=0; \ -- ((double *)((hdl)->data))[1]=0; }while(0) -+#define ARMCI_INIT_HANDLE(hdl) do {((int *)((hdl)->data))[0]=0; \ -+ ((int *)((hdl)->data))[1]=0; }while(0) - - /* -------------- ARMCI Non-collective memory allocator ------------- */ - typedef struct armci_meminfo_ds { diff --git a/elempatch_test.patch b/elempatch_test.patch deleted file mode 100644 index 4e0b8c47e236d623d31f90c9c15539f035fd6289..0000000000000000000000000000000000000000 --- a/elempatch_test.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -u ga-5.7.2/global/testing/elempatch.c.org ga-5.7.1/global/testing/elempatch.c ---- ga-5.7.2/global/testing/elempatch.c.org 2020-02-17 12:56:51.811130391 -0800 -+++ ga-5.7.2/global/testing/elempatch.c 2020-02-17 14:39:55.394616825 -0800 -@@ -154,8 +154,8 @@ - #define OP_ABS 4 - #define OP_ADD_CONST 5 - #define OP_RECIP 6 --#define OP_STEP_MAX 7 --#define OP_STEP_BOUND_INFO 8 -+/*#define OP_STEP_MAX 7 */ -+/*#define OP_STEP_BOUND_INFO 8*/ - #define MY_TYPE 2002 - - Integer _ga_lo[MAXDIM], _ga_hi[MAXDIM], _ga_work[MAXDIM]; -@@ -1166,6 +1166,7 @@ - } - NGA_Fill_patch (g_n, lo, hi, vresult); - } -+#if 0 - break; - case OP_STEP_MAX: - if (me == 0) -@@ -1189,7 +1190,6 @@ - aresultl = ((long)(GA_ABS(lval2)/GA_ABS(lval))) - resultl; - } - break; -- - case OP_STEP_BOUND_INFO: - if (me == 0) - printf ("Testing GA_Step_bound_info..."); -@@ -1234,6 +1234,7 @@ - GA_Error ("GA_step_bound_info wrong data type.", type); - } - } -+#endif - break; - default: - GA_Error ("test_function: wrong operation.", OP); -@@ -1443,6 +1444,7 @@ - if (type == C_DCPL || type == C_SCPL) { - result = 0; - } else { -+#if 0 - if (OP == OP_STEP_MAX) { - /* Step_max */ - switch (type) -@@ -1555,6 +1557,7 @@ - } - result = result | result2 | result3; - } -+#endif - } - } - if (me == 0) -@@ -1620,7 +1623,7 @@ - - - /* op = 8;*/ -- for (op = 0; op < 9; op++) -+ for (op = 0; op < 7; op++) - { - /*for (d = 1; d < 2; d++)*/ - for (d = 1; d < 4; d++) - diff --git a/ga-c99-1.patch b/ga-c99-1.patch deleted file mode 100644 index 01e387dbb1631ff7d7f8480f9471c42824d2fb62..0000000000000000000000000000000000000000 --- a/ga-c99-1.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fixed essentially the same way upstream via: - -commit 3df34834189ba45a090f1dcba7d71d23f7b11735 -Author: edoapra -Date: Fri Oct 9 13:36:42 2020 -0700 - - fix for clang from Xcode 12 - -diff -up ga-5.7.2/configure.c99 ga-5.7.2/configure ---- ga-5.7.2/configure.c99 2022-12-12 08:23:27.806493737 +0100 -+++ ga-5.7.2/configure 2022-12-12 08:24:00.978163147 +0100 -@@ -23022,6 +23022,8 @@ void fix_f_string_for_c(char *s, int len - } - } - -+void $FSUB(void); -+ - int main(int argc, char **argv) - { - $FSUB(); -diff -up ga-5.7.2/m4/ga_f2c_string.m4.c99 ga-5.7.2/m4/ga_f2c_string.m4 ---- ga-5.7.2/m4/ga_f2c_string.m4.c99 2022-12-12 08:23:44.230330055 +0100 -+++ ga-5.7.2/m4/ga_f2c_string.m4 2022-12-12 08:24:06.457108545 +0100 -@@ -51,6 +51,8 @@ void fix_f_string_for_c(char *s, int len - } - } - -+void $FSUB(void); -+ - int main(int argc, char **argv) - { - $FSUB(); diff --git a/ga-c99-2.patch b/ga-c99-2.patch deleted file mode 100644 index f3ff241e055fd81d7f97713ce6e527dc8af0bdf0..0000000000000000000000000000000000000000 --- a/ga-c99-2.patch +++ /dev/null @@ -1,113 +0,0 @@ -commit b444960c8c993f3f5c51acf37451e418e819d007 -Author: edoapra -Date: Fri Oct 9 15:16:04 2020 -0700 - - more fixes for clang from Xcode 12 - -diff --git comex/src-common/acc.h comex/src-common/acc.h -index 3ef9884d..4d343384 100644 ---- ga-5.7.2/comex/src-common/acc.h -+++ ga-5.7.2/comex/src-common/acc.h -@@ -23,24 +23,24 @@ typedef struct { - #endif - - #if HAVE_BLAS --void sscal(const int *n, const float *a, const float *x, const int *incx); --void dscal(const int *n, const double *a, const double *x, const int *incx); --void saxpy(const int *n, const float *a, const float *x, -- const int *incx, float *y, const int *incy); --void daxpy(const int *n, const double *a, const double *x, -- const int *incX, double *Y, const int *incy); --void caxpy(const int *n, const void *a, const void *x, -- const int *incX, void *Y, const int *incy); --void zaxpy(const int *n, const void *a, const void *x, -- const int *incX, void *Y, const int *incy); --void scopy(const int *n, const float *x, -- const int *incx, float *y, const int *incy); --void dcopy(const int *n, const double *x, -- const int *incx, double *y, const int *incy); --void ccopy(const int *n, const void *x, -- const int *incx, void *y, const int *incy); --void zcopy(const int *n, const void *x, -- const int *incx, void *y, const int *incy); -+void sscal(const BLAS_INT *n, const float *a, const float *x, const BLAS_INT *incx); -+void dscal(const BLAS_INT *n, const double *a, const double *x, const BLAS_INT *incx); -+void BLAS_SAXPY(const BLAS_INT *n, const float *a, const float *x, -+ const BLAS_INT *incx, float *y, const BLAS_INT *incy); -+void BLAS_DAXPY(const BLAS_INT *n, const double *a, const double *x, -+ const BLAS_INT *incX, double *Y, const BLAS_INT *incy); -+void BLAS_CAXPY(const BLAS_INT *n, const void *a, const void *x, -+ const BLAS_INT *incX, void *Y, const BLAS_INT *incy); -+void BLAS_ZAXPY(const BLAS_INT *n, const void *a, const void *x, -+ const BLAS_INT *incX, void *Y, const BLAS_INT *incy); -+void BLAS_SCOPY(const BLAS_INT *n, const float *x, -+ const BLAS_INT *incx, float *y, const BLAS_INT *incy); -+void BLAS_DCOPY(const BLAS_INT *n, const double *x, -+ const BLAS_INT *incx, double *y, const BLAS_INT *incy); -+void BLAS_CCOPY(const BLAS_INT *n, const void *x, -+ const BLAS_INT *incx, void *y, const BLAS_INT *incy); -+void BLAS_ZCOPY(const BLAS_INT *n, const void *x, -+ const BLAS_INT *incx, void *y, const BLAS_INT *incy); - #endif - - #define IADD_SCALE_REG(A,B,C) (A) += (B) * (C) -diff --git global/src/sclstubs.c global/src/sclstubs.c -index 6c932e0a..7665a708 100644 ---- ga-5.7.2/global/src/sclstubs.c -+++ ga-5.7.2/global/src/sclstubs.c -@@ -47,6 +47,7 @@ - void pnga_lu_solve_alt(Integer tran, Integer g_a, Integer g_b) { - #if HAVE_SCALAPACK - # if ENABLE_F77 -+ void gai_lu_solve_alt_(Integer *tran, Integer *g_a, Integer *g_b); - gai_lu_solve_alt_(&tran, &g_a, &g_b); - # else - pnga_error("ga_lu_solve:scalapack interfaced, need configure --enable-f77",0L); -@@ -87,6 +88,7 @@ void pnga_lu_solve(char *tran, Integer g_a, Integer g_b) { - Integer pnga_llt_solve(Integer g_a, Integer g_b) { - #if HAVE_SCALAPACK - # if ENABLE_F77 -+ Integer gai_llt_solve_(Integer *g_a, Integer *g_b); - return gai_llt_solve_(&g_a, &g_b); - # else - pnga_error("ga_lu_solve:scalapack interfaced, need configure --enable-f77",0L); -@@ -104,6 +106,7 @@ Integer pnga_llt_solve(Integer g_a, Integer g_b) { - Integer pnga_solve(Integer g_a, Integer g_b) { - #if HAVE_SCALAPACK - # if ENABLE_F77 -+ Integer gai_solve_(Integer *g_a, Integer *g_b); - return gai_solve_(&g_a, &g_b); - # else - pnga_error("ga_lu_solve:scalapack interfaced, need configure --enable-f77",0L); -@@ -121,6 +124,7 @@ Integer pnga_solve(Integer g_a, Integer g_b) { - Integer pnga_spd_invert(Integer g_a) { - #if HAVE_SCALAPACK - # if ENABLE_F77 -+ Integer gai_spd_invert_(Integer *g_a); - return gai_spd_invert_(&g_a); - # else - pnga_error("ga_lu_solve:scalapack interfaced, need configure --enable-f77",0L); -diff --git tcgmsg/capi.c tcgmsg/capi.c -index 1169d3f6..790e2088 100644 ---- ga-5.7.2/tcgmsg/capi.c -+++ ga-5.7.2/tcgmsg/capi.c -@@ -135,6 +135,7 @@ long tcg_nodeid() - } - - -+long NXTVAL_(long *mproc); - long tcg_nxtval(long mproc) - { - long amproc = mproc; -diff --git tcgmsg/fapi.c tcgmsg/fapi.c -index 9cdf14f5..f9a17316 100644 ---- ga-5.7.2/tcgmsg/fapi.c -+++ ga-5.7.2/tcgmsg/fapi.c -@@ -165,6 +165,7 @@ Integer FATR _NODEID_() - } - - -+long NXTVAL_(long *mproc); - Integer FATR _NXTVAL_(Integer *mproc) - { - long amproc = *mproc; diff --git a/ga.spec b/ga.spec index c945006d35d903c9ecdb9878aeba54291ab7f72c..bdc2805c8f322385372421c90f9ed25e41a41555 100644 --- a/ga.spec +++ b/ga.spec @@ -1,20 +1,19 @@ -ExcludeArch: %{ix86} %define mpich_name mpich -%global blaslib openblas +%global blaslib flexiblas Name: ga -Version: 5.8.2 -Release: 3%{?dist} +Version: 5.9 +Release: 1%{?dist} Summary: Global Arrays Toolkit -License: BSD -Source0: https://github.com/GlobalArrays/ga/releases/download/v%{version}/ga-%{version}.tar.gz +License: LicenseRef-Callaway-BSD +Source: https://github.com/GlobalArrays/ga/releases/download/v%{version}/ga-%{version}.tar.gz URL: http://github.com/GlobalArrays/ga -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le loongarch64 +ExclusiveArch: x86_64 aarch64 riscv64 loongarch64 BuildRequires: openmpi-devel, %{mpich_name}-devel, gcc-c++, gcc-gfortran -BuildRequires: %{blaslib}-devel, openssh-clients, dos2unix +BuildRequires: %{blaslib}-devel, openssh-clients, dos2unix, perl %define ga_desc_base \ The Global Arrays (GA) toolkit provides an efficient and portable \ @@ -47,6 +46,7 @@ BuildRequires: scalapack-%{mpich_name}-devel BuildRequires: %{blaslib}-devel Requires: %{name}-common = %{version} Provides: %{name}-mpich2 = %{version}-%{release} +Obsoletes: %{name}-mpich2 < %{version}-%{release} %description mpich %{ga_desc_base} - Libraries against MPICH. @@ -55,6 +55,7 @@ Summary: Global Arrays Toolkit for MPICH Development Requires: scalapack-%{mpich_name}-devel, %{mpich_name}-devel Requires: %{blaslib}-devel, %{name}-common = %{version}, %{name}-mpich = %{version} Provides: %{name}-mpich2-devel = %{version}-%{release} +Obsoletes: %{name}-mpich2-devel < %{version}-%{release} %description mpich-devel %{ga_desc_base} - Development Software against MPICH. @@ -63,9 +64,12 @@ Summary: Global Arrays Toolkit for MPICH Static Libraries Requires: scalapack-%{mpich_name}-devel, %{mpich_name}-devel Requires: %{blaslib}-devel, %{name}-common = %{version}, %{name}-mpich = %{version} Provides: %{name}-mpich2-static = %{version}-%{release} +Obsoletes: %{name}-mpich2-static < %{version}-%{release} %description mpich-static %{ga_desc_base} - Static Libraries against MPICH. +%post -p /sbin/ldconfig mpich +%postun -p /sbin/ldconfig mpich %package openmpi Summary: Global Arrays Toolkit for OpenMPI @@ -90,6 +94,8 @@ Requires: %{blaslib}-devel, %{name}-common = %{version}, %{name}-openmpi = %{ver %description openmpi-static %{ga_desc_base} - Static Libraries against OpenMPI. +%post -p /sbin/ldconfig openmpi +%postun -p /sbin/ldconfig openmpi %define ga_version %{version} @@ -107,11 +113,11 @@ done %build %define doBuild \ -export LIBS="-lscalapack -l%{blaslib}" ; \ -export CFLAGS="%{optflags} -O1" ; \ -export CXXFLAGS="%{optflags} -O1" ; \ -export FFLAGS="%{optflags} -O1" ; \ -cd %{name}-%{version}-$MPI_COMPILER_NAME ; \ +export LIBS="-lscalapack -l%{blaslib}" && \ +export CFLAGS="%{optflags} -std=gnu17 -O1" && \ +export CXXFLAGS="%{optflags} -O1" && \ +export FFLAGS="%{optflags} -O1" && \ +cd %{name}-%{version}-$MPI_COMPILER_NAME && \ %configure \\\ --bindir=$MPI_BIN \\\ --libdir=$MPI_LIB \\\ @@ -122,8 +128,8 @@ cd %{name}-%{version}-$MPI_COMPILER_NAME ; \ --enable-static \\\ --enable-cxx \\\ --enable-f77 \\\ - $GA_CONFIGURE_OPTIONS ; \ -%{__make} %{?__smp_mflags} ; \ + $GA_CONFIGURE_OPTIONS && \ +%make_build && \ cd .. export MPI_COMPILER_NAME=mpich @@ -140,11 +146,11 @@ export MPI_COMPILER_NAME=openmpi %install %define doInstall \ -cd %{name}-%{version}-$MPI_COMPILER_NAME ; \ -DESTDIR=%{buildroot} make install ; \ +cd %{name}-%{version}-$MPI_COMPILER_NAME && \ +%make_install && \ cd .. -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT export MPI_COMPILER_NAME=mpich %{_mpich_load} %doInstall @@ -157,8 +163,8 @@ export MPI_COMPILER_NAME=openmpi find %{buildroot} -type f -name "*.la" -exec rm -f {} \; -mkdir -p %{buildroot}/%{_sysconfdir}/sysctl.d -echo 'kernel.shmmax = 134217728' > %{buildroot}/%{_sysconfdir}/sysctl.d/armci.conf +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysctl.d +echo 'kernel.shmmax = 134217728' > $RPM_BUILD_ROOT/%{_sysconfdir}/sysctl.d/armci.conf %define do_test 1 %check %if %{?do_test}0 @@ -214,6 +220,10 @@ cd .. %{_libdir}/openmpi/lib/lib*.a %changelog +* Tue Jan 13 2026 bbrucezhang - 5.9-1 +- [Type] sync +- [DESC] Update to 5.9 + * Wed Jun 04 2025 bbrucezhang - 5.8.2-3 - Rebuilt for loongarch64 diff --git a/ga572_version.patch b/ga572_version.patch deleted file mode 100644 index 9c1cc69a42b943ebd16a1f2a40b5ff0c413a369d..0000000000000000000000000000000000000000 --- a/ga572_version.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git ga-5.7.2/configure.ac ga-5.7.2/configure.ac -index 8ac89182..25d21999 100644 ---- ga-5.7.2/configure.ac -+++ ga-5.7.2/configure.ac -@@ -40,7 +40,7 @@ AC_SUBST([PACKAGE_VERSION]) - # ga version 5.7.1: 2:1:1 - # - # libga -version-info current:revision:age --LTVER="2:1:1" -+LTVER="2:2:1" - AC_SUBST([LTVER]) - - ############################################################################### -diff --git ga-5.7.2/global/src/gacommon.h ga-5.7.2/global/src/gacommon.h -index 21180d4f..4b4401d4 100644 ---- ga-5.7.2/global/src/gacommon.h -+++ ga-5.7.2/global/src/gacommon.h -@@ -7,7 +7,7 @@ - - #define GA_VERSION_MAJOR 5 - #define GA_VERSION_MINOR 7 --#define GA_VERSION_PATCH 1 -+#define GA_VERSION_PATCH 2 - - #define C_CHAR MT_C_CHAR - #define C_DBL MT_C_DBL diff --git a/ga_diag_seq.patch b/ga_diag_seq.patch deleted file mode 100644 index 6f6444fc5008031b3da7a0f4cfb8e5c556e2f91b..0000000000000000000000000000000000000000 --- a/ga_diag_seq.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git ga-5.6.5/global/src/ga_diag_seq.F ga-5.6.5/global/src/ga_diag_seq.F -index ee60172..7256665 100644 ---- ga-5.6.5/global/src/ga_diag_seq.F -+++ ga-5.6.5/global/src/ga_diag_seq.F -@@ -1,6 +1,11 @@ - #if HAVE_CONFIG_H - # include "config.fh" - #endif -+#if (BLAS_SIZE ==4) -+#define INTGR4 integer*4 -+#else -+#define INTGR4 integer*8 -+#endif - c - c This file has been converted to use LAPACK circa 2011 - c instead of EISPACK circa 1983 by Jeff Hammond circa 2014. -@@ -15,7 +20,7 @@ c - integer g_v ! Global matrix to return evecs - double precision evals(*) ! Local array to return evals - c -- integer n, ierr -+ integer n - #if ENABLE_EISPACK - integer l_fv1, l_fv2, l_v - MA_ACCESS_INDEX_TYPE k_fv1, k_fv2, k_v -@@ -27,6 +32,7 @@ c - integer l_a, l_s - MA_ACCESS_INDEX_TYPE k_a, k_s - integer dim1, dim2, type, me -+ INTGR4 n4,ierr - logical status - c - c -@@ -47,6 +53,7 @@ c - $ call ga_error('ga_diag_seq: nonsquare matrix ',0) - - n = dim1 -+ n4 = n - me = ga_nodeid() - if (me .eq. 0) then - c -@@ -87,7 +94,7 @@ c - call rsg(n, n, dbl_mb(k_a), dbl_mb(k_s), evals, 1, - $ dbl_mb(k_v), dbl_mb(k_fv1), dbl_mb(k_fv2), ierr) - #else -- call dsygv(1,'V','U',n,dbl_mb(k_a),n,dbl_mb(k_s),n, -+ call dsygv(1,'V','U',n4,dbl_mb(k_a),n,dbl_mb(k_s),n4, - $ evals,dbl_mb(k_wrk),n2, ierr) - if (ierr.ne.0) - $ call ga_error('ga_diag_seq: dsygv failed',ierr) -@@ -139,7 +146,7 @@ c - integer g_v ! Global matrix to return evecs - double precision evals(*) ! Local array to return evals - c -- integer n, ierr -+ integer n - #if ENABLE_EISPACK - integer l_fv1, l_fv2, l_v - MA_ACCESS_INDEX_TYPE k_fv1, k_fv2, k_v -@@ -151,6 +158,7 @@ c - integer l_a - MA_ACCESS_INDEX_TYPE k_a - integer dim1, dim2, type, me -+ INTGR4 n4,n2_i4,ierr - logical status - c - c -@@ -170,6 +178,7 @@ c - $ call ga_error('ga_diag_std_seq: nonsquare matrix ',0) - - n = dim1 -+ n4 = n - me = ga_nodeid() - if (me .eq. 0) then - c -@@ -187,6 +196,7 @@ c - #else - c LAPACK fails for n=1 without this - n2 = max(n*n,3*n-1) -+ n2_i4=n2 - status=status.and.ma_push_get(MT_DBL, n2, - $ 'diag_std_seq:wrk', l_wrk, k_wrk) - #endif -@@ -205,8 +215,8 @@ c - call rs(n, n, dbl_mb(k_a), evals, 1, - $ dbl_mb(k_v), dbl_mb(k_fv1), dbl_mb(k_fv2), ierr) - #else -- call dsyev('V', 'L', n, dbl_mb(k_a), n, -- $ evals, dbl_mb(k_wrk), n2, ierr) -+ call dsyev('V', 'L', n4, dbl_mb(k_a), n4, -+ $ evals, dbl_mb(k_wrk), n2_i4, ierr) - if (ierr.ne.0) - $ call ga_error('ga_diag_std_seq: dsyev failed',ierr) - c We used to copy to preserve code symmetry with EISPACK diff --git a/sources b/sources index 60f65b15059340464a1e5e869c14a928c379d70c..0ede7c2bcc71436f500378864c86561599c4877f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ga-5.8.2.tar.gz) = 034c0c0d87a963cf38a62a821f9d9b8071f237216c485b12d826af666b20e50490e0d8cde4862b7bd49b1596e55f9d57e40a8affc67f7d0795d2096fb064e075 +SHA512 (ga-5.9.tar.gz) = eca95b67588519b0ae3e1c5a2ee65409a01bd9fdb06fb8cf449f207c567cf12eaeb2201e8fd676d08fc310f5f3b996cf18613e7fb43c247d41ea781b3bc27862