Date: Sun, 12 Jan 2025 22:36:48 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 675b776fd1c9 - main - math/hpipm: update 0.1.3-119 =?utf-8?Q?=E2=86=92?= 0.1.3-225 Message-ID: <202501122236.50CMampS093902@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=675b776fd1c99f4c78fd8ed978151117949f8e6f commit 675b776fd1c99f4c78fd8ed978151117949f8e6f Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2025-01-12 21:34:56 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2025-01-12 22:36:39 +0000 math/hpipm: update 0.1.3-119 → 0.1.3-225 --- math/hpipm/Makefile | 21 ++++++++++++++++----- math/hpipm/distinfo | 6 +++--- math/hpipm/files/patch-CMakeLists.txt | 20 ++++++++++---------- math/hpipm/pkg-plist | 1 + 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/math/hpipm/Makefile b/math/hpipm/Makefile index c9d6b2a086ce..e4d7c5f14d9a 100644 --- a/math/hpipm/Makefile +++ b/math/hpipm/Makefile @@ -1,7 +1,6 @@ PORTNAME= hpipm -DISTVERSION= 0.1.3-119 -PORTREVISION= 1 -DISTVERSIONSUFFIX= -gb140f36 +DISTVERSION= 0.1.3-225 # new release is promised here: https://github.com/giaf/hpipm/issues/170 +DISTVERSIONSUFFIX= -g79008aa CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -13,12 +12,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libblasfeo.so:math/blasfeo -USES= cmake localbase +USES= cmake:testing localbase USE_GITHUB= yes GH_ACCOUNT= giaf CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_ARGS= -DHPIPM_BLASFEO_LIB=Shared +CMAKE_OFF= HPIPM_TESTING +CMAKE_ARGS= -DHPIPM_BLASFEO_LIB=Shared \ + -DTARGET=GENERIC +CMAKE_TESTING_ON= HPIPM_TESTING +CMAKE_TESTING_TARGET= .include <bsd.port.pre.mk> @@ -26,4 +29,12 @@ CMAKE_ARGS= -DHPIPM_BLASFEO_LIB=Shared 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 <bsd.port.post.mk> diff --git a/math/hpipm/distinfo b/math/hpipm/distinfo index 1a63a2bcb352..76cd09a87cb5 100644 --- a/math/hpipm/distinfo +++ b/math/hpipm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654881826 -SHA256 (giaf-hpipm-0.1.3-119-gb140f36_GH0.tar.gz) = 3d949267f14738ff78298ac97b1a30d8e3edd98c765446e306dc9669afd432ed -SIZE (giaf-hpipm-0.1.3-119-gb140f36_GH0.tar.gz) = 1707299 +TIMESTAMP = 1736715847 +SHA256 (giaf-hpipm-0.1.3-225-g79008aa_GH0.tar.gz) = c374fceada91396f913eb1d787e1ffeec4c69375ca130d2dbdbef1ae4256ccc9 +SIZE (giaf-hpipm-0.1.3-225-g79008aa_GH0.tar.gz) = 1745545 diff --git a/math/hpipm/files/patch-CMakeLists.txt b/math/hpipm/files/patch-CMakeLists.txt index 3f86ec49de06..8ba6f908c9db 100644 --- a/math/hpipm/files/patch-CMakeLists.txt +++ b/math/hpipm/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2022-06-01 15:00:13 UTC +--- CMakeLists.txt.orig 2024-12-12 09:17:49 UTC +++ CMakeLists.txt -@@ -36,7 +36,7 @@ +@@ -36,7 +36,7 @@ cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11) # installation directory ( has to be before `project()` ) @@ -9,16 +9,16 @@ project(hpipm C) -@@ -92,7 +92,7 @@ endif() - - # BLASFEO Option +@@ -105,7 +105,7 @@ if(NOT TARGET blasfeo) + # BLASFEO option if(NOT TARGET blasfeo) + # manually set BLASFEO installation path - set(BLASFEO_PATH "/opt/blasfeo" CACHE STRING "BLASFEO installation path") + set(BLASFEO_PATH ${CMAKE_INSTALL_PREFIX} CACHE STRING "BLASFEO installation path") + # match BLASFEO library type with HPIPM library type if(BUILD_SHARED_LIBS MATCHES OFF) set(HPIPM_BLASFEO_LIB "Static" CACHE STRING "BLASFEO library link type") - else() -@@ -140,7 +140,7 @@ endif() +@@ -154,7 +154,7 @@ if(${TARGET} MATCHES AVX) if(${TARGET} MATCHES AVX) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTARGET_AVX") if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") @@ -27,7 +27,7 @@ endif() elseif(${TARGET} MATCHES GENERIC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTARGET_GENERIC") -@@ -151,7 +151,7 @@ if(${REF_BLAS} MATCHES 0) +@@ -165,7 +165,7 @@ if(${REF_BLAS} MATCHES OPENBLAS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ") endif(${REF_BLAS} MATCHES 0) if(${REF_BLAS} MATCHES OPENBLAS) @@ -36,7 +36,7 @@ endif(${REF_BLAS} MATCHES OPENBLAS) if(${REF_BLAS} MATCHES BLIS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_BLIS -std=c99") -@@ -160,7 +160,7 @@ if(${REF_BLAS} MATCHES NETLIB) +@@ -174,7 +174,7 @@ if(${REF_BLAS} MATCHES MKL) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_NETLIB") endif(${REF_BLAS} MATCHES NETLIB) if(${REF_BLAS} MATCHES MKL) @@ -45,7 +45,7 @@ endif(${REF_BLAS} MATCHES MKL) if(${REF_BLAS} MATCHES ATLAS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_ATLAS") -@@ -343,7 +343,7 @@ install(TARGETS hpipm EXPORT hpipmConfig +@@ -357,7 +357,7 @@ install(TARGETS hpipm EXPORT hpipmConfig ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) diff --git a/math/hpipm/pkg-plist b/math/hpipm/pkg-plist index 73e83b104c9b..1d0a89507ca6 100644 --- a/math/hpipm/pkg-plist +++ b/math/hpipm/pkg-plist @@ -34,6 +34,7 @@ include/hpipm_d_ocp_qp_kkt.h include/hpipm_d_ocp_qp_red.h include/hpipm_d_ocp_qp_res.h include/hpipm_d_ocp_qp_sol.h +include/hpipm_d_ocp_qp_solver.h include/hpipm_d_ocp_qp_utils.h include/hpipm_d_part_cond.h include/hpipm_d_part_cond_qcqp.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501122236.50CMampS093902>