Page MenuHomeFreeBSD
Differential D13653

math/sundials: Changed to using <opt>_IMPLIES for HYPRE and PETSC options, and removed the .include clause
ClosedPublic
Actions

Authored by yuri on Dec 27 2017, 6:43 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 10, 4:47 PM
Unknown Object (File)
Mon, Mar 10, 2:42 PM
Unknown Object (File)
Mon, Mar 10, 11:14 AM
Unknown Object (File)
Mon, Mar 10, 10:49 AM
Unknown Object (File)
Mon, Mar 10, 4:47 AM
Unknown Object (File)
Feb 26 2025, 7:48 AM
Unknown Object (File)
Feb 20 2025, 5:10 PM
Unknown Object (File)
Feb 20 2025, 5:09 PM
View All 83 Files
Subscribers
mat

Details

Reviewers
tcberner
adamw
Commits
rP457590: math/sundials: Changed to using <opt>_IMPLIES for HYPRE and PETSC options, and…
Summary

<opt>_IMPLIES

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 13884
Build 14093: arc lint + arc unit

Event Timeline

yuri created this revision.Dec 27 2017, 6:43 PM
Herald added a subscriber: mat. · View Herald TranscriptDec 27 2017, 6:43 PM
Harbormaster completed remote builds in B13872: Diff 37102.Dec 27 2017, 6:43 PM
yuri added a comment.Dec 27 2017, 6:45 PM

Jan Beich suggested this change in a follow-up message.

yuri retitled this revision from math/sundials: Changed to using <opt>_IMPLIES for HYPRE and PERSC options, and removed the .include clause to math/sundials: Changed to using <opt>_IMPLIES for HYPRE and PETSC options, and removed the .include clause.Dec 27 2017, 8:57 PM
tcberner requested changes to this revision.Dec 28 2017, 4:24 AM
tcberner added inline comments.
math/sundials/Makefile
60–61

^s/SUPERLU_/SUPERLUMT/g?

This revision now requires changes to proceed.Dec 28 2017, 4:24 AM
yuri updated this revision to Diff 37122.Dec 28 2017, 4:54 AM

Yes, SUPERLUMT options was broken, thanks for noticing!
This is now fixed.

Harbormaster completed remote builds in B13884: Diff 37122.Dec 28 2017, 4:54 AM
yuri marked an inline comment as done.Dec 29 2017, 5:36 PM
tcberner accepted this revision.Dec 29 2017, 11:33 PM
This revision is now accepted and ready to land.Dec 29 2017, 11:33 PM
Closed by commit rP457590: math/sundials: Changed to using <opt>_IMPLIES for HYPRE and PETSC options, and… (authored by yuri). · Explain WhyDec 30 2017, 8:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
math/
sundials/
32 lines
files/
11 lines
9 lines

Diff 37122

View Options

math/sundials/Makefile

