diff --git a/math/blasfeo/Makefile b/math/blasfeo/Makefile index 8028eef77043..71a54d9fcbc5 100644 --- a/math/blasfeo/Makefile +++ b/math/blasfeo/Makefile @@ -1,49 +1,49 @@ PORTNAME= blasfeo -DISTVERSION= 0.1.4.2 +DISTVERSION= 0.1.4.3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Basic Linear Algebra Subroutines For Embedded Optimization WWW= https://github.com/giaf/blasfeo LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libblas.so:math/blas USES= cmake:testing USE_GITHUB= yes GH_ACCOUNT= giaf LDFLAGS+= -L${LOCALBASE}/lib -lblas CMAKE_ARGS= -DTARGET:STRING=GENERIC CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BLASFEO_EXAMPLES CMAKE_TESTING_ON= BLASFEO_TESTING CMAKE_TESTING_TARGET= OPTIONS_SINGLE= ${OPTIONS_SINGLE_${ARCH}} OPTIONS_SINGLE_amd64= TARGETAMD64 OPTIONS_SINGLE_TARGETAMD64= GENERIC X64_INTEL_HASWELL X64_INTEL_SANDY_BRIDGE X64_INTEL_CORE X64_AMD_BULLDOZER OPTIONS_DEFAULT_amd64= GENERIC # TODO ARM also has SIMD acceleration GENERIC_DESC= Generic C code without SIMD acceleration X64_INTEL_HASWELL_DESC= x86_64 architecture with AVX2 and FMA ISA (64 bit OS) X64_INTEL_SANDY_BRIDGE_DESC= x86_64 architecture with AVX ISA (64 bit OS) X64_INTEL_CORE_DESC= x86_64 architecture with SSE3 (64 bit OS) X64_AMD_BULLDOZER_DESC= x86_64 architecture with AVX and FMA ISA (64 bit OS) X64_INTEL_HASWELL_CMAKE_ON= -DTARGET:STRING=X64_INTEL_HASWELL X64_INTEL_SANDY_BRIDGE_CMAKE_ON= -DTARGET:STRING=X64_INTEL_SANDY_BRIDGE X64_INTEL_CORE_CMAKE_ON= -DTARGET:STRING=X64_INTEL_CORE X64_AMD_BULLDOZER_CMAKE_ON= -DTARGET:STRING=X64_AMD_BULLDOZER post-test: # run tests .for t in test_d_blas_api test_d_blasfeo_api test_s_blas_api test_s_blasfeo_api @${ECHO} "==> Running test ${t}" @cd ${TEST_WRKSRC} && tests/${t} .endfor .include diff --git a/math/blasfeo/distinfo b/math/blasfeo/distinfo index 59d86d6cff99..203e74aa8f09 100644 --- a/math/blasfeo/distinfo +++ b/math/blasfeo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762593265 -SHA256 (giaf-blasfeo-0.1.4.2_GH0.tar.gz) = df990206225095fb97ca1b1a3ebfe34cbc2cea7a8b2643ed3a6deb28a1848aa2 -SIZE (giaf-blasfeo-0.1.4.2_GH0.tar.gz) = 1691353 +TIMESTAMP = 1783348162 +SHA256 (giaf-blasfeo-0.1.4.3_GH0.tar.gz) = 92e33e00be7d2a814ecc982b23bfb86a50b71a168abb9009766801fb957e9046 +SIZE (giaf-blasfeo-0.1.4.3_GH0.tar.gz) = 1698488 diff --git a/math/blasfeo/files/patch-CMakeLists.txt b/math/blasfeo/files/patch-CMakeLists.txt deleted file mode 100644 index e1f7499eb85e..000000000000 --- a/math/blasfeo/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2020-08-13 11:04:25 UTC -+++ CMakeLists.txt -@@ -1117,7 +1117,7 @@ install(TARGETS blasfeo EXPORT blasfeoConfig - RUNTIME DESTINATION bin) - - --install(EXPORT blasfeoConfig DESTINATION cmake) -+install(EXPORT blasfeoConfig DESTINATION lib/cmake) - - file(GLOB_RECURSE BLASFEO_HEADERS "include/*.h") - install(FILES ${BLASFEO_HEADERS} DESTINATION ${BLASFEO_HEADERS_INSTALLATION_DIRECTORY}) diff --git a/math/blasfeo/pkg-plist b/math/blasfeo/pkg-plist index 8c7db9d79f14..544b5b46f6cb 100644 --- a/math/blasfeo/pkg-plist +++ b/math/blasfeo/pkg-plist @@ -1,45 +1,47 @@ include/blasfeo.h include/blasfeo_align.h include/blasfeo_block_size.h include/blasfeo_common.h include/blasfeo_d_aux.h include/blasfeo_d_aux_ext_dep.h include/blasfeo_d_aux_ext_dep_ref.h include/blasfeo_d_aux_old.h include/blasfeo_d_aux_ref.h include/blasfeo_d_aux_test.h include/blasfeo_d_blas.h include/blasfeo_d_blas_api.h include/blasfeo_d_blasfeo_api.h include/blasfeo_d_blasfeo_api_ref.h include/blasfeo_d_blasfeo_hp_api.h include/blasfeo_d_blasfeo_ref_api.h include/blasfeo_d_kernel.h include/blasfeo_i_aux_ext_dep.h include/blasfeo_m_aux.h include/blasfeo_memory.h include/blasfeo_naming.h include/blasfeo_processor_features.h include/blasfeo_s_aux.h include/blasfeo_s_aux_ext_dep.h include/blasfeo_s_aux_ext_dep_ref.h include/blasfeo_s_aux_old.h include/blasfeo_s_aux_ref.h include/blasfeo_s_aux_test.h include/blasfeo_s_blas.h include/blasfeo_s_blas_api.h include/blasfeo_s_blasfeo_api.h include/blasfeo_s_blasfeo_api_ref.h include/blasfeo_s_blasfeo_ref_api.h include/blasfeo_s_kernel.h include/blasfeo_stdlib.h include/blasfeo_target.h include/blasfeo_timing.h include/blasfeo_v_aux_ext_dep.h include/d_blas.h include/d_blas_64.h include/s_blas.h include/s_blas_64.h -lib/cmake/blasfeoConfig-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/blasfeoConfig.cmake lib/libblasfeo.so +lib/libblasfeo.so.0 +lib/libblasfeo.so.0.1.4.2 +share/cmake/blasfeo/blasfeoConfig-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/blasfeo/blasfeoConfig.cmake diff --git a/math/casadi/Makefile b/math/casadi/Makefile index 99fbb719632b..e49dde1bd040 100644 --- a/math/casadi/Makefile +++ b/math/casadi/Makefile @@ -1,81 +1,81 @@ PORTNAME= casadi DISTVERSION= 3.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Symbolic framework for numeric optimization WWW= https://web.casadi.org/ \ https://github.com/casadi/casadi LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libcoinmumps.so:math/coin-or-mumps USES= cmake compiler:c++11-lang pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes CFLAGS+= -fPIC CXXFLAGS+= -fPIC CMAKE_OFF= WITH_DEEPBIND WITH_BUILD_BLASFEO # cmake-3.16: disable build of examples (they are not installed anyways), # and fail due to not setting up the linker environment properly: CMAKE_OFF+= WITH_EXAMPLES OPTIONS_DEFINE= BLASFEO BONMIN CLANG IPOPT LAPACK OPENMP QPOASES THREADS OPTIONS_DEFAULT= BLASFEO BONMIN IPOPT LAPACK QPOASES THREADS OPTIONS_SUB= yes .if exists(/usr/include/omp.h) OPTIONS_DEFAULT+= OPENMP .endif BLASFEO_DESC= Build with BLASFEO BLASFEO_CMAKE_BOOL= WITH_BLASFEO BLASFEO_BUILD_DEPENDS= blasfeo>0:math/blasfeo BONMIN_DESC= Build with Bonmin BONMIN_CMAKE_BOOL= WITH_BONMIN BONMIN_USES= blaslapack:netlib fortran BONMIN_LIB_DEPENDS= libbonmin.so:math/bonmin \ libCbcSolver.so:math/cbc \ libCgl.so:math/cgl \ libClp.so:math/clp \ libcoinasl.so:math/asl \ libCoinUtils.so:math/coinutils \ libipopt.so:math/ipopt \ libnauty.so:math/nauty \ libopenblas.so:math/openblas \ libOsi.so:math/osi CLANG_DESC= Build with clang for JIT CLANG_USES= llvm:16,build,run CLANG_CMAKE_BOOL= WITH_CLANG CLANG_CMAKE_ON= -DLLVM_INSTALL_PREFIX=${LLVM_PREFIX} -DOLD_LLVM=ON CLANG_BROKEN= fails to find clang, see https://github.com/casadi/casadi/issues/3089 IPOPT_DESC= Build with IPopt IPOPT_CMAKE_BOOL= WITH_IPOPT IPOPT_USES= blaslapack:netlib fortran IPOPT_LIB_DEPENDS= libipopt.so:math/ipopt LAPACK_DESC= Build with LAPACK LAPACK_CMAKE_BOOL= WITH_LAPACK LAPACK_USES= blaslapack:openblas OPENMP_CMAKE_BOOL= WITH_OPENMP QPOASES_DESC= Build with qpOASES QPOASES_CMAKE_BOOL= WITH_QPOASES QPOASES_LIB_DEPENDS= libopenblas.so:math/openblas QPOASES_IMPLIES= LAPACK THREADS_CMAKE_BOOL= WITH_THREAD PORTSCOUT= limit:^.*[1-9]\..* # prevent tags like ge2 .include diff --git a/math/hpipm/Makefile b/math/hpipm/Makefile index e4d7c5f14d9a..79bcad933dfb 100644 --- a/math/hpipm/Makefile +++ b/math/hpipm/Makefile @@ -1,40 +1,41 @@ PORTNAME= hpipm DISTVERSION= 0.1.3-225 # new release is promised here: https://github.com/giaf/hpipm/issues/170 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g79008aa CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= High-performance interior-point-method QP solvers WWW= https://github.com/giaf/hpipm LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libblasfeo.so:math/blasfeo USES= cmake:testing localbase USE_GITHUB= yes GH_ACCOUNT= giaf CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= HPIPM_TESTING CMAKE_ARGS= -DHPIPM_BLASFEO_LIB=Shared \ -DTARGET=GENERIC CMAKE_TESTING_ON= HPIPM_TESTING CMAKE_TESTING_TARGET= .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DAVX:BOOL=OFF .endif post-test: # run tests .for t in d_cond d_dense_qp d_ocp_qp d_part_cond d_tree_ocp_qp @${ECHO} "==> Running test ${t}" @cd ${TEST_WRKSRC} && test_problems/${t} .endfor # testcase test_problems/d_dense_qp crashes, see https://github.com/giaf/hpipm/issues/175 .include diff --git a/science/acados/Makefile b/science/acados/Makefile index b3d432daf26f..2674fd41fdbf 100644 --- a/science/acados/Makefile +++ b/science/acados/Makefile @@ -1,44 +1,45 @@ PORTNAME= acados DISTVERSIONPREFIX= v DISTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Fast and embedded solvers for nonlinear optimal control WWW= https://github.com/acados/acados LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libblasfeo.so:math/blasfeo \ libhpipm.so:math/hpipm # math/casadi should be a dependency, but somehow cmake doesn't look for it USES= cmake:testing localbase:ldflags USE_GITHUB= yes USE_LDCONFIG= yes OPTIONS_DEFINE= OSQP OPTIONS_DEFAULT= OSQP OSQP_DESC= Build with OSQP solver OSQP_CMAKE_BOOL= ACADOS_WITH_OSQP OSQP_LIB_DEPENDS= libosqp.so:math/osqp QPOASES_DESC= Build with QPOASES solver QPOASES_CMAKE_BOOL= ACADOS_WITH_QPOASES QPOASES_LIB_DEPENDS= libqpOASES.so:math/qposases QPOASES_BROKEN= error: unknown type name 'namespace' post-patch: # workaround for https://github.com/acados/acados/issues/1413 @${FIND} ${WRKSRC} -name "*.c" -o -name "*.cpp" -o -name "*.h" -o -name "*.hpp" | \ ${XARGS} ${REINPLACE_CMD} -E 's,"osqp/include/,"osqp/,' @${FIND} ${WRKSRC} -name "*.c" -o -name "*.cpp" -o -name "*.h" -o -name "*.hpp" | \ ${XARGS} ${REINPLACE_CMD} \ -E '\ s,"(blasfeo|catch|daqp|hpmpc|hpipm)/include/,",; \ s|qpOASES_e|qpOASES|; \ s|qpOASES/QProblem.h|qpOASES/QProblem.hpp| \ ' .include