From nobody Sun Jan 12 22:36:48 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YWVcc6SkFz5jy0d; Sun, 12 Jan 2025 22:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YWVcc2qxMz4pq0; Sun, 12 Jan 2025 22:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736721408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wmTMKwFMPDZS48XkTukRANPtVp+5a2sU7cUgS+rdoII=; b=jBCez9u+W32YF8FRqqKHt7+wpafC6/1z8h5K4KvGUHre0h7uK5CAXSTVad8KpPYeSpwhzQ HG2nCS72IVXo52t6HMNotZYQTDFq8qhK0taAayCe5265JI4lbn4ABfZCMXBxuwcTEfl8MN 7y6q7WOXqYVj26GcTACHbJbp74ZvNAGpfxPyT7NszexNyoQhjorYNWaHIEmrCPW1pVQdik fYDP9iLxftM45OXmUtvKyU4BIIUjp4Tlgm+r3DUxyLBa3IQNlxkk9xAMPuBUqfzCUY+Kqj gXtZQf1cbwSxoUDmhiOOeLBe3vUrUVtFLBRt9Pp9XnMF8F9Q7BM/ArB/vBfCSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736721408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wmTMKwFMPDZS48XkTukRANPtVp+5a2sU7cUgS+rdoII=; b=SFJ+74nN9v9gP/8tbP9UZrkTGUSxUwpVSHXErI0RV2yrRO+zVUa0SM88oTbfwAoJDwl27H 517DOmD5M65IFb65fg2OAuLoelldRxPmiDjhchZlLFkxh3XBRTnbJOlIir+z+Jhu8GMpuD y8bxZsyM/apHa+GBgWGG1SxbOPyWnk7PP3lQIPWN1nIuj9X+0M1hBOjy3atgC0kjuLhX7H FNzFaXTXtk091foCqhbz6MuBO6Xbgpvex4gKF3HFD3YTby+QHTvyM4PASuE8cCetX3QKid 39gJBYggProdCu6//7PKXxD+7XlK4iu8mmBqfjr/Vx1LDUNENEbuTyI0z5t+HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736721408; a=rsa-sha256; cv=none; b=qzhttd2CGNRkeWM7FjsrSt/C0zIHuWUgsdD1NbuIB/2D2IjRmDi6PazscaAv4unrzkMs+2 MXd2Uk18waLBrVd6h+BXJNAB8aNRags926T47nVkhlnaTGhywMfUmUNGj0z6Cw+LvusB/i AavF+PxziA5pPFY+k13jmt8GAopkPer7PIDqzKqYRk2wE/s9X+PNQ0li5TBF8XBVdaUmZ4 HEk5q1wcVJV6y1ia9CzIKACmZfeF1RqNofCHE73XDwks6pNq/uHMeqJIWikPfMaDSVuaC4 zguHpxZZ9IfjAiiLp1bCqOwKvNhrIhyEAqqVK2qOBrYP0WeLBVyD17/MX8yl9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YWVcc2NM1z13rc; Sun, 12 Jan 2025 22:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50CMammX093905; Sun, 12 Jan 2025 22:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50CMampS093902; Sun, 12 Jan 2025 22:36:48 GMT (envelope-from git) Date: Sun, 12 Jan 2025 22:36:48 GMT Message-Id: <202501122236.50CMampS093902@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 675b776fd1c9 - main - math/hpipm: update 0.1.3-119 =?utf-8?Q?=E2=86=92?= 0.1.3-225 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 675b776fd1c99f4c78fd8ed978151117949f8e6f Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=675b776fd1c99f4c78fd8ed978151117949f8e6f commit 675b776fd1c99f4c78fd8ed978151117949f8e6f Author: Yuri Victorovich AuthorDate: 2025-01-12 21:34:56 +0000 Commit: Yuri Victorovich 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 @@ -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 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