Attachment #206401 for bug #220232

Lines 2-9 Link Here

(-)math/clp/Makefile (-8 / +22 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= Clp	4	PORTNAME= Clp
5	PORTVERSION= 1.16.10	5	PORTVERSION= 1.17.3
6	PORTREVISION= 8
7	CATEGORIES= math	6	CATEGORIES= math
8	MASTER_SITES= http://www.coin-or.org/download/source/${PORTNAME}/ \	7	MASTER_SITES= http://www.coin-or.org/download/source/${PORTNAME}/ \
9	http://www.mavetju.org/download/adopted/	8	http://www.mavetju.org/download/adopted/
Lines 12-35 Link Here
12	COMMENT= Linear Programming Solver	11	COMMENT= Linear Programming Solver
13		12
14	LICENSE= EPL	13	LICENSE= EPL
		14	LICENSE_FILE= ${WRKSRC}/Clp/LICENSE
15		15
16	USES= blaslapack compiler:c++11-lang fortran libtool pathfix tar:tgz	16	BROKEN_powerpc64= fails to compile: CoinSignal.hpp: ISO C++ forbids declaration of '__decltype' with no type
		17
		18	USES= fortran blaslapack libtool pathfix pkgconfig tar:tgz localbase
17	CXXFLAGS+= -ffast-math	19	CXXFLAGS+= -ffast-math
18		20
19	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
20	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
		23
		24	CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
		25	--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
		26	--datadir=${DATADIR}
		27
21	TEST_TARGET= unitTest	28	TEST_TARGET= unitTest
22	TEST_WRKSRC= ${WRKSRC}/${PORTNAME}	29	TEST_WRKSRC= ${WRKSRC}/${PORTNAME}
23		30
24	CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \	31	OPTIONS_DEFINE= DEBUG DOCS GLPK
25	--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
26	--datadir=${DATADIR}
27
28	OPTIONS_DEFINE= DEBUG DOCS
29	PORTDOCS= *	32	PORTDOCS= *
30		33
31	DEBUG_CXXFLAGS= -fomit-frame-pointer	34	DEBUG_CXXFLAGS= -fomit-frame-pointer
32		35
		36	GLPK_LIB_DEPENDS= libglpk.so:math/glpk
		37	GLPK_CONFIGURE_ON= --with-gmpl-incdir=${LOCALBASE}/include \
		38	--with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
		39	GLPK_CONFIGURE_OFF= --disable-glpk-libcheck
		40
		41	MUMPS_CONFIGURE_ENV= CC=${LOCALBASE}/bin/mpicc CXX=${LOCALBASE}/bin/mpicxx
		42	MUMPS_LIB_DEPENDS= libmpich.so.8:net/mpich2 \
		43	libmumps_common.so:math/mumps-mpich
		44	MUMPS_CONFIGURE_ON= --with-mumps-incdir=${LOCALBASE}/include \
		45	--with-mumps-lib="-L${LOCALBASE}/lib -lmumps"
		46
33	post-install:	47	post-install:
34	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so	48	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
35		49

Lines 1-3 Link Here

(-)math/clp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1475286033	1	TIMESTAMP = 1565368947
2	SHA256 (Clp-1.16.10.tgz) = 5cd880f2afcffd79d223fb8b0a448119600a3edee98409c7e989f3246d2f3acd	2	SHA256 (Clp-1.17.3.tgz) = a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573
3	SIZE (Clp-1.16.10.tgz) = 9968182	3	SIZE (Clp-1.17.3.tgz) = 9983267




--- 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_];

Lines 1-11 Link Here

(-)math/clp/files/patch-Clp_src_ClpModel.cpp (-11 lines)
1	--- Clp/src/ClpModel.cpp.orig 2018-04-16 06:43:28 UTC
2	+++ Clp/src/ClpModel.cpp
3	@@ -3845,7 +3845,7 @@ ClpModel::writeMps(const char *filename,
4	writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX,
5	getColLower(), getColUpper(),
6	objective,
7	- reinterpret_cast<const char> (NULL) /integrality*/,
8	+ nullptr /integrality/,
9	getRowLower(), getRowUpper(),
10	columnNames, rowNames);
11	// Pass in array saying if each variable integer

Lines 1-11 Link Here

(-)math/clp/files/patch-Clp_src_OsiClp_OsiClpSolverInterface.cpp (-11 lines)
1	--- Clp/src/OsiClp/OsiClpSolverInterface.cpp.orig 2018-04-16 06:57:00 UTC
2	+++ Clp/src/OsiClp/OsiClpSolverInterface.cpp
3	@@ -1448,7 +1448,7 @@ OsiClpSolverInterface::setupForRepeatedU
4	if (stopPrinting) {
5	CoinMessages * messagesPointer = modelPtr_->messagesPointer();
6	// won't even build messages
7	- messagesPointer->setDetailMessages(100,10000,reinterpret_cast<int *> (NULL));
8	+ messagesPointer->setDetailMessages(100,10000,nullptr);
9	}
10	#endif
11	}




