diff options
Diffstat (limited to 'math')
-rw-r--r-- | math/R-cran-spdep/Makefile | 2 | ||||
-rw-r--r-- | math/R-cran-spdep/distinfo | 6 | ||||
-rw-r--r-- | math/algae/Makefile | 7 | ||||
-rw-r--r-- | math/blacs/Makefile | 4 | ||||
-rw-r--r-- | math/blacs/files/Bmake.inc-mpich.diff | 2 | ||||
-rw-r--r-- | math/blacs/files/patch-SRC_MPI_Bdef.h | 20 | ||||
-rw-r--r-- | math/blacs/files/patch-SRC_MPI_blacs__get__.c | 11 | ||||
-rw-r--r-- | math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c | 15 | ||||
-rw-r--r-- | math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c | 11 | ||||
-rw-r--r-- | math/octave-forge-image/Makefile | 2 | ||||
-rw-r--r-- | math/octave-forge-image/distinfo | 6 | ||||
-rw-r--r-- | math/scalapack/Makefile | 3 | ||||
-rw-r--r-- | math/scalapack/files/patch-BLACS_SRC_Bdef.h | 18 | ||||
-rw-r--r-- | math/scalapack/files/patch-BLACS_SRC_blacs__init__.c | 15 | ||||
-rw-r--r-- | math/scalapack/files/patch-CMakeLists.txt | 10 | ||||
-rw-r--r-- | math/scalapack/files/patch-gridmap | 120 |
16 files changed, 234 insertions, 18 deletions
diff --git a/math/R-cran-spdep/Makefile b/math/R-cran-spdep/Makefile index 37edf97fc657..c078d1c9e9d1 100644 --- a/math/R-cran-spdep/Makefile +++ b/math/R-cran-spdep/Makefile @@ -1,5 +1,5 @@ PORTNAME= spdep -DISTVERSION= 1.3-13 +DISTVERSION= 1.4-1 CATEGORIES= math DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/math/R-cran-spdep/distinfo b/math/R-cran-spdep/distinfo index 7bca8b88f681..2b493d53faea 100644 --- a/math/R-cran-spdep/distinfo +++ b/math/R-cran-spdep/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749634372 -SHA256 (spdep_1.3-13.tar.gz) = 7ac5905c126899f88fdf5c1f2bbedc7609e0c3ca210d40abaa5da2d2a9a2685a -SIZE (spdep_1.3-13.tar.gz) = 4695720 +TIMESTAMP = 1756892699 +SHA256 (spdep_1.4-1.tar.gz) = 4d0beca3b8b696373a74670f916cca3e77cbe97d002f3be62f172815774f5588 +SIZE (spdep_1.4-1.tar.gz) = 4694107 diff --git a/math/algae/Makefile b/math/algae/Makefile index 385a737f6ad6..3042e6816d32 100644 --- a/math/algae/Makefile +++ b/math/algae/Makefile @@ -15,13 +15,12 @@ BROKEN_aarch64= does not build: checking for proper floating point exception ha BROKEN_armv6= does not build: checking for proper floating point exception handling... no BROKEN_armv7= does not build: checking for proper floating point exception handling... no -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -USES= fortran +USES= fortran:gfortran +GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dlmalloc --without-fftw --without-blas \ --without-lapack --without-bcslib --without-npsol -FFLAGS+= -std=legacy +FFLAGS= -std=legacy PLIST_SUB= ALGAE_VERSION=${PORTVERSION} INFO= ${PORTNAME} diff --git a/math/blacs/Makefile b/math/blacs/Makefile index 8e696c89704d..f550f55ff9a4 100644 --- a/math/blacs/Makefile +++ b/math/blacs/Makefile @@ -1,6 +1,6 @@ PORTNAME= blacs PORTVERSION= 1.7 -PORTREVISION= 40 +PORTREVISION= 41 CATEGORIES= math MASTER_SITES= NETLIB/blacs DISTNAME= BLACS @@ -36,7 +36,7 @@ MPICH_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-mpich.diff .include <bsd.port.pre.mk> F77EXTRAFLAGS= #-w -fno-globals -fugly-complex -.if ${GCC_DEFAULT} >= 10 +.if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1) F77EXTRAFLAGS+= -fallow-argument-mismatch .endif diff --git a/math/blacs/files/Bmake.inc-mpich.diff b/math/blacs/files/Bmake.inc-mpich.diff index 5224616e5cc8..3e30b122de6f 100644 --- a/math/blacs/files/Bmake.inc-mpich.diff +++ b/math/blacs/files/Bmake.inc-mpich.diff @@ -35,7 +35,7 @@ MPILIBdir = $(MPIdir)/lib/ MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpich.a -+ MPILIB = -lmpi -lmpifort -pthread ++ MPILIB = -lmpi -lmpifort -pthread -L$(MPILIBdir) # ------------------------------------- # All libraries required by the tester. diff --git a/math/blacs/files/patch-SRC_MPI_Bdef.h b/math/blacs/files/patch-SRC_MPI_Bdef.h index 75a6acbe5696..adcdd43918c2 100644 --- a/math/blacs/files/patch-SRC_MPI_Bdef.h +++ b/math/blacs/files/patch-SRC_MPI_Bdef.h @@ -1,6 +1,22 @@ ---- SRC/MPI/Bdef.h.orig 2020-04-21 20:22:36 UTC +--- SRC/MPI/Bdef.h.orig 1998-03-13 20:14:33 UTC +++ SRC/MPI/Bdef.h -@@ -1605,9 +1605,9 @@ int BI_ContxtNum(); +@@ -322,6 +322,15 @@ int BI_ContxtNum(BLACSCONTEXT *ctxt); + void BI_BlacsWarn(int ConTxt, int line, char *file, char *form, ...); + void BI_BlacsErr(int ConTxt, int line, char *file, char *form, ...); + int BI_ContxtNum(BLACSCONTEXT *ctxt); ++void BI_TransDist(BLACSCONTEXT *ctxt, char scope, int m, int n, int *rA, ++ int *cA, int ldrc, BI_DistType *dist, int rdest, int cdest); ++void BI_dmvcopy(int m, int n, double *A, int lda, double *buff); ++void BI_dvmcopy(int m, int n, double *A, int lda, double *buff); ++void BI_imvcopy(int m, int n, int *A, int lda, int *buff); ++void BI_ivmcopy(int m, int n, int *A, int lda, int *buff); ++void BI_smvcopy(int m, int n, float *A, int lda, float *buff); ++void BI_svmcopy(int m, int n, float *A, int lda, float *buff); ++void Cblacs_pinfo(int *mypnum, int *nprocs); + #else + void BI_BlacsWarn(); + void BI_BlacsErr(); +@@ -1605,9 +1614,9 @@ int BI_ContxtNum(); #else #define BI_MPI_Type_struct(count_, lens_, disps_, types_, newtype_, ierr_) \ { \ diff --git a/math/blacs/files/patch-SRC_MPI_blacs__get__.c b/math/blacs/files/patch-SRC_MPI_blacs__get__.c new file mode 100644 index 000000000000..02f1b33c989e --- /dev/null +++ b/math/blacs/files/patch-SRC_MPI_blacs__get__.c @@ -0,0 +1,11 @@ +--- SRC/MPI/blacs_get_.c.orig 2006-01-18 21:36:03 UTC ++++ SRC/MPI/blacs_get_.c +@@ -12,6 +12,8 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *va + #else + int comm; + #endif ++ void BI_MPI_C_to_f77_trans_comm(MPI_Comm, int *); ++ void BI_MPI_F77_to_c_trans_comm(int F77comm, MPI_Comm *Ccomm); + BLACSCONTEXT *ctxt; + + switch( Mpval(what) ) diff --git a/math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c b/math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c new file mode 100644 index 000000000000..6c102072a27b --- /dev/null +++ b/math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c @@ -0,0 +1,15 @@ +--- SRC/MPI/blacs_gridinit_.c.orig 2006-01-18 21:36:03 UTC ++++ SRC/MPI/blacs_gridinit_.c +@@ -6,7 +6,12 @@ F_VOID_FUNC blacs_gridinit_(int *ConTxt, F_CHAR order, + F_VOID_FUNC blacs_gridinit_(int *ConTxt, F_CHAR order, int *nprow, int *npcol) + #endif + { ++#if (INTFACE == C_CALL) + void Cblacs_gridmap(int *, int *, int, int, int); ++#else ++ F_VOID_FUNC blacs_gridmap_(int *ConTxt, int *usermap, int *ldup, int *nprow0, ++ int *npcol0); ++#endif + int *tmpgrid, *iptr; + int i, j; + diff --git a/math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c b/math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c new file mode 100644 index 000000000000..5d6f5111549a --- /dev/null +++ b/math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c @@ -0,0 +1,11 @@ +--- SRC/MPI/blacs_pinfo_.c.orig 1998-03-13 20:16:27 UTC ++++ SRC/MPI/blacs_pinfo_.c +@@ -1,5 +1,8 @@ + #include "Bdef.h" + ++void bi_f77_init_(void); ++void bi_f77_get_constants_(int*, int*, int*); ++ + #if (INTFACE == C_CALL) + void Cblacs_pinfo(int *mypnum, int *nprocs) + #else diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile index f9abe718eec9..d8000dbcbe8c 100644 --- a/math/octave-forge-image/Makefile +++ b/math/octave-forge-image/Makefile @@ -1,5 +1,5 @@ PORTNAME= octave-forge-image -PORTVERSION= 2.18.0 +PORTVERSION= 2.18.1 CATEGORIES= math MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL} diff --git a/math/octave-forge-image/distinfo b/math/octave-forge-image/distinfo index 5188034df013..c816ce3b8a9a 100644 --- a/math/octave-forge-image/distinfo +++ b/math/octave-forge-image/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755636185 -SHA256 (octave-forge/image-2.18.0.tar.gz) = d87af2b098a03b3fe78d05fe623cff49765f87251c0090769e214bbbc6569a00 -SIZE (octave-forge/image-2.18.0.tar.gz) = 477488 +TIMESTAMP = 1757075144 +SHA256 (octave-forge/image-2.18.1.tar.gz) = d4eed0579782c2efaa0818de2f20f13b276eb3d4b4b3d63347c7317d84e29531 +SIZE (octave-forge/image-2.18.1.tar.gz) = 477118 diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile index 0a5668a213eb..c9020ac6731d 100644 --- a/math/scalapack/Makefile +++ b/math/scalapack/Makefile @@ -1,5 +1,6 @@ PORTNAME= scalapack PORTVERSION= 2.2.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= math @@ -60,7 +61,7 @@ FFLAGS+= ${FPIC} LDFLAGS+= ${MPI_LIBS} SVERSION= ${PORTVERSION:R:R} -.if ${GCC_DEFAULT} >= 10 +.if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1) FFLAGS+= -fallow-argument-mismatch .endif diff --git a/math/scalapack/files/patch-BLACS_SRC_Bdef.h b/math/scalapack/files/patch-BLACS_SRC_Bdef.h new file mode 100644 index 000000000000..7845091f1e18 --- /dev/null +++ b/math/scalapack/files/patch-BLACS_SRC_Bdef.h @@ -0,0 +1,18 @@ +--- BLACS/SRC/Bdef.h.orig 2024-08-06 11:44:11 UTC ++++ BLACS/SRC/Bdef.h +@@ -129,6 +129,15 @@ Int BI_ContxtNum(BLACSCONTEXT *ctxt); + void BI_BlacsWarn(Int ConTxt, Int line, char *file, char *form, ...); + void BI_BlacsErr(Int ConTxt, Int line, char *file, char *form, ...); + Int BI_ContxtNum(BLACSCONTEXT *ctxt); ++void BI_TransDist(BLACSCONTEXT *ctxt, char scope, Int m, Int n, Int *rA, ++ Int *cA, Int ldrc, BI_DistType *dist, Int rdest, Int cdest); ++void BI_dmvcopy(Int m, Int n, double *A, Int lda, double *buff); ++void BI_dvmcopy(Int m, Int n, double *A, Int lda, double *buff); ++void BI_imvcopy(Int m, Int n, Int *A, Int lda, Int *buff); ++void BI_ivmcopy(Int m, Int n, Int *A, Int lda, Int *buff); ++void BI_smvcopy(Int m, Int n, float *A, Int lda, float *buff); ++void BI_svmcopy(Int m, Int n, float *A, Int lda, float *buff); ++void Cblacs_pinfo(Int *mypnum, Int *nprocs); + + /* + * If we've got an ANSI standard C compiler, we can use void pointers... diff --git a/math/scalapack/files/patch-BLACS_SRC_blacs__init__.c b/math/scalapack/files/patch-BLACS_SRC_blacs__init__.c new file mode 100644 index 000000000000..642edde152d9 --- /dev/null +++ b/math/scalapack/files/patch-BLACS_SRC_blacs__init__.c @@ -0,0 +1,15 @@ +--- BLACS/SRC/blacs_init_.c.orig 2024-08-06 11:44:11 UTC ++++ BLACS/SRC/blacs_init_.c +@@ -6,7 +6,12 @@ F_VOID_FUNC blacs_gridinit_(Int *ConTxt, F_CHAR order, + F_VOID_FUNC blacs_gridinit_(Int *ConTxt, F_CHAR order, Int *nprow, Int *npcol) + #endif + { ++#if (INTFACE == C_CALL) + void Cblacs_gridmap(Int *, Int *, Int, Int, Int); ++#else ++ F_VOID_FUNC blacs_gridmap_(Int *ConTxt, Int *usermap, Int *ldup, Int *nprow0, ++ Int *npcol0); ++#endif + Int *tmpgrid, *iptr; + Int i, j; + diff --git a/math/scalapack/files/patch-CMakeLists.txt b/math/scalapack/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..133cf6b18859 --- /dev/null +++ b/math/scalapack/files/patch-CMakeLists.txt @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2025-09-05 14:39:41 UTC ++++ CMakeLists.txt +@@ -239,6 +239,7 @@ if (NOT MSVC) + append_subdir_files(src-C "SRC") + + if (NOT MSVC) ++ set_source_files_properties(TOOLS/SL_gridreshape.c PROPERTIES COMPILE_OPTIONS "-Wno-error=implicit-function-declaration") + add_library(scalapack ${blacs} ${tools} ${tools-C} ${extra_lapack} ${pblas} ${pblas-F} ${ptzblas} ${ptools} ${pbblas} ${redist} ${src} ${src-C}) + set_target_properties(scalapack PROPERTIES + VERSION ${SCALAPACK_VERSION} diff --git a/math/scalapack/files/patch-gridmap b/math/scalapack/files/patch-gridmap new file mode 100644 index 000000000000..f442271f2045 --- /dev/null +++ b/math/scalapack/files/patch-gridmap @@ -0,0 +1,120 @@ +--- REDIST/SRC/pcgemr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/pcgemr.c +@@ -194,6 +194,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- REDIST/SRC/pctrmr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/pctrmr.c +@@ -209,6 +209,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- REDIST/SRC/pdgemr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/pdgemr.c +@@ -191,6 +191,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- REDIST/SRC/pdtrmr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/pdtrmr.c +@@ -206,6 +206,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- REDIST/SRC/pigemr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/pigemr.c +@@ -191,6 +191,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- REDIST/SRC/pitrmr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/pitrmr.c +@@ -206,6 +206,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- REDIST/SRC/psgemr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/psgemr.c +@@ -191,6 +191,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- REDIST/SRC/pstrmr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/pstrmr.c +@@ -206,6 +206,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- REDIST/SRC/pzgemr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/pzgemr.c +@@ -194,6 +194,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- REDIST/SRC/pztrmr.c.orig 2024-08-06 11:44:11 UTC ++++ REDIST/SRC/pztrmr.c +@@ -209,6 +209,7 @@ extern void Cblacs_gridinit(); + extern void Cblacs_pinfo(); + extern void Cblacs_gridinfo(); + extern void Cblacs_gridinit(); ++extern void Cblacs_gridmap(); + extern void Cblacs_exit(); + extern void Cblacs_gridexit(); + extern void Cblacs_setup(); +--- SRC/pcrot.c.orig 2024-08-06 11:44:11 UTC ++++ SRC/pcrot.c +@@ -190,6 +190,7 @@ void pcrot_( Int *n, complex X[], Int *ix, Int *jx, In + F_INTG_FCT pbctrnv_(); + F_INTG_FCT crot_(); + F_INTG_FCT ilcm_(); ++ Int numroc_( Int*, Int*, Int*, Int*, Int* ); + /* .. + * .. Executable Statements .. + * +--- SRC/pzrot.c.orig 2024-08-06 11:44:11 UTC ++++ SRC/pzrot.c +@@ -190,6 +190,7 @@ void pzrot_( Int *n, complex16 X[], Int *ix, Int *jx, + F_INTG_FCT pbztrnv_(); + F_INTG_FCT zrot_(); + F_INTG_FCT ilcm_(); ++ Int numroc_( Int*, Int*, Int*, Int*, Int* ); + /* .. + * .. Executable Statements .. + * |