From bbc009639b1733edf8f16576b14ea7ae8617d32f Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Fri, 17 Nov 2023 14:31:54 +0100 Subject: [PATCH] science/pastix: upgrade to v6.3.1 Changelog at Also use CBLAS and LAPACKE provided by OpenBLAS. --- science/pastix/Makefile | 19 +++++++----- science/pastix/distinfo | 6 ++-- science/pastix/pkg-plist | 62 +++++++++++++++++++++++----------------- 3 files changed, 50 insertions(+), 37 deletions(-) diff --git a/science/pastix/Makefile b/science/pastix/Makefile index 2b1935197e7c0..e0b31dba7f1de 100644 --- a/science/pastix/Makefile +++ b/science/pastix/Makefile @@ -1,5 +1,5 @@ PORTNAME= pastix -PORTVERSION= 6.3.0 +PORTVERSION= 6.3.1 CATEGORIES= science MASTER_SITES= https://gitlab.inria.fr/solverstack/pastix/uploads/${GL_TAG}/ @@ -11,10 +11,9 @@ LICENSE= LGPL3 BUILD_DEPENDS= bash:shells/bash \ ${PYNUMPY} -LIB_DEPENDS= libcblas.so:math/cblas \ - libmetis.so:math/metis \ +LIB_DEPENDS= libmetis.so:math/metis \ + libjulia.so:lang/julia \ libscotch.so:cad/scotch \ - liblapacke.so:math/lapacke \ libhwloc.so:devel/hwloc2 RUN_DEPENDS= bash:shells/bash \ ${PYNUMPY} @@ -29,7 +28,7 @@ USES= cmake blaslapack:openblas fortran pkgconfig python # 14e36c1586c9ba13f938b1a89f51c080d6551392:s \ # 31cd2bbb0d76f2b9fd83011d8f079d97540b0ba8:m #GL_SUBDIR= spm:s cmake_modules/morse_cmake:m -GL_TAG= 87c0b910dce3d81667e760c720e706d1 # tarball with submodules +GL_TAG= ad8f528a3f6c012762e9a903b28315f8 # tarball with submodules LDFLAGS+= -lm CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -37,14 +36,20 @@ CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \ USE_LDCONFIG= yes TEST_TARGET= test +PLIST_SUB= VER=${PORTVERSION} + OPTIONS_DEFINE= EXAMPLES -EX2FIX= example spm/examples spm/wrappers/fortran90 spm/wrappers/python \ - wrappers/fortran90 wrappers/python example/old +EX2FIX= spm/examples spm/wrappers/fortran90 spm/wrappers/python +EX2FIX2= example example/old wrappers/julia wrappers/fortran90 wrappers/python pre-configure: .for ex in ${EX2FIX} ${REINPLACE_CMD} -e 's|DESTINATION examples|DESTINATION ${EXAMPLESDIR}/${ex:C/examples//:C/example//}|' \ ${WRKSRC}/${ex}/CMakeLists.txt .endfor +.for ex in ${EX2FIX2} + ${REINPLACE_CMD} -e 's|share/doc/pastix/examples|share/examples/pastix|' \ + ${WRKSRC}/${ex}/CMakeLists.txt +.endfor .include diff --git a/science/pastix/distinfo b/science/pastix/distinfo index 1af5d7a0b1166..2eae997ae6173 100644 --- a/science/pastix/distinfo +++ b/science/pastix/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690458490 -SHA256 (pastix-6.3.0.tar.gz) = a6bfec32a3279d7b24c5fc05885c6632d177e467f1584707c6fd7c42a8703c3e -SIZE (pastix-6.3.0.tar.gz) = 2052136 +TIMESTAMP = 1700222960 +SHA256 (pastix-6.3.1.tar.gz) = 290464d73b7d43356e4735a29932bf6f23a88e94ec7139ba7744c21e42c52681 +SIZE (pastix-6.3.1.tar.gz) = 2065915 diff --git a/science/pastix/pkg-plist b/science/pastix/pkg-plist index 5f59b335c94b1..7e1d8259c2cd5 100644 --- a/science/pastix/pkg-plist +++ b/science/pastix/pkg-plist @@ -9,6 +9,14 @@ include/pastix/graph.h include/pastix/lapacke.h include/pastix/old_api.h include/pastix/order.h +include/pastix/pastixf.mod +include/pastix/pastixf_bindings.mod +include/pastix/pastixf_enums.mod +include/pastix/pastixf_interfaces.mod +include/pastix/spmf.mod +include/pastix/spmf_bindings.mod +include/pastix/spmf_enums.mod +include/pastix/spmf_interfaces.mod include/pastixf.mod include/pastixf_bindings.mod include/pastixf_enums.mod @@ -45,9 +53,6 @@ lib/cmake/spm/spmTargets.cmake lib/cmake/spm/spmfTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/spm/spmfTargets.cmake lib/julia/PaStiX/Project.toml -lib/julia/PaStiX/examples/schur.jl -lib/julia/PaStiX/examples/simple.jl -lib/julia/PaStiX/examples/step-by-step.jl lib/julia/PaStiX/src/PaStiX.jl lib/julia/PaStiX/src/pastix_enums.jl lib/julia/spm/Project.toml @@ -57,11 +62,11 @@ lib/julia/spm/src/spm.jl lib/julia/spm/src/spm_enums.jl lib/libpastix.so lib/libpastix.so.6.3 -lib/libpastix.so.6.3.0 +lib/libpastix.so.%%VER%% lib/libpastix_kernels.so lib/libpastixf.so lib/libpastixf.so.6 -lib/libpastixf.so.6.3.0 +lib/libpastixf.so.%%VER%% lib/libspm.so lib/libspm.so.1 lib/libspm.so.1.2.0 @@ -88,15 +93,35 @@ libdata/pkgconfig/spmf.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bench_facto.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compress %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compress.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/flaplacian +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/flaplacian.F90 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/fmultidof +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/fmultidof.F90 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/fmultilap +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/fmultilap.F90 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/fsimple +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/fsimple.F90 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/fstep-by-step +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/fstep-by-step.F90 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/test_mt.in +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortran/test_seq.in +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/julia/schur.jl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/julia/simple.jl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/julia/step-by-step.jl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multidof %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multidof.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/old/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/old/old_simple -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/old/old_step-by-step -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/old/simple.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/old/step-by-step.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/old_simple +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/old_step-by-step +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/simple.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old/step-by-step.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/personal %%PORTEXAMPLES%%%%EXAMPLESDIR%%/personal.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/schur.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/schur_obj.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/simple.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/simple_obj.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/python/step-by-step.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/reentrant %%PORTEXAMPLES%%%%EXAMPLESDIR%%/reentrant.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/refinement @@ -130,20 +155,3 @@ libdata/pkgconfig/spmf.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/wrappers/python/spm_scipy.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/step-by-step %%PORTEXAMPLES%%%%EXAMPLESDIR%%/step-by-step.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/flaplacian -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/flaplacian.F90 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/fmultidof -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/fmultidof.F90 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/fmultilap -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/fmultilap.F90 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/fsimple -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/fsimple.F90 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/fstep-by-step -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/fstep-by-step.F90 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/test_mt.in -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/fortran90/test_seq.in -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/python/python/schur.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/python/python/schur_obj.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/python/python/simple.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/python/python/simple_obj.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrappers/python/python/step-by-step.py