--- 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] != '.')

Lines 3-8 Link Here

(-)math/clp/pkg-plist (-6 / +12 lines)
3	include/coin/CbcOrClpParam.hpp	3	include/coin/CbcOrClpParam.hpp
4	include/coin/ClpCholeskyBase.hpp	4	include/coin/ClpCholeskyBase.hpp
5	include/coin/ClpCholeskyDense.hpp	5	include/coin/ClpCholeskyDense.hpp
		6	include/coin/ClpCholeskyPardiso.hpp
6	include/coin/ClpConfig.h	7	include/coin/ClpConfig.h
7	include/coin/ClpConstraint.hpp	8	include/coin/ClpConstraint.hpp
8	include/coin/ClpConstraintLinear.hpp	9	include/coin/ClpConstraintLinear.hpp
Lines 26-31 Link Here
26	include/coin/ClpNode.hpp	27	include/coin/ClpNode.hpp
27	include/coin/ClpNonLinearCost.hpp	28	include/coin/ClpNonLinearCost.hpp
28	include/coin/ClpObjective.hpp	29	include/coin/ClpObjective.hpp
		30	include/coin/ClpPEDualRowDantzig.hpp
		31	include/coin/ClpPEDualRowSteepest.hpp
		32	include/coin/ClpPEPrimalColumnDantzig.hpp
		33	include/coin/ClpPEPrimalColumnSteepest.hpp
		34	include/coin/ClpPESimplex.hpp
29	include/coin/ClpPackedMatrix.hpp	35	include/coin/ClpPackedMatrix.hpp
30	include/coin/ClpParameters.hpp	36	include/coin/ClpParameters.hpp
31	include/coin/ClpPdcoBase.hpp	37	include/coin/ClpPdcoBase.hpp
Lines 121-142 Link Here
121	include/coin/OsiUnitTests.hpp	127	include/coin/OsiUnitTests.hpp
122	lib/libClp.so	128	lib/libClp.so
123	lib/libClp.so.1	129	lib/libClp.so.1
124	lib/libClp.so.1.13.10	130	lib/libClp.so.1.14.3
125	lib/libClpSolver.so	131	lib/libClpSolver.so
126	lib/libClpSolver.so.1	132	lib/libClpSolver.so.1
127	lib/libClpSolver.so.1.13.10	133	lib/libClpSolver.so.1.14.3
128	lib/libCoinUtils.so	134	lib/libCoinUtils.so
129	lib/libCoinUtils.so.3	135	lib/libCoinUtils.so.3
130	lib/libCoinUtils.so.3.10.13	136	lib/libCoinUtils.so.3.11.2
131	lib/libOsi.so	137	lib/libOsi.so
132	lib/libOsi.so.1	138	lib/libOsi.so.1
133	lib/libOsi.so.1.12.7	139	lib/libOsi.so.1.13.4
134	lib/libOsiClp.so	140	lib/libOsiClp.so
135	lib/libOsiClp.so.1	141	lib/libOsiClp.so.1
136	lib/libOsiClp.so.1.13.10	142	lib/libOsiClp.so.1.14.3
137	lib/libOsiCommonTests.so	143	lib/libOsiCommonTests.so
138	lib/libOsiCommonTests.so.1	144	lib/libOsiCommonTests.so.1
139	lib/libOsiCommonTests.so.1.12.7	145	lib/libOsiCommonTests.so.1.13.4
140	libdata/pkgconfig/clp.pc	146	libdata/pkgconfig/clp.pc
141	libdata/pkgconfig/coindatanetlib.pc	147	libdata/pkgconfig/coindatanetlib.pc
142	libdata/pkgconfig/coindatasample.pc	148	libdata/pkgconfig/coindatasample.pc

Return to bug 220232

Lines 1-66 Link Here