# $FreeBSD$ # $FreeBSD$
PORTNAME= sundials PORTNAME= sundials
DISTVERSION= 3.1.0 DISTVERSION= 3.1.0
PORTREVISION= 1
CATEGORIES= math CATEGORIES= math
MASTER_SITES= https://computation.llnl.gov/projects/sundials/download/ MASTER_SITES= https://computation.llnl.gov/projects/sundials/download/
MAINTAINER= yuri@FreeBSD.org MAINTAINER= yuri@FreeBSD.org
COMMENT= SUite of Nonlinear and DIfferential/ALgebraic Equation Solvers COMMENT= SUite of Nonlinear and DIfferential/ALgebraic Equation Solvers
LICENSE= BSD3CLAUSE LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
Show All 21 Lines
BLAS_USES= blaslapack:openblas fortran BLAS_USES= blaslapack:openblas fortran
BLAS_CMAKE_ON= -DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used BLAS_CMAKE_ON= -DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used
EXAMPLES_CMAKE_BOOL= EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90 EXAMPLES_CMAKE_BOOL= EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90
EXAMPLES_CMAKE_ON= -DEXAMPLES_INSTALL_PATH=${EXAMPLESDIR} EXAMPLES_CMAKE_ON= -DEXAMPLES_INSTALL_PATH=${EXAMPLESDIR}
HYPRE_CMAKE_BOOL= HYPRE_ENABLE HYPRE_CMAKE_BOOL= HYPRE_ENABLE
HYPRE_CMAKE_ON= -DHYPRE_INCLUDE_DIR=${LOCALBASE}/include \ HYPRE_CMAKE_ON= -DHYPRE_INCLUDE_DIR=${LOCALBASE}/include \
-DHYPRE_LIBRARY_DIR=${LOCALBASE}/lib \ -DHYPRE_LIBRARY_DIR=${LOCALBASE}/lib
-DMPI_ENABLE:BOOL=ON
HYPRE_LIB_DEPENDS= libHYPRE.so:science/hypre HYPRE_LIB_DEPENDS= libHYPRE.so:science/hypre
HYPRE_IMPLIES= MPI
LAPACK_USES= blaslapack:openblas fortran LAPACK_USES= blaslapack:openblas fortran
LAPACK_CMAKE_BOOL= LAPACK_ENABLE LAPACK_CMAKE_BOOL= LAPACK_ENABLE
LAPACK_CMAKE_ON= -DSUNDIALS_INDEX_TYPE:STRING=int32_t \ LAPACK_CMAKE_ON= -DSUNDIALS_INDEX_TYPE:STRING=int32_t \
-DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used -DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used
MPI_CMAKE_ON= -DMPI_ENABLE:BOOL=ON MPI_CMAKE_ON= -DMPI_ENABLE:BOOL=ON
MPI_LIB_DEPENDS= libmpich.so:net/mpich2
PETSC_CMAKE_BOOL= PETSC_ENABLE PETSC_CMAKE_BOOL= PETSC_ENABLE
PETSC_CMAKE_ON= -DPETSC_INCLUDE_DIR=${LOCALBASE}/include \ PETSC_CMAKE_ON= -DPETSC_INCLUDE_DIR=${LOCALBASE}/include \
-DPETSC_LIBRARY_DIR=${LOCALBASE}/lib \ -DPETSC_LIBRARY_DIR=${LOCALBASE}/lib
-DMPI_ENABLE:BOOL=ON
PETSC_LIB_DEPENDS= libpetsc.so:science/PETSc PETSC_LIB_DEPENDS= libpetsc.so:science/PETSc
PETSC_IMPLIES= MPI
SUPERLU_CMAKE_BOOL= SUPERLUMT_ENABLE SUPERLUMT_CMAKE_BOOL= SUPERLUMT_ENABLE
tcbernerUnsubmitted
Done
Inline Actions

^s/SUPERLU_/SUPERLUMT/g?

tcberner: ^s/SUPERLU_/SUPERLUMT/g?
SUPERLU_CMAKE_ON= -DSUPERLUMT_INCLUDE_DIR=${LOCALBASE}/include/superlu_mt \ SUPERLUMT_CMAKE_ON= -DSUPERLUMT_INCLUDE_DIR=${LOCALBASE}/include/superlu_mt \
-DSUPERLUMT_LIBRARY_DIR=${LOCALBASE}/lib \ -DSUPERLUMT_LIBRARY_DIR=${LOCALBASE}/lib \
-DSUPERLUMT_THREAD_TYPE=Pthread -DSUPERLUMT_THREAD_TYPE=Pthread \
SUPERLUMT_DEPENDS= libsuperlu_mt_PTHREAD.so:math/superlu_mt -DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used
SUPERLUMT_LIB_DEPENDS= libsuperlu_mt_PTHREAD.so:math/superlu_mt
SUPERLUMT_PREVENTS= LAPACK # LAPACK requires SUNDIALS_INDEX_TYPE=int32, and SUPERLUMT requires SUNDIALS_INDEX_TYPE=int64
PORTEXAMPLES= * PORTEXAMPLES= *
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMPI} || ${PORT_OPTIONS:MHYPRE} || ${PORT_OPTIONS:MPETSC}
LIB_DEPENDS+= libmpich.so:net/mpich2
PLIST_FILES= include/nvector/nvector_parallel.h \
include/sundials/sundials_mpi_types.h \
lib/libsundials_nvecparallel.so \
lib/libsundials_nvecparallel.so.${DISTVERSION:R:R} \
lib/libsundials_nvecparallel.so.${DISTVERSION}
.endif
post-install: post-install:
@${RM} ${STAGEDIR}${PREFIX}/LICENSE @${RM} ${STAGEDIR}${PREFIX}/LICENSE
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

