From nobody Tue Jan 18 21:36:01 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 6B47B1954615; Tue, 18 Jan 2022 21:36:01 +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 4JdhsY2Dybz4TkY; Tue, 18 Jan 2022 21:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642541761; 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=DZ7eR4Futnzbcaa8ZPbudEnffXKOhqXYGiWZZWJDWBQ=; b=ajM9zWJzz39ACto1Vanag34DxFHpIq/DML2uskhr2s/BmVYvpXazr9jFk5CTaQzwMvwwrj Cd1aAckwhQ5s9b0nfeyYsXAA+p4EMKQlPECOTIsIG3eW06ow5FK5vR8zDi47kZxBHfE3pq hunjU45F2jFiPztzMa+NNRw5kNKXZQ86kmWamxDTr1beYI4yO/rIbETwbCh2GmS9aaat5v KiQE4/4gZx68wYC5AVViPrWssFFWIbyzrkE21euIhUeZ2d/t8QIut+W47Eyey/SgE1g5ly Ujt0c11A5SSyArbDKBTPN4bL8B2OBg+GOk9xDWezMZ2030BYRILhOwfkzWEsuw== 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 222CAC3E; Tue, 18 Jan 2022 21:36:01 +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 20ILa15r061890; Tue, 18 Jan 2022 21:36:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ILa1su061889; Tue, 18 Jan 2022 21:36:01 GMT (envelope-from git) Date: Tue, 18 Jan 2022 21:36:01 GMT Message-Id: <202201182136.20ILa1su061889@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: c4f8c598cd74 - main - math/highs: Update g20210408 -> 1.1.1-886 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: c4f8c598cd741c9bc8fff808d4c4bc2935bdc583 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642541761; 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=DZ7eR4Futnzbcaa8ZPbudEnffXKOhqXYGiWZZWJDWBQ=; b=B3jmaxkJm9Mu8dBlIwn3BTj7jlj7bQ9x6ILPpfFYr1LqPVJC8RgA8mAqnhglrmycPGTxVB +nmXT+k4ZBdl9X6H4bjz9ZMrj/NgtVEubFnSgnmTASeVve4hHLN2/HNSQPvbHyHe4p5KtZ wExw8ncrs7pRyeGBOOghQ0Z0K1pghE/wcK/Z0e3Ys9JuWtlsrj/2AhZa9FOGdhIQRC5jOY npi3I4LqGOVNCAlO9i6XL6SVDJKl1+ACYNjqbMPqxGZi5COTA30we9AsvMUgbfFm0dInbX vrOIBZ0fmbo112EzPp19LVKVaLPhpMEnRRqp6Fmfixcs04dkftZIE+A2Is/Bbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642541761; a=rsa-sha256; cv=none; b=dtkMDIi8fuJELg4QjAC7qEorOwMwoFy2GeDjE8HkfJt8oZ7rV+3rpDb0GMgTlOd5Vhbfl2 4jMau/sovynQ+5hhSaczSw/hOiXVBC3VnNh2c3vikyRi6jOdkgIvq/xOr18F4r7pDfCDfB RdHGa0OZaAbjgfCuP7WK7XDm6V1Tfdj9He/HTjRNdgqgI4kx2UFSb8HILEZ9C/DLXHEVHm GlyoUNAlJk/CdhRJIqvYQgGxs/vBm7Aot6yVhOBsrE00DS0t2Xl2+NcGlXGTYtaRmKbL+J Zl4mO9AJ0A3Efup4Gn4Oyf6r/pHF1L9LVMu3Dt28xfk0yKM+tSlmMcXOhQPBEw== 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=c4f8c598cd741c9bc8fff808d4c4bc2935bdc583 commit c4f8c598cd741c9bc8fff808d4c4bc2935bdc583 Author: Yuri Victorovich AuthorDate: 2022-01-18 21:35:10 +0000 Commit: Yuri Victorovich CommitDate: 2022-01-18 21:35:58 +0000 math/highs: Update g20210408 -> 1.1.1-886 Reported by: portscout --- math/highs/Makefile | 9 +-- math/highs/distinfo | 6 +- math/highs/files/patch-CMakeLists.txt | 15 ----- math/highs/files/patch-src_CMakeLists.txt | 22 -------- math/highs/pkg-plist | 91 +++++++++++++++++++++++-------- 5 files changed, 75 insertions(+), 68 deletions(-) diff --git a/math/highs/Makefile b/math/highs/Makefile index fb53a5be7990..86e93ce41b79 100644 --- a/math/highs/Makefile +++ b/math/highs/Makefile @@ -1,6 +1,7 @@ PORTNAME= highs -DISTVERSION= g20210408 -PORTREVISION= 1 +DISTVERSIONPREFIX= v +DISTVERSION= 1.1.1-886 +DISTVERSIONSUFFIX= -g697c7a88 CATEGORIES= math PKGNAMEPREFIX= coin-or- @@ -10,14 +11,14 @@ COMMENT= Solver for large scale sparse linear programming (LP) problems LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libOsi.so:math/osi +#LIB_DEPENDS= libOsi.so:math/osi +CONFLICTS_BUILD= coin-or-Osi # see https://github.com/ERGO-Code/HiGHS/issues/675 USES= blaslapack cmake:testing compiler:c++11-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= ERGO-Code GH_PROJECT= HiGHS -GH_TAGNAME= cfe064e CMAKE_OFF= BUILD_TESTING diff --git a/math/highs/distinfo b/math/highs/distinfo index b7d0319be1e5..4a4446bfd257 100644 --- a/math/highs/distinfo +++ b/math/highs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619992346 -SHA256 (ERGO-Code-HiGHS-g20210408-cfe064e_GH0.tar.gz) = 793a142f6aa3d321cf6571b16900044c2d4a56d920a89ce159d9e6abcef6518e -SIZE (ERGO-Code-HiGHS-g20210408-cfe064e_GH0.tar.gz) = 1449465 +TIMESTAMP = 1642540424 +SHA256 (ERGO-Code-HiGHS-v1.1.1-886-g697c7a88_GH0.tar.gz) = 56a59fcb31b0aac972bf64d78f604a8bb80503afa7f056eef9919dbfe7a01dc3 +SIZE (ERGO-Code-HiGHS-v1.1.1-886-g697c7a88_GH0.tar.gz) = 1763956 diff --git a/math/highs/files/patch-CMakeLists.txt b/math/highs/files/patch-CMakeLists.txt deleted file mode 100644 index f36788057713..000000000000 --- a/math/highs/files/patch-CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -- see https://github.com/ERGO-Code/HiGHS/issues/526 - ---- CMakeLists.txt.orig 2021-06-23 15:29:24 UTC -+++ CMakeLists.txt -@@ -304,7 +304,9 @@ endif() - # Targets - enable_testing() - add_subdirectory(app) --add_subdirectory(check) -+if (BUILD_TESTING) -+ add_subdirectory(check) -+endif() - add_subdirectory(src) - - diff --git a/math/highs/files/patch-src_CMakeLists.txt b/math/highs/files/patch-src_CMakeLists.txt deleted file mode 100644 index 3bf688764f2d..000000000000 --- a/math/highs/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -- workaround for https://github.com/ERGO-Code/HiGHS/issues/503 - ---- src/CMakeLists.txt.orig 2021-05-02 22:26:02 UTC -+++ src/CMakeLists.txt -@@ -329,7 +329,7 @@ if (OSI_FOUND) - configure_file(${HIGHS_SOURCE_DIR}/osi-highs.pc.in - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/osi-highs.pc" @ONLY) - install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/osi-highs.pc" -- DESTINATION lib/pkg-config) -+ DESTINATION libdata/pkgconfig) - endif() - - -@@ -409,7 +409,7 @@ install(EXPORT highs-targets FILE highs-targets.cmake - install(FILES "${HIGHS_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/highs-config.cmake" - DESTINATION lib/cmake/highs) - install(FILES "${HIGHS_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/highs.pc" -- DESTINATION lib/pkg-config) -+ DESTINATION libdata/pkgconfig) - - else() - diff --git a/math/highs/pkg-plist b/math/highs/pkg-plist index 9f4c44b78bfe..1aaa6b1a0003 100644 --- a/math/highs/pkg-plist +++ b/math/highs/pkg-plist @@ -1,7 +1,9 @@ bin/highs +extern/filereaderlp/builder.hpp +extern/filereaderlp/model.hpp +extern/filereaderlp/reader.hpp include/HConfig.h include/Highs.h -include/interfaces/OsiHiGHSSolverInterface.hpp include/interfaces/highs_c_api.h include/io/Filereader.h include/io/FilereaderEms.h @@ -11,82 +13,123 @@ include/io/HMPSIO.h include/io/HMpsFF.h include/io/HighsIO.h include/io/LoadOptions.h -include/ipm/IpxStatus.h include/ipm/IpxWrapper.h +include/libhighs_export.h include/lp_data/HConst.h include/lp_data/HStruct.h include/lp_data/HighsAnalysis.h include/lp_data/HighsDebug.h include/lp_data/HighsInfo.h +include/lp_data/HighsInfoDebug.h include/lp_data/HighsLp.h +include/lp_data/HighsLpSolverObject.h include/lp_data/HighsLpUtils.h -include/lp_data/HighsModelObject.h -include/lp_data/HighsModelObjectUtils.h include/lp_data/HighsModelUtils.h include/lp_data/HighsOptions.h include/lp_data/HighsRanging.h +include/lp_data/HighsRuntimeOptions.h include/lp_data/HighsSolution.h include/lp_data/HighsSolutionDebug.h include/lp_data/HighsSolve.h include/lp_data/HighsStatus.h include/mip/HighsCliqueTable.h +include/mip/HighsConflictPool.h +include/mip/HighsCutGeneration.h include/mip/HighsCutPool.h +include/mip/HighsDebugSol.h include/mip/HighsDomain.h include/mip/HighsDomainChange.h include/mip/HighsDynamicRowMatrix.h +include/mip/HighsGFkSolve.h include/mip/HighsImplications.h +include/mip/HighsLpAggregator.h include/mip/HighsLpRelaxation.h include/mip/HighsMipSolver.h include/mip/HighsMipSolverData.h +include/mip/HighsModkSeparator.h include/mip/HighsNodeQueue.h +include/mip/HighsPathSeparator.h +include/mip/HighsPrimalHeuristics.h include/mip/HighsPseudocost.h +include/mip/HighsRedcostFixing.h include/mip/HighsSearch.h include/mip/HighsSeparation.h -include/mip/HighsSparseVectorSum.h -include/mip/SolveMip.h +include/mip/HighsSeparator.h +include/mip/HighsTableauSeparator.h +include/mip/HighsTransformedLp.h +include/model/HighsHessian.h +include/model/HighsHessianUtils.h +include/model/HighsModel.h +include/parallel/HighsBinarySemaphore.h +include/parallel/HighsCacheAlign.h +include/parallel/HighsMutex.h +include/parallel/HighsParallel.h +include/parallel/HighsSpinMutex.h +include/parallel/HighsSplitDeque.h +include/parallel/HighsTask.h +include/parallel/HighsTaskExecutor.h +include/presolve/HAggregator.h include/presolve/HPreData.h +include/presolve/HPresolve.h +include/presolve/HighsLpPropagator.h +include/presolve/HighsPostsolveStack.h +include/presolve/HighsSymmetry.h +include/presolve/ICrashX.h include/presolve/Presolve.h include/presolve/PresolveAnalysis.h include/presolve/PresolveComponent.h include/presolve/PresolveUtils.h -include/simplex/FactorTimer.h +include/qpsolver/solver.hpp +include/qpsolver/vector.hpp include/simplex/HApp.h -include/simplex/HCrash.h -include/simplex/HDual.h -include/simplex/HDualRHS.h -include/simplex/HDualRow.h -include/simplex/HFactor.h -include/simplex/HFactorDebug.h -include/simplex/HMatrix.h -include/simplex/HPrimal.h -include/simplex/HQPrimal.h +include/simplex/HEkk.h +include/simplex/HEkkDual.h +include/simplex/HEkkDualRHS.h +include/simplex/HEkkDualRow.h +include/simplex/HEkkPrimal.h include/simplex/HSimplex.h include/simplex/HSimplexDebug.h +include/simplex/HSimplexNla.h include/simplex/HSimplexReport.h -include/simplex/HVector.h include/simplex/HighsSimplexAnalysis.h -include/simplex/HighsSimplexInterface.h include/simplex/SimplexConst.h include/simplex/SimplexStruct.h +include/simplex/SimplexTimer.h include/test/DevKkt.h include/test/KktCh2.h +include/util/FactorTimer.h +include/util/HFactor.h +include/util/HFactorConst.h +include/util/HFactorDebug.h +include/util/HSet.h +include/util/HVector.h +include/util/HVectorBase.h +include/util/HighsCDouble.h include/util/HighsComponent.h +include/util/HighsDataStack.h +include/util/HighsDisjointSets.h +include/util/HighsHash.h +include/util/HighsInt.h +include/util/HighsIntegers.h +include/util/HighsLinearSumBounds.h include/util/HighsMatrixPic.h +include/util/HighsMatrixSlice.h +include/util/HighsMatrixUtils.h include/util/HighsRandom.h +include/util/HighsRbTree.h include/util/HighsSort.h +include/util/HighsSparseMatrix.h +include/util/HighsSparseVectorSum.h +include/util/HighsSplay.h include/util/HighsTimer.h include/util/HighsUtils.h include/util/stringutil.h lib/cmake/highs/highs-config.cmake lib/cmake/highs/highs-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/highs/highs-targets.cmake -lib/libOsiHighs.so -lib/libOsiHighs.so.1.0 -lib/libOsiHighs.so.1.0.0 lib/libbasiclu.so lib/libhighs.so -lib/libhighs.so.1.0 -lib/libhighs.so.1.0.0 +lib/libhighs.so.1.1 +lib/libhighs.so.1.1.1 lib/libipx.so libdata/pkgconfig/highs.pc -libdata/pkgconfig/osi-highs.pc