(-)math/clp/files/patch-Clp_src_AbcSimplex.cpp (-66 lines)
1	--- Clp/src/AbcSimplex.cpp.orig 2018-04-16 06:55:57 UTC
2	+++ Clp/src/AbcSimplex.cpp
3	@@ -368,19 +368,19 @@ AbcSimplex::gutsOfInitialize(int numberR
4	// say Steepest pricing
5	abcDualRowPivot_ = new AbcDualRowSteepest();
6	abcPrimalColumnPivot_ = new AbcPrimalColumnSteepest();
7	- internalStatus_ = newArray(reinterpret_cast<unsigned char *>(NULL),
8	+ internalStatus_ = newArray(nullptr,
9	sizeArray+maximumNumberTotal_);
10	- abcLower_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
11	- abcUpper_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
12	- abcCost_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+maximumNumberTotal_);
13	- abcDj_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
14	- abcSolution_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+maximumNumberTotal_);
15	- //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
16	- //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
17	- scaleFromExternal_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
18	- offset_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
19	- abcPerturbation_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
20	- abcPivotVariable_ = newArray(reinterpret_cast<int *>(NULL),maximumAbcNumberRows_);
21	+ abcLower_ = newArray(nullptr,sizeArray);
22	+ abcUpper_ = newArray(nullptr,sizeArray);
23	+ abcCost_ = newArray(nullptr,sizeArray+maximumNumberTotal_);
24	+ abcDj_ = newArray(nullptr,sizeArray);
25	+ abcSolution_ = newArray(nullptr,sizeArray+maximumNumberTotal_);
26	+ //fromExternal_ = newArray(nullptr,sizeArray);
27	+ //toExternal_ = newArray(nullptr,sizeArray);
28	+ scaleFromExternal_ = newArray(nullptr,sizeArray);
29	+ offset_ = newArray(nullptr,sizeArray);
30	+ abcPerturbation_ = newArray(nullptr,sizeArray);
31	+ abcPivotVariable_ = newArray(nullptr,maximumAbcNumberRows_);
32	// Fill perturbation array
33	setupPointers(maximumAbcNumberRows_,maximumAbcNumberColumns_);
34	fillPerturbation(0,maximumNumberTotal_);
35	@@ -554,19 +554,19 @@ AbcSimplex::createSubProblem(int numberC
36	subProblem->maximumNumberTotal_= maximumAbcNumberRows_+numberColumns;
37	subProblem->numberTotalWithoutFixed_= subProblem->numberTotal_;
38	int sizeArray=2*subProblem->maximumNumberTotal_+maximumAbcNumberRows_;
39	- subProblem->internalStatus_ = newArray(reinterpret_cast<unsigned char *>(NULL),
40	+ subProblem->internalStatus_ = newArray(nullptr,
41	sizeArray+subProblem->maximumNumberTotal_);
42	- subProblem->abcLower_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
43	- subProblem->abcUpper_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
44	- subProblem->abcCost_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+subProblem->maximumNumberTotal_);
45	- subProblem->abcDj_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
46	- subProblem->abcSolution_ = newArray(reinterpret_cast<double *>(NULL),sizeArray+subProblem->maximumNumberTotal_);
47	- //fromExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
48	- //toExternal_ = newArray(reinterpret_cast<int *>(NULL),sizeArray);
49	- subProblem->scaleFromExternal_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
50	- subProblem->offset_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
51	- subProblem->abcPerturbation_ = newArray(reinterpret_cast<double *>(NULL),sizeArray);
52	- subProblem->abcPivotVariable_ = newArray(reinterpret_cast<int *>(NULL),maximumAbcNumberRows_);
53	+ subProblem->abcLower_ = newArray(nullptr,sizeArray);
54	+ subProblem->abcUpper_ = newArray(nullptr,sizeArray);
55	+ subProblem->abcCost_ = newArray(nullptr,sizeArray+subProblem->maximumNumberTotal_);
56	+ subProblem->abcDj_ = newArray(nullptr,sizeArray);
57	+ subProblem->abcSolution_ = newArray(nullptr,sizeArray+subProblem->maximumNumberTotal_);
58	+ //fromExternal_ = newArray(nullptr,sizeArray);
59	+ //toExternal_ = newArray(nullptr,sizeArray);
60	+ subProblem->scaleFromExternal_ = newArray(nullptr,sizeArray);
61	+ subProblem->offset_ = newArray(nullptr,sizeArray);
62	+ subProblem->abcPerturbation_ = newArray(nullptr,sizeArray);
63	+ subProblem->abcPivotVariable_ = newArray(nullptr,maximumAbcNumberRows_);
64	subProblem->setupPointers(maximumAbcNumberRows_,numberColumns);
65	// could use arrays - but for now be safe
66	int * backward = new int [numberFullColumns+numberRows_];

Lines 1-16 Link Here

(-)math/clp/files/patch-Osi_test_OsiTestSolverInterfaceIO.cpp (-16 lines)
1	--- Osi/test/OsiTestSolverInterfaceIO.cpp.orig 2018-04-16 06:54:20 UTC
2	+++ Osi/test/OsiTestSolverInterfaceIO.cpp
3	@@ -422,10 +422,10 @@ OsiTestSolverInterface::writeMps(const c
4	writer.setMpsData(*getMatrixByCol(), getInfinity(),
5	getColLower(), getColUpper(),
6	getObjCoefficients(),
7	- reinterpret_cast<const char > (NULL) /integrality*/,
8	+ nullptr /integrality/,
9	getRowLower(), getRowUpper(),
10	- reinterpret_cast<const char *> (NULL) /colnam*/,
11	- reinterpret_cast<const char *> (NULL) /rownam*/);
12	+ nullptr /colnam/,
13	+ nullptr /rownam/);
14	std::string fname = filename;
15	if (extension)
16	{ if (extension[0] != '\0' && extension[0] != '.')