math/sundials/files/patch-config_SundialsSuperLUMT.cmake

  • This file was added.
PropertyOld ValueNew Value
fbsd:nokeywordsnullyes
\ No newline at end of property
svn:eol-stylenullnative
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
--- config/SundialsSuperLUMT.cmake.orig 2017-12-28 04:44:39 UTC
+++ config/SundialsSuperLUMT.cmake
@@ -61,7 +61,7 @@ if(SUPERLUMT_LIBRARY AND SUPERLUMT_LIBRA
"}\n")
# Attempt to link the "ltest" executable
- try_compile(LTEST_OK ${SUPERLUMT_TEST_DIR} ${SUPERLUMT_TEST_DIR} ltest OUTPUT_VARIABLE MY_OUTPUT)
+ try_compile(LTEST_OK ${SUPERLUMT_TEST_DIR} ${SUPERLUMT_TEST_DIR} LINK_DIRECTORIES ${FREEBSD_GCC_DIR} ltest OUTPUT_VARIABLE MY_OUTPUT)
# To ensure we do not use stuff from the previous attempts,
# we must remove the CMakeFiles directory.
View Options

math/sundials/pkg-plist

Show All 27 Lines
include/idas/idas_direct.h include/idas/idas_direct.h
include/idas/idas_impl.h include/idas/idas_impl.h
include/idas/idas_spils.h include/idas/idas_spils.h
include/kinsol/kinsol.h include/kinsol/kinsol.h
include/kinsol/kinsol_bbdpre.h include/kinsol/kinsol_bbdpre.h
include/kinsol/kinsol_direct.h include/kinsol/kinsol_direct.h
include/kinsol/kinsol_impl.h include/kinsol/kinsol_impl.h
include/kinsol/kinsol_spils.h include/kinsol/kinsol_spils.h
%%MPI%%include/nvector/nvector_parallel.h
%%HYPRE%%include/nvector/nvector_parhyp.h %%HYPRE%%include/nvector/nvector_parhyp.h
%%PETSC%%include/nvector/nvector_petsc.h %%PETSC%%include/nvector/nvector_petsc.h
include/nvector/nvector_pthreads.h include/nvector/nvector_pthreads.h
include/nvector/nvector_serial.h include/nvector/nvector_serial.h
include/sundials/sundials_band.h include/sundials/sundials_band.h
include/sundials/sundials_config.h include/sundials/sundials_config.h
include/sundials/sundials_dense.h include/sundials/sundials_dense.h
include/sundials/sundials_direct.h include/sundials/sundials_direct.h
include/sundials/sundials_fconfig.h include/sundials/sundials_fconfig.h
include/sundials/sundials_fnvector.h include/sundials/sundials_fnvector.h
include/sundials/sundials_iterative.h include/sundials/sundials_iterative.h
%%LAPACK%%include/sundials/sundials_lapack.h %%LAPACK%%include/sundials/sundials_lapack.h
include/sundials/sundials_linearsolver.h include/sundials/sundials_linearsolver.h
include/sundials/sundials_math.h include/sundials/sundials_math.h
include/sundials/sundials_matrix.h include/sundials/sundials_matrix.h
%%MPI%%include/sundials/sundials_mpi_types.h
include/sundials/sundials_nvector.h include/sundials/sundials_nvector.h
include/sundials/sundials_pcg.h include/sundials/sundials_pcg.h
include/sundials/sundials_sparse.h include/sundials/sundials_sparse.h
include/sundials/sundials_spbcgs.h include/sundials/sundials_spbcgs.h
include/sundials/sundials_spfgmr.h include/sundials/sundials_spfgmr.h
include/sundials/sundials_spgmr.h include/sundials/sundials_spgmr.h
include/sundials/sundials_sptfqmr.h include/sundials/sundials_sptfqmr.h
include/sundials/sundials_types.h include/sundials/sundials_types.h
include/sundials/sundials_version.h include/sundials/sundials_version.h
include/sunlinsol/sunlinsol_band.h include/sunlinsol/sunlinsol_band.h
include/sunlinsol/sunlinsol_dense.h include/sunlinsol/sunlinsol_dense.h
%%LAPACK%%include/sunlinsol/sunlinsol_lapackband.h %%LAPACK%%include/sunlinsol/sunlinsol_lapackband.h
%%LAPACK%%include/sunlinsol/sunlinsol_lapackdense.h %%LAPACK%%include/sunlinsol/sunlinsol_lapackdense.h
include/sunlinsol/sunlinsol_pcg.h include/sunlinsol/sunlinsol_pcg.h
include/sunlinsol/sunlinsol_spbcgs.h include/sunlinsol/sunlinsol_spbcgs.h
include/sunlinsol/sunlinsol_spfgmr.h include/sunlinsol/sunlinsol_spfgmr.h
include/sunlinsol/sunlinsol_spgmr.h include/sunlinsol/sunlinsol_spgmr.h
include/sunlinsol/sunlinsol_sptfqmr.h include/sunlinsol/sunlinsol_sptfqmr.h
%%SUPERLUMT%%include/sunlinsol/sunlinsol_superlumt.h
include/sunmatrix/sunmatrix_band.h include/sunmatrix/sunmatrix_band.h
include/sunmatrix/sunmatrix_dense.h include/sunmatrix/sunmatrix_dense.h
include/sunmatrix/sunmatrix_sparse.h include/sunmatrix/sunmatrix_sparse.h
lib/libsundials_arkode.so lib/libsundials_arkode.so
lib/libsundials_arkode.so.%%SHLY1%% lib/libsundials_arkode.so.%%SHLY1%%
lib/libsundials_arkode.so.%%SHLY3%% lib/libsundials_arkode.so.%%SHLY3%%
lib/libsundials_cvode.so lib/libsundials_cvode.so
lib/libsundials_cvode.so.%%SHL1%% lib/libsundials_cvode.so.%%SHL1%%
lib/libsundials_cvode.so.%%SHL3%% lib/libsundials_cvode.so.%%SHL3%%
lib/libsundials_cvodes.so lib/libsundials_cvodes.so
lib/libsundials_cvodes.so.%%SHL1%% lib/libsundials_cvodes.so.%%SHL1%%
lib/libsundials_cvodes.so.%%SHL3%% lib/libsundials_cvodes.so.%%SHL3%%
lib/libsundials_ida.so lib/libsundials_ida.so
lib/libsundials_ida.so.%%SHL1%% lib/libsundials_ida.so.%%SHL1%%
lib/libsundials_ida.so.%%SHL3%% lib/libsundials_ida.so.%%SHL3%%
lib/libsundials_idas.so lib/libsundials_idas.so
lib/libsundials_idas.so.%%SHLY1%% lib/libsundials_idas.so.%%SHLY1%%
lib/libsundials_idas.so.%%SHLY3%% lib/libsundials_idas.so.%%SHLY3%%
lib/libsundials_kinsol.so lib/libsundials_kinsol.so
lib/libsundials_kinsol.so.%%SHL1%% lib/libsundials_kinsol.so.%%SHL1%%
lib/libsundials_kinsol.so.%%SHL3%% lib/libsundials_kinsol.so.%%SHL3%%
%%MPI%%lib/libsundials_nvecparallel.so
%%MPI%%lib/libsundials_nvecparallel.so.%%SHL1%%
%%MPI%%lib/libsundials_nvecparallel.so.%%SHL3%%
%%HYPRE%%lib/libsundials_nvecparhyp.so %%HYPRE%%lib/libsundials_nvecparhyp.so
%%HYPRE%%lib/libsundials_nvecparhyp.so.%%SHL1%% %%HYPRE%%lib/libsundials_nvecparhyp.so.%%SHL1%%
%%HYPRE%%lib/libsundials_nvecparhyp.so.%%SHL3%% %%HYPRE%%lib/libsundials_nvecparhyp.so.%%SHL3%%
%%PETSC%%lib/libsundials_nvecpetsc.so %%PETSC%%lib/libsundials_nvecpetsc.so
%%PETSC%%lib/libsundials_nvecpetsc.so.%%SHL1%% %%PETSC%%lib/libsundials_nvecpetsc.so.%%SHL1%%
%%PETSC%%lib/libsundials_nvecpetsc.so.%%SHL3%% %%PETSC%%lib/libsundials_nvecpetsc.so.%%SHL3%%
lib/libsundials_nvecpthreads.so lib/libsundials_nvecpthreads.so
lib/libsundials_nvecpthreads.so.%%SHL1%% lib/libsundials_nvecpthreads.so.%%SHL1%%
Show All 23 Lines
lib/libsundials_sunlinsolspfgmr.so.%%SHLX1%% lib/libsundials_sunlinsolspfgmr.so.%%SHLX1%%
lib/libsundials_sunlinsolspfgmr.so.%%SHLX3%% lib/libsundials_sunlinsolspfgmr.so.%%SHLX3%%
lib/libsundials_sunlinsolspgmr.so lib/libsundials_sunlinsolspgmr.so
lib/libsundials_sunlinsolspgmr.so.%%SHLX1%% lib/libsundials_sunlinsolspgmr.so.%%SHLX1%%
lib/libsundials_sunlinsolspgmr.so.%%SHLX3%% lib/libsundials_sunlinsolspgmr.so.%%SHLX3%%
lib/libsundials_sunlinsolsptfqmr.so lib/libsundials_sunlinsolsptfqmr.so
lib/libsundials_sunlinsolsptfqmr.so.%%SHLX1%% lib/libsundials_sunlinsolsptfqmr.so.%%SHLX1%%
lib/libsundials_sunlinsolsptfqmr.so.%%SHLX3%% lib/libsundials_sunlinsolsptfqmr.so.%%SHLX3%%
%%SUPERLUMT%%lib/libsundials_sunlinsolsuperlumt.so
%%SUPERLUMT%%lib/libsundials_sunlinsolsuperlumt.so.%%SHLX1%%
%%SUPERLUMT%%lib/libsundials_sunlinsolsuperlumt.so.%%SHLX3%%
lib/libsundials_sunmatrixband.so lib/libsundials_sunmatrixband.so
lib/libsundials_sunmatrixband.so.%%SHLX1%% lib/libsundials_sunmatrixband.so.%%SHLX1%%
lib/libsundials_sunmatrixband.so.%%SHLX3%% lib/libsundials_sunmatrixband.so.%%SHLX3%%
lib/libsundials_sunmatrixdense.so lib/libsundials_sunmatrixdense.so
lib/libsundials_sunmatrixdense.so.%%SHLX1%% lib/libsundials_sunmatrixdense.so.%%SHLX1%%
lib/libsundials_sunmatrixdense.so.%%SHLX3%% lib/libsundials_sunmatrixdense.so.%%SHLX3%%
lib/libsundials_sunmatrixsparse.so lib/libsundials_sunmatrixsparse.so
lib/libsundials_sunmatrixsparse.so.%%SHLX1%% lib/libsundials_sunmatrixsparse.so.%%SHLX1%%
lib/libsundials_sunmatrixsparse.so.%%SHLX3%% lib/libsundials_sunmatrixsparse.so.%%SHLX3%%