From nobody Fri Jun 10 17:57:53 2022 X-Original-To: dev-commits-ports-main@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 176B0838BAD; Fri, 10 Jun 2022 17:57:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LKTFs6yW4z4jHN; Fri, 10 Jun 2022 17:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654883874; 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=A5sGzIUTmRSZ+2kZMEUAFueC0lpOuEe0CMo30pNxqF8=; b=ud305IcVqlhM6XB53TdKuANbhOZBDLgzZBUEwqdD+1epevZ2c+71Vp/g9sojgpCRNtDHDl c/mcfL76/Ejob6ZEZWl9mkar7uUZNQsh/H/66vyCKWVswyyL9nkefjLCJ5Drm97F+1nlYH WopBMmsc2+87A0FcG/pclqVUpbwEwH2QPfTkJdlG1T3sUb3lCMlNJaobO8QVTfsBs9psMF gcr+taukghOqBhxBjBbt+4LF3heAuz0igJA+fTlMGgLjzFsKi2ekj7ACHLW5n2xNVmyQre NAP4SEFGz0kPUUDlNGxBIBaKNMK7cxI86iYHbvGsn4MEZxF/NaAjqmQpu8bqRw== 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 C74F21CE54; Fri, 10 Jun 2022 17:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25AHvrIM058182; Fri, 10 Jun 2022 17:57:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25AHvr3h058181; Fri, 10 Jun 2022 17:57:53 GMT (envelope-from git) Date: Fri, 10 Jun 2022 17:57:53 GMT Message-Id: <202206101757.25AHvr3h058181@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: 9793edf4d3c0 - main - math/hpipm: Update 0.1.1 -> 0.1.3-119 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 9793edf4d3c0a7b81c357325ed5f7aea0c0533ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654883874; 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=A5sGzIUTmRSZ+2kZMEUAFueC0lpOuEe0CMo30pNxqF8=; b=l5BuWPl5bYn4lJXzsn7EX0GhGIZ19UXGbubqgKyNoggxn/PT24YEmXaoj32tKyiQsCG4jT epuuXwJO6OJKMQWDSdGK6nHLzxCuMPasBbj3p2v6XB5F3xl6p1Pet9o7J5RdSWZfkOUPYo q4vue7PAECJsp64mveV+YkoIqNTrzYKakojCBZQcYAqWxBJkBXChMD4QXMgwInP/JiNmhp /S/e6U/yWCYLz3Ax5n9/4n4a+SYw425ujGEe1UcWhIlQo5aqcPfVukhQ31PdSeFVj8vlmD vspiU36s+qFVmUaYx4oQAmwop/dLdnOAQynAsT9o5Bcc8/Hc0AJU5f9Lu22aJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654883874; a=rsa-sha256; cv=none; b=kSgDlzlEQ4yTosrNZcnny5ZrlHX+QWFVvF8AceTID5hku8Sgc1+ESOjKXfWMfdqdt/JesS jaYEBNpnWSMVtDjNB0kjHn3FgEidWCxhvDZQ5SYCLr5U+tozGfU3T2qmb6Ile1MgGkFDfY 2Huti7uhb4i9bEBNreGpAyqyY6mnyQlyNdfh01r3LNXvO8Tyk8X/+IS5XB1NYvfP5s5J5l ckjc2qfdz9C1jFQGp2Ao1Jn7pgFl1lu7w16qq0AV8XTwuQrcWlIjeyld0sHEn7XaFd3LVq 2Xj3WqPq80Nxl+EAREMnFHNh8PdSxN6nNSe07mHqHBOZyFZe9raMWuJh8C2gEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9793edf4d3c0a7b81c357325ed5f7aea0c0533ec commit 9793edf4d3c0a7b81c357325ed5f7aea0c0533ec Author: Yuri Victorovich AuthorDate: 2022-06-10 17:57:26 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-10 17:57:50 +0000 math/hpipm: Update 0.1.1 -> 0.1.3-119 --- math/hpipm/Makefile | 8 +++-- math/hpipm/distinfo | 6 ++-- math/hpipm/files/patch-CMakeLists.txt | 42 ++++++++++++++++++++++-- math/hpipm/pkg-plist | 61 +++++++++++++++++++++++++++++++++-- 4 files changed, 106 insertions(+), 11 deletions(-) diff --git a/math/hpipm/Makefile b/math/hpipm/Makefile index 813bddf15822..a56470ba3e9c 100644 --- a/math/hpipm/Makefile +++ b/math/hpipm/Makefile @@ -1,5 +1,6 @@ PORTNAME= hpipm -DISTVERSION= 0.1.1 +DISTVERSION= 0.1.3-119 +DISTVERSIONSUFFIX= -gb140f36 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -8,12 +9,15 @@ COMMENT= High-performance interior-point-method QP solvers LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= blasfeo>0:math/blasfeo +LIB_DEPENDS= libblasfeo.so:math/blasfeo USES= cmake localbase USE_GITHUB= yes GH_ACCOUNT= giaf +CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_ARGS= -DHPIPM_BLASFEO_LIB=Shared + .include .if ${ARCH} != amd64 && ${ARCH} != i386 diff --git a/math/hpipm/distinfo b/math/hpipm/distinfo index c7d68ae11693..1a63a2bcb352 100644 --- a/math/hpipm/distinfo +++ b/math/hpipm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1578132827 -SHA256 (giaf-hpipm-0.1.1_GH0.tar.gz) = 2e9142ade463159a098f523d1292eb1171dabbf6a2fddfd656d16d132c3eb595 -SIZE (giaf-hpipm-0.1.1_GH0.tar.gz) = 1454957 +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 diff --git a/math/hpipm/files/patch-CMakeLists.txt b/math/hpipm/files/patch-CMakeLists.txt index f79705b6577a..5223658667cb 100644 --- a/math/hpipm/files/patch-CMakeLists.txt +++ b/math/hpipm/files/patch-CMakeLists.txt @@ -1,11 +1,47 @@ ---- CMakeLists.txt.orig 2019-08-24 23:47:04 UTC +--- CMakeLists.txt.orig 2022-06-01 15:00:13 UTC +++ CMakeLists.txt -@@ -228,7 +228,7 @@ install(TARGETS hpipm EXPORT hpipmConfig +@@ -36,7 +36,7 @@ + cmake_minimum_required(VERSION 2.8.11) + + # installation directory ( has to be before `project()` ) +-set(CMAKE_INSTALL_PREFIX "/opt/hpipm" CACHE STRING "Installation path") ++#set(CMAKE_INSTALL_PREFIX "/opt/hpipm" CACHE STRING "Installation path") + + project(hpipm C) + +@@ -92,7 +92,7 @@ endif() + + # BLASFEO Option + if(NOT TARGET blasfeo) +- set(BLASFEO_PATH "/opt/blasfeo" CACHE STRING "BLASFEO installation path") ++ set(BLASFEO_PATH ${CMAKE_INSTALL_PREFIX} CACHE STRING "BLASFEO installation path") + if(BUILD_SHARED_LIBS MATCHES OFF) + set(HPIPM_BLASFEO_LIB "Static" CACHE STRING "BLASFEO library link type") + else() +@@ -151,7 +151,7 @@ if(${REF_BLAS} MATCHES 0) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ") + endif(${REF_BLAS} MATCHES 0) + if(${REF_BLAS} MATCHES OPENBLAS) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_OPENBLAS -I/opt/openblas/include") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_OPENBLAS") + 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) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_NETLIB") + endif(${REF_BLAS} MATCHES NETLIB) + if(${REF_BLAS} MATCHES MKL) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_MKL -m64 -I/opt/intel/mkl/include") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DREF_BLAS_MKL -m64") + 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 ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) -install(EXPORT hpipmConfig DESTINATION cmake) -+install(EXPORT hpipmConfig DESTINATION lib/cmake/hpipm) ++install(EXPORT hpipmConfig DESTINATION lib/cmake) file(GLOB_RECURSE HPIPM_HEADERS "include/*.h") install(FILES ${HPIPM_HEADERS} DESTINATION ${HPIPM_HEADERS_INSTALLATION_DIRECTORY}) diff --git a/math/hpipm/pkg-plist b/math/hpipm/pkg-plist index f35bc2bbd4e3..73e83b104c9b 100644 --- a/math/hpipm/pkg-plist +++ b/math/hpipm/pkg-plist @@ -1,61 +1,116 @@ +include/hpipm_aux_mem.h include/hpipm_aux_string.h include/hpipm_common.h +include/hpipm_d_cast_qcqp.h include/hpipm_d_cond.h include/hpipm_d_cond_aux.h +include/hpipm_d_cond_qcqp.h include/hpipm_d_core_qp_ipm.h include/hpipm_d_core_qp_ipm_aux.h +include/hpipm_d_dense_qcqp.h +include/hpipm_d_dense_qcqp_dim.h +include/hpipm_d_dense_qcqp_ipm.h +include/hpipm_d_dense_qcqp_res.h +include/hpipm_d_dense_qcqp_sol.h +include/hpipm_d_dense_qcqp_utils.h include/hpipm_d_dense_qp.h include/hpipm_d_dense_qp_dim.h include/hpipm_d_dense_qp_ipm.h include/hpipm_d_dense_qp_kkt.h include/hpipm_d_dense_qp_res.h include/hpipm_d_dense_qp_sol.h +include/hpipm_d_dense_qp_utils.h +include/hpipm_d_ocp_qcqp.h +include/hpipm_d_ocp_qcqp_dim.h +include/hpipm_d_ocp_qcqp_ipm.h +include/hpipm_d_ocp_qcqp_red.h +include/hpipm_d_ocp_qcqp_res.h +include/hpipm_d_ocp_qcqp_sol.h +include/hpipm_d_ocp_qcqp_utils.h include/hpipm_d_ocp_qp.h include/hpipm_d_ocp_qp_dim.h include/hpipm_d_ocp_qp_ipm.h 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_utils.h include/hpipm_d_part_cond.h +include/hpipm_d_part_cond_qcqp.h +include/hpipm_d_sim_erk.h +include/hpipm_d_sim_rk.h +include/hpipm_d_tree_ocp_qcqp.h +include/hpipm_d_tree_ocp_qcqp_dim.h +include/hpipm_d_tree_ocp_qcqp_ipm.h +include/hpipm_d_tree_ocp_qcqp_res.h +include/hpipm_d_tree_ocp_qcqp_sol.h +include/hpipm_d_tree_ocp_qcqp_utils.h include/hpipm_d_tree_ocp_qp.h include/hpipm_d_tree_ocp_qp_dim.h include/hpipm_d_tree_ocp_qp_ipm.h include/hpipm_d_tree_ocp_qp_kkt.h include/hpipm_d_tree_ocp_qp_res.h include/hpipm_d_tree_ocp_qp_sol.h +include/hpipm_d_tree_ocp_qp_utils.h include/hpipm_m_dense_qp.h include/hpipm_m_dense_qp_dim.h include/hpipm_m_ocp_qp.h include/hpipm_m_ocp_qp_ipm_hard.h include/hpipm_m_ocp_qp_kkt.h +include/hpipm_s_cast_qcqp.h include/hpipm_s_cond.h include/hpipm_s_cond_aux.h +include/hpipm_s_cond_qcqp.h include/hpipm_s_core_qp_ipm.h include/hpipm_s_core_qp_ipm_aux.h +include/hpipm_s_dense_qcqp.h +include/hpipm_s_dense_qcqp_dim.h +include/hpipm_s_dense_qcqp_ipm.h +include/hpipm_s_dense_qcqp_res.h +include/hpipm_s_dense_qcqp_sol.h +include/hpipm_s_dense_qcqp_utils.h include/hpipm_s_dense_qp.h include/hpipm_s_dense_qp_dim.h include/hpipm_s_dense_qp_ipm.h include/hpipm_s_dense_qp_kkt.h include/hpipm_s_dense_qp_res.h include/hpipm_s_dense_qp_sol.h +include/hpipm_s_dense_qp_utils.h +include/hpipm_s_ocp_qcqp.h +include/hpipm_s_ocp_qcqp_dim.h +include/hpipm_s_ocp_qcqp_ipm.h +include/hpipm_s_ocp_qcqp_red.h +include/hpipm_s_ocp_qcqp_res.h +include/hpipm_s_ocp_qcqp_sol.h +include/hpipm_s_ocp_qcqp_utils.h include/hpipm_s_ocp_qp.h include/hpipm_s_ocp_qp_dim.h include/hpipm_s_ocp_qp_ipm.h include/hpipm_s_ocp_qp_kkt.h +include/hpipm_s_ocp_qp_red.h include/hpipm_s_ocp_qp_res.h include/hpipm_s_ocp_qp_sol.h include/hpipm_s_ocp_qp_utils.h include/hpipm_s_part_cond.h +include/hpipm_s_part_cond_qcqp.h +include/hpipm_s_sim_erk.h +include/hpipm_s_sim_rk.h +include/hpipm_s_tree_ocp_qcqp.h +include/hpipm_s_tree_ocp_qcqp_dim.h +include/hpipm_s_tree_ocp_qcqp_ipm.h +include/hpipm_s_tree_ocp_qcqp_res.h +include/hpipm_s_tree_ocp_qcqp_sol.h +include/hpipm_s_tree_ocp_qcqp_utils.h include/hpipm_s_tree_ocp_qp.h include/hpipm_s_tree_ocp_qp_dim.h include/hpipm_s_tree_ocp_qp_ipm.h include/hpipm_s_tree_ocp_qp_kkt.h include/hpipm_s_tree_ocp_qp_res.h include/hpipm_s_tree_ocp_qp_sol.h +include/hpipm_s_tree_ocp_qp_utils.h include/hpipm_scenario_tree.h include/hpipm_timing.h include/hpipm_tree.h -lib/cmake/hpipm/hpipmConfig-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/hpipm/hpipmConfig.cmake -lib/libhpipm.a +lib/cmake/hpipmConfig-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/hpipmConfig.cmake +lib/libhpipm.so