Attachment 206401 Details for Bug 220232 – Update to version 1.17.3

[patch] Update to version 1.17.3

math-clp.diff (text/plain), 12.45 KB, created by Pedro F. Giffuni on 2019-08-09 17:02:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2019-08-09 17:02:24 UTC

Size: 12.45 KB

patch

obsolete

>Index: math/clp/Makefile
>===================================================================
>--- math/clp/Makefile	(revision 508456)
>+++ math/clp/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	Clp
>-PORTVERSION=	1.16.10
>-PORTREVISION=	8
>+PORTVERSION=	1.17.3
> CATEGORIES=	math
> MASTER_SITES=	http://www.coin-or.org/download/source/${PORTNAME}/ \
> 		http://www.mavetju.org/download/adopted/
>@@ -12,24 +11,39 @@
> COMMENT=	Linear Programming Solver
> 
> LICENSE=	EPL
>+LICENSE_FILE=	${WRKSRC}/Clp/LICENSE
> 
>-USES=		blaslapack compiler:c++11-lang fortran libtool pathfix tar:tgz
>+BROKEN_powerpc64=	fails to compile: CoinSignal.hpp: ISO C++ forbids declaration of '__decltype' with no type
>+
>+USES=		fortran blaslapack libtool pathfix pkgconfig tar:tgz localbase
> CXXFLAGS+=	-ffast-math
> 
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>+
>+CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib"	\
>+		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" 	\
>+		--datadir=${DATADIR}
>+
> TEST_TARGET=	unitTest
> TEST_WRKSRC=	${WRKSRC}/${PORTNAME}
> 
>-CONFIGURE_ARGS=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
>-		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
>-		--datadir=${DATADIR}
>-
>-OPTIONS_DEFINE=	DEBUG DOCS
>+OPTIONS_DEFINE=	DEBUG DOCS GLPK
> PORTDOCS=	*
> 
> DEBUG_CXXFLAGS=	-fomit-frame-pointer
> 
>+GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
>+GLPK_CONFIGURE_ON=	--with-gmpl-incdir=${LOCALBASE}/include	\
>+ 			--with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
>+GLPK_CONFIGURE_OFF=	--disable-glpk-libcheck
>+
>+MUMPS_CONFIGURE_ENV=	CC=${LOCALBASE}/bin/mpicc CXX=${LOCALBASE}/bin/mpicxx
>+MUMPS_LIB_DEPENDS=	libmpich.so.8:net/mpich2	\
>+			libmumps_common.so:math/mumps-mpich
>+MUMPS_CONFIGURE_ON=	--with-mumps-incdir=${LOCALBASE}/include	\
>+ 			--with-mumps-lib="-L${LOCALBASE}/lib -lmumps"
>+
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
> 
>Index: math/clp/distinfo
>===================================================================
>--- math/clp/distinfo	(revision 508456)
>+++ math/clp/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1475286033
>-SHA256 (Clp-1.16.10.tgz) = 5cd880f2afcffd79d223fb8b0a448119600a3edee98409c7e989f3246d2f3acd
>-SIZE (Clp-1.16.10.tgz) = 9968182
>+TIMESTAMP = 1565368947
>+SHA256 (Clp-1.17.3.tgz) = a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573
>+SIZE (Clp-1.17.3.tgz) = 9983267
>Index: math/clp/files/patch-Clp_src_AbcSimplex.cpp
>===================================================================
>--- math/clp/files/patch-Clp_src_AbcSimplex.cpp	(revision 508456)
>+++ math/clp/files/patch-Clp_src_AbcSimplex.cpp	(nonexistent)
>@@ -1,66 +0,0 @@
>---- Clp/src/AbcSimplex.cpp.orig	2018-04-16 06:55:57 UTC
>-+++ Clp/src/AbcSimplex.cpp
>-@@ -368,19 +368,19 @@ AbcSimplex::gutsOfInitialize(int numberR
>-     // say Steepest pricing
>-     abcDualRowPivot_ = new AbcDualRowSteepest();
>-     abcPrimalColumnPivot_ = new AbcPrimalColumnSteepest();
>--    internalStatus_ = newArray(reinterpret_cast<unsigned char *>(NULL),
>-+    internalStatus_ = newArray(nullptr,
>- 			       sizeArray+maximumNumberTotal_);
>--    abcLower_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--    abcUpper_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--    abcCost_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+maximumNumberTotal_);
>--    abcDj_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--    abcSolution_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+maximumNumberTotal_);
>--    //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
>--    //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
>--    scaleFromExternal_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--    offset_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--    abcPerturbation_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--    abcPivotVariable_ = newArray(reinterpret_cast<int *>(NULL),maximumAbcNumberRows_);
>-+    abcLower_ = newArray(nullptr,sizeArray);
>-+    abcUpper_ = newArray(nullptr,sizeArray);
>-+    abcCost_ = newArray(nullptr,sizeArray+maximumNumberTotal_);
>-+    abcDj_ = newArray(nullptr,sizeArray);
>-+    abcSolution_ = newArray(nullptr,sizeArray+maximumNumberTotal_);
>-+    //fromExternal_ = newArray(nullptr,sizeArray);
>-+    //toExternal_ = newArray(nullptr,sizeArray);
>-+    scaleFromExternal_ = newArray(nullptr,sizeArray);
>-+    offset_ = newArray(nullptr,sizeArray);
>-+    abcPerturbation_ = newArray(nullptr,sizeArray);
>-+    abcPivotVariable_ = newArray(nullptr,maximumAbcNumberRows_);
>-     // Fill perturbation array
>-     setupPointers(maximumAbcNumberRows_,maximumAbcNumberColumns_);
>-     fillPerturbation(0,maximumNumberTotal_);
>-@@ -554,19 +554,19 @@ AbcSimplex::createSubProblem(int numberC
>-   subProblem->maximumNumberTotal_= maximumAbcNumberRows_+numberColumns;
>-   subProblem->numberTotalWithoutFixed_= subProblem->numberTotal_;
>-   int sizeArray=2*subProblem->maximumNumberTotal_+maximumAbcNumberRows_;
>--  subProblem->internalStatus_ = newArray(reinterpret_cast<unsigned char *>(NULL),
>-+  subProblem->internalStatus_ = newArray(nullptr,
>- 					 sizeArray+subProblem->maximumNumberTotal_);
>--  subProblem->abcLower_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--  subProblem->abcUpper_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--  subProblem->abcCost_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+subProblem->maximumNumberTotal_);
>--  subProblem->abcDj_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--  subProblem->abcSolution_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+subProblem->maximumNumberTotal_);
>--  //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
>--  //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
>--  subProblem->scaleFromExternal_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--  subProblem->offset_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--  subProblem->abcPerturbation_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
>--  subProblem->abcPivotVariable_ = newArray(reinterpret_cast<int *>(NULL),maximumAbcNumberRows_);
>-+  subProblem->abcLower_ = newArray(nullptr,sizeArray);
>-+  subProblem->abcUpper_ = newArray(nullptr,sizeArray);
>-+  subProblem->abcCost_ = newArray(nullptr,sizeArray+subProblem->maximumNumberTotal_);
>-+  subProblem->abcDj_ = newArray(nullptr,sizeArray);
>-+  subProblem->abcSolution_ = newArray(nullptr,sizeArray+subProblem->maximumNumberTotal_);
>-+  //fromExternal_ = newArray(nullptr,sizeArray);
>-+  //toExternal_ = newArray(nullptr,sizeArray);
>-+  subProblem->scaleFromExternal_ = newArray(nullptr,sizeArray);
>-+  subProblem->offset_ = newArray(nullptr,sizeArray);
>-+  subProblem->abcPerturbation_ = newArray(nullptr,sizeArray);
>-+  subProblem->abcPivotVariable_ = newArray(nullptr,maximumAbcNumberRows_);
>-   subProblem->setupPointers(maximumAbcNumberRows_,numberColumns);
>-   // could use arrays - but for now be safe
>-   int * backward = new int [numberFullColumns+numberRows_];
>
>Property changes on: math/clp/files/patch-Clp_src_AbcSimplex.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: math/clp/files/patch-Clp_src_ClpModel.cpp
>===================================================================
>--- math/clp/files/patch-Clp_src_ClpModel.cpp	(revision 508456)
>+++ math/clp/files/patch-Clp_src_ClpModel.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- Clp/src/ClpModel.cpp.orig	2018-04-16 06:43:28 UTC
>-+++ Clp/src/ClpModel.cpp
>-@@ -3845,7 +3845,7 @@ ClpModel::writeMps(const char *filename,
>-      writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX,
>-                        getColLower(), getColUpper(),
>-                        objective,
>--                       reinterpret_cast<const char*> (NULL) /*integrality*/,
>-+                       nullptr /*integrality*/,
>-                        getRowLower(), getRowUpper(),
>-                        columnNames, rowNames);
>-      // Pass in array saying if each variable integer
>
>Property changes on: math/clp/files/patch-Clp_src_ClpModel.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: math/clp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp
>===================================================================
>--- math/clp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp	(revision 508456)
>+++ math/clp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- Clp/src/OsiClp/OsiClpSolverInterface.cpp.orig	2018-04-16 06:57:00 UTC
>-+++ Clp/src/OsiClp/OsiClpSolverInterface.cpp
>-@@ -1448,7 +1448,7 @@ OsiClpSolverInterface::setupForRepeatedU
>-   if (stopPrinting) {
>-     CoinMessages * messagesPointer = modelPtr_->messagesPointer();
>-     // won't even build messages 
>--    messagesPointer->setDetailMessages(100,10000,reinterpret_cast<int *> (NULL));
>-+    messagesPointer->setDetailMessages(100,10000,nullptr);
>-   }
>- #endif
>- }
>
>Property changes on: math/clp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: math/clp/files/patch-Osi_test_OsiTestSolverInterfaceIO.cpp
>===================================================================
>--- math/clp/files/patch-Osi_test_OsiTestSolverInterfaceIO.cpp	(revision 508456)
>+++ math/clp/files/patch-Osi_test_OsiTestSolverInterfaceIO.cpp	(nonexistent)
>@@ -1,16 +0,0 @@
>---- Osi/test/OsiTestSolverInterfaceIO.cpp.orig	2018-04-16 06:54:20 UTC
>-+++ Osi/test/OsiTestSolverInterfaceIO.cpp
>-@@ -422,10 +422,10 @@ OsiTestSolverInterface::writeMps(const c
>-    writer.setMpsData(*getMatrixByCol(), getInfinity(),
>- 		     getColLower(), getColUpper(),
>- 		     getObjCoefficients(), 
>--		     reinterpret_cast<const char *> (NULL) /*integrality*/,
>-+		     nullptr /*integrality*/,
>- 		     getRowLower(), getRowUpper(),
>--		     reinterpret_cast<const char **> (NULL) /*colnam*/, 
>--		     reinterpret_cast<const char **> (NULL) /*rownam*/);
>-+		     nullptr /*colnam*/, 
>-+		     nullptr /*rownam*/);
>-    std::string fname = filename;
>-    if (extension)
>-    { if (extension[0] != '\0' && extension[0] != '.')
>
>Property changes on: math/clp/files/patch-Osi_test_OsiTestSolverInterfaceIO.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: math/clp/pkg-plist
>===================================================================
>--- math/clp/pkg-plist	(revision 508456)
>+++ math/clp/pkg-plist	(working copy)
>@@ -3,6 +3,7 @@
> include/coin/CbcOrClpParam.hpp
> include/coin/ClpCholeskyBase.hpp
> include/coin/ClpCholeskyDense.hpp
>+include/coin/ClpCholeskyPardiso.hpp
> include/coin/ClpConfig.h
> include/coin/ClpConstraint.hpp
> include/coin/ClpConstraintLinear.hpp
>@@ -26,6 +27,11 @@
> include/coin/ClpNode.hpp
> include/coin/ClpNonLinearCost.hpp
> include/coin/ClpObjective.hpp
>+include/coin/ClpPEDualRowDantzig.hpp
>+include/coin/ClpPEDualRowSteepest.hpp
>+include/coin/ClpPEPrimalColumnDantzig.hpp
>+include/coin/ClpPEPrimalColumnSteepest.hpp
>+include/coin/ClpPESimplex.hpp
> include/coin/ClpPackedMatrix.hpp
> include/coin/ClpParameters.hpp
> include/coin/ClpPdcoBase.hpp
>@@ -121,22 +127,22 @@
> include/coin/OsiUnitTests.hpp
> lib/libClp.so
> lib/libClp.so.1
>-lib/libClp.so.1.13.10
>+lib/libClp.so.1.14.3
> lib/libClpSolver.so
> lib/libClpSolver.so.1
>-lib/libClpSolver.so.1.13.10
>+lib/libClpSolver.so.1.14.3
> lib/libCoinUtils.so
> lib/libCoinUtils.so.3
>-lib/libCoinUtils.so.3.10.13
>+lib/libCoinUtils.so.3.11.2
> lib/libOsi.so
> lib/libOsi.so.1
>-lib/libOsi.so.1.12.7
>+lib/libOsi.so.1.13.4
> lib/libOsiClp.so
> lib/libOsiClp.so.1
>-lib/libOsiClp.so.1.13.10
>+lib/libOsiClp.so.1.14.3
> lib/libOsiCommonTests.so
> lib/libOsiCommonTests.so.1
>-lib/libOsiCommonTests.so.1.12.7
>+lib/libOsiCommonTests.so.1.13.4
> libdata/pkgconfig/clp.pc
> libdata/pkgconfig/coindatanetlib.pc
> libdata/pkgconfig/coindatasample.pc

Actions: View | Diff

Attachments on bug 220232: 183748 | 183749 | 186492 | 206401