View | Details | Raw Unified | Return to bug 255559
Collapse All | Expand All

(-)b/math/clp/Makefile (-2 / +8 lines)
Lines 1-8 Link Here
1
# Created by: Robin Schilham
1
# Created by: Robin Schilham
2
2
3
PORTNAME=	Clp
3
PORTNAME=	Clp
4
DISTVERSION=	1.17.3
4
DISTVERSION=	1.17.6
5
PORTREVISION=	1
6
CATEGORIES=	math
5
CATEGORIES=	math
7
MASTER_SITES=	http://www.coin-or.org/download/source/${PORTNAME}/ \
6
MASTER_SITES=	http://www.coin-or.org/download/source/${PORTNAME}/ \
8
		http://www.mavetju.org/download/adopted/
7
		http://www.mavetju.org/download/adopted/
Lines 13-18 COMMENT= Linear Programming Solver Link Here
13
12
14
LICENSE=	EPL
13
LICENSE=	EPL
15
14
15
BUILD_DEPENDS=	coin-or-Data-Sample>0:math/coin-or-data-sample \
16
		coin-or-Data-Netlib>0:math/coin-or-data-netlib
17
LIB_DEPENDS=	libCoinUtils.so:math/coinutils
18
16
USES=		blaslapack compiler:c++11-lang fortran libtool pathfix tar:tgz
19
USES=		blaslapack compiler:c++11-lang fortran libtool pathfix tar:tgz
17
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
18
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
Lines 21-26 INSTALL_TARGET= install-strip Link Here
21
24
22
CONFIGURE_ARGS=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
25
CONFIGURE_ARGS=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
23
		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
26
		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
27
		--with-coinutils-incdir="${LOCALBASE}/include/coin" --with-coinutils-lib="${LOCALBASE}/lib/libCoinUtils.so" \
28
		--with-netlib-datadir="${LOCALBASE}/share/coin/Data/Netlib" \
29
		--with-sample-datadir="${LOCALBASE}/share/coin/Data/Sample" \
24
		--datadir=${DATADIR}
30
		--datadir=${DATADIR}
25
31
26
TEST_TARGET=	unitTest
32
TEST_TARGET=	unitTest
(-)b/math/clp/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1576960990
1
TIMESTAMP = 1619999115
2
SHA256 (Clp-1.17.3.tgz) = a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573
2
SHA256 (Clp-1.17.6.tgz) = f9cfcdd3db23bbc2d18b562012a7e25b99a40e8ce72dc296bd46dddb2970e12a
3
SIZE (Clp-1.17.3.tgz) = 9983267
3
SIZE (Clp-1.17.6.tgz) = 9972859
(-)b/math/clp/pkg-plist (-207 / +5 lines)
Lines 48-113 include/coin/ClpSimplexOther.hpp Link Here
48
include/coin/ClpSimplexPrimal.hpp
48
include/coin/ClpSimplexPrimal.hpp
49
include/coin/ClpSolve.hpp
49
include/coin/ClpSolve.hpp
50
include/coin/Clp_C_Interface.h
50
include/coin/Clp_C_Interface.h
51
include/coin/CoinAlloc.hpp
52
include/coin/CoinBuild.hpp
53
include/coin/CoinDenseFactorization.hpp
54
include/coin/CoinDenseVector.hpp
55
include/coin/CoinDistance.hpp
56
include/coin/CoinError.hpp
57
include/coin/CoinFactorization.hpp
58
include/coin/CoinFileIO.hpp
59
include/coin/CoinFinite.hpp
60
include/coin/CoinFloatEqual.hpp
61
include/coin/CoinHelperFunctions.hpp
62
include/coin/CoinIndexedVector.hpp
63
include/coin/CoinLpIO.hpp
64
include/coin/CoinMessage.hpp
65
include/coin/CoinMessageHandler.hpp
66
include/coin/CoinModel.hpp
67
include/coin/CoinModelUseful.hpp
68
include/coin/CoinMpsIO.hpp
69
include/coin/CoinOslFactorization.hpp
70
include/coin/CoinPackedMatrix.hpp
71
include/coin/CoinPackedVector.hpp
72
include/coin/CoinPackedVectorBase.hpp
73
include/coin/CoinParam.hpp
74
include/coin/CoinPragma.hpp
75
include/coin/CoinPresolveDoubleton.hpp
76
include/coin/CoinPresolveDual.hpp
77
include/coin/CoinPresolveDupcol.hpp
78
include/coin/CoinPresolveEmpty.hpp
79
include/coin/CoinPresolveFixed.hpp
80
include/coin/CoinPresolveForcing.hpp
81
include/coin/CoinPresolveImpliedFree.hpp
82
include/coin/CoinPresolveIsolated.hpp
83
include/coin/CoinPresolveMatrix.hpp
84
include/coin/CoinPresolveMonitor.hpp
85
include/coin/CoinPresolvePsdebug.hpp
86
include/coin/CoinPresolveSingleton.hpp
87
include/coin/CoinPresolveSubst.hpp
88
include/coin/CoinPresolveTighten.hpp
89
include/coin/CoinPresolveTripleton.hpp
90
include/coin/CoinPresolveUseless.hpp
91
include/coin/CoinPresolveZeros.hpp
92
include/coin/CoinRational.hpp
93
include/coin/CoinSearchTree.hpp
94
include/coin/CoinShallowPackedVector.hpp
95
include/coin/CoinSignal.hpp
96
include/coin/CoinSimpFactorization.hpp
97
include/coin/CoinSmartPtr.hpp
98
include/coin/CoinSnapshot.hpp
99
include/coin/CoinSort.hpp
100
include/coin/CoinStructuredModel.hpp
101
include/coin/CoinTime.hpp
102
include/coin/CoinTypes.hpp
103
include/coin/CoinUtility.hpp
104
include/coin/CoinUtilsConfig.h
105
include/coin/CoinWarmStart.hpp
106
include/coin/CoinWarmStartBasis.hpp
107
include/coin/CoinWarmStartDual.hpp
108
include/coin/CoinWarmStartPrimalDual.hpp
109
include/coin/CoinWarmStartVector.hpp
110
include/coin/Coin_C_defines.h
111
include/coin/Idiot.hpp
51
include/coin/Idiot.hpp
112
include/coin/OsiAuxInfo.hpp
52
include/coin/OsiAuxInfo.hpp
113
include/coin/OsiBranchingObject.hpp
53
include/coin/OsiBranchingObject.hpp
Lines 127-295 include/coin/OsiSolverParameters.hpp Link Here
127
include/coin/OsiUnitTests.hpp
67
include/coin/OsiUnitTests.hpp
128
lib/libClp.so
68
lib/libClp.so
129
lib/libClp.so.1
69
lib/libClp.so.1
130
lib/libClp.so.1.14.3
70
lib/libClp.so.1.14.6
131
lib/libClpSolver.so
71
lib/libClpSolver.so
132
lib/libClpSolver.so.1
72
lib/libClpSolver.so.1
133
lib/libClpSolver.so.1.14.3
73
lib/libClpSolver.so.1.14.6
134
lib/libCoinUtils.so
135
lib/libCoinUtils.so.3
136
lib/libCoinUtils.so.3.11.2
137
lib/libOsi.so
74
lib/libOsi.so
138
lib/libOsi.so.1
75
lib/libOsi.so.1
139
lib/libOsi.so.1.13.4
76
lib/libOsi.so.1.13.6
140
lib/libOsiClp.so
77
lib/libOsiClp.so
141
lib/libOsiClp.so.1
78
lib/libOsiClp.so.1
142
lib/libOsiClp.so.1.14.3
79
lib/libOsiClp.so.1.14.6
143
lib/libOsiCommonTests.so
80
lib/libOsiCommonTests.so
144
lib/libOsiCommonTests.so.1
81
lib/libOsiCommonTests.so.1
145
lib/libOsiCommonTests.so.1.13.4
82
lib/libOsiCommonTests.so.1.13.6
146
libdata/pkgconfig/clp.pc
83
libdata/pkgconfig/clp.pc
147
libdata/pkgconfig/coindatanetlib.pc
148
libdata/pkgconfig/coindatasample.pc
149
libdata/pkgconfig/coinutils.pc
150
libdata/pkgconfig/osi-clp.pc
84
libdata/pkgconfig/osi-clp.pc
151
libdata/pkgconfig/osi-unittests.pc
85
libdata/pkgconfig/osi-unittests.pc
152
libdata/pkgconfig/osi.pc
86
libdata/pkgconfig/osi.pc
153
%%DATADIR%%/coin/Data/Netlib/25fv47.mps.gz
154
%%DATADIR%%/coin/Data/Netlib/80bau3b.mps.gz
155
%%DATADIR%%/coin/Data/Netlib/adlittle.mps.gz
156
%%DATADIR%%/coin/Data/Netlib/afiro.mps.gz
157
%%DATADIR%%/coin/Data/Netlib/agg.mps.gz
158
%%DATADIR%%/coin/Data/Netlib/agg2.mps.gz
159
%%DATADIR%%/coin/Data/Netlib/agg3.mps.gz
160
%%DATADIR%%/coin/Data/Netlib/bandm.mps.gz
161
%%DATADIR%%/coin/Data/Netlib/beaconfd.mps.gz
162
%%DATADIR%%/coin/Data/Netlib/blend.mps.gz
163
%%DATADIR%%/coin/Data/Netlib/bnl1.mps.gz
164
%%DATADIR%%/coin/Data/Netlib/bnl2.mps.gz
165
%%DATADIR%%/coin/Data/Netlib/boeing1.mps.gz
166
%%DATADIR%%/coin/Data/Netlib/boeing2.mps.gz
167
%%DATADIR%%/coin/Data/Netlib/bore3d.mps.gz
168
%%DATADIR%%/coin/Data/Netlib/brandy.mps.gz
169
%%DATADIR%%/coin/Data/Netlib/capri.mps.gz
170
%%DATADIR%%/coin/Data/Netlib/cycle.mps.gz
171
%%DATADIR%%/coin/Data/Netlib/czprob.mps.gz
172
%%DATADIR%%/coin/Data/Netlib/d2q06c.mps.gz
173
%%DATADIR%%/coin/Data/Netlib/d6cube.mps.gz
174
%%DATADIR%%/coin/Data/Netlib/degen2.mps.gz
175
%%DATADIR%%/coin/Data/Netlib/degen3.mps.gz
176
%%DATADIR%%/coin/Data/Netlib/dfl001.mps.gz
177
%%DATADIR%%/coin/Data/Netlib/e226.mps.gz
178
%%DATADIR%%/coin/Data/Netlib/etamacro.mps.gz
179
%%DATADIR%%/coin/Data/Netlib/fffff800.mps.gz
180
%%DATADIR%%/coin/Data/Netlib/finnis.mps.gz
181
%%DATADIR%%/coin/Data/Netlib/fit1d.mps.gz
182
%%DATADIR%%/coin/Data/Netlib/fit1p.mps.gz
183
%%DATADIR%%/coin/Data/Netlib/fit2d.mps.gz
184
%%DATADIR%%/coin/Data/Netlib/fit2p.mps.gz
185
%%DATADIR%%/coin/Data/Netlib/forplan.mps.gz
186
%%DATADIR%%/coin/Data/Netlib/ganges.mps.gz
187
%%DATADIR%%/coin/Data/Netlib/gfrd-pnc.mps.gz
188
%%DATADIR%%/coin/Data/Netlib/greenbea.mps.gz
189
%%DATADIR%%/coin/Data/Netlib/greenbeb.mps.gz
190
%%DATADIR%%/coin/Data/Netlib/grow15.mps.gz
191
%%DATADIR%%/coin/Data/Netlib/grow22.mps.gz
192
%%DATADIR%%/coin/Data/Netlib/grow7.mps.gz
193
%%DATADIR%%/coin/Data/Netlib/israel.mps.gz
194
%%DATADIR%%/coin/Data/Netlib/kb2.mps.gz
195
%%DATADIR%%/coin/Data/Netlib/lotfi.mps.gz
196
%%DATADIR%%/coin/Data/Netlib/maros-r7.mps.gz
197
%%DATADIR%%/coin/Data/Netlib/maros.mps.gz
198
%%DATADIR%%/coin/Data/Netlib/modszk1.mps.gz
199
%%DATADIR%%/coin/Data/Netlib/nesm.mps.gz
200
%%DATADIR%%/coin/Data/Netlib/perold.mps.gz
201
%%DATADIR%%/coin/Data/Netlib/pilot.mps.gz
202
%%DATADIR%%/coin/Data/Netlib/pilot4.mps.gz
203
%%DATADIR%%/coin/Data/Netlib/pilot87.mps.gz
204
%%DATADIR%%/coin/Data/Netlib/pilotnov.mps.gz
205
%%DATADIR%%/coin/Data/Netlib/recipe.mps.gz
206
%%DATADIR%%/coin/Data/Netlib/sc105.mps.gz
207
%%DATADIR%%/coin/Data/Netlib/sc205.mps.gz
208
%%DATADIR%%/coin/Data/Netlib/sc50a.mps.gz
209
%%DATADIR%%/coin/Data/Netlib/sc50b.mps.gz
210
%%DATADIR%%/coin/Data/Netlib/scagr25.mps.gz
211
%%DATADIR%%/coin/Data/Netlib/scagr7.mps.gz
212
%%DATADIR%%/coin/Data/Netlib/scfxm1.mps.gz
213
%%DATADIR%%/coin/Data/Netlib/scfxm2.mps.gz
214
%%DATADIR%%/coin/Data/Netlib/scfxm3.mps.gz
215
%%DATADIR%%/coin/Data/Netlib/scorpion.mps.gz
216
%%DATADIR%%/coin/Data/Netlib/scrs8.mps.gz
217
%%DATADIR%%/coin/Data/Netlib/scsd1.mps.gz
218
%%DATADIR%%/coin/Data/Netlib/scsd6.mps.gz
219
%%DATADIR%%/coin/Data/Netlib/scsd8.mps.gz
220
%%DATADIR%%/coin/Data/Netlib/sctap1.mps.gz
221
%%DATADIR%%/coin/Data/Netlib/sctap2.mps.gz
222
%%DATADIR%%/coin/Data/Netlib/sctap3.mps.gz
223
%%DATADIR%%/coin/Data/Netlib/seba.mps.gz
224
%%DATADIR%%/coin/Data/Netlib/share1b.mps.gz
225
%%DATADIR%%/coin/Data/Netlib/share2b.mps.gz
226
%%DATADIR%%/coin/Data/Netlib/shell.mps.gz
227
%%DATADIR%%/coin/Data/Netlib/ship04l.mps.gz
228
%%DATADIR%%/coin/Data/Netlib/ship04s.mps.gz
229
%%DATADIR%%/coin/Data/Netlib/ship08l.mps.gz
230
%%DATADIR%%/coin/Data/Netlib/ship08s.mps.gz
231
%%DATADIR%%/coin/Data/Netlib/ship12l.mps.gz
232
%%DATADIR%%/coin/Data/Netlib/ship12s.mps.gz
233
%%DATADIR%%/coin/Data/Netlib/sierra.mps.gz
234
%%DATADIR%%/coin/Data/Netlib/stair.mps.gz
235
%%DATADIR%%/coin/Data/Netlib/standata.mps.gz
236
%%DATADIR%%/coin/Data/Netlib/standgub.mps.gz
237
%%DATADIR%%/coin/Data/Netlib/standmps.mps.gz
238
%%DATADIR%%/coin/Data/Netlib/stocfor1.mps.gz
239
%%DATADIR%%/coin/Data/Netlib/stocfor2.mps.gz
240
%%DATADIR%%/coin/Data/Netlib/tuff.mps.gz
241
%%DATADIR%%/coin/Data/Netlib/vtpbase.mps.gz
242
%%DATADIR%%/coin/Data/Netlib/wood1p.mps.gz
243
%%DATADIR%%/coin/Data/Netlib/woodw.mps.gz
244
%%DATADIR%%/coin/Data/Sample/afiro.mps
245
%%DATADIR%%/coin/Data/Sample/app0110.cor
246
%%DATADIR%%/coin/Data/Sample/app0110.stoch
247
%%DATADIR%%/coin/Data/Sample/app0110.time
248
%%DATADIR%%/coin/Data/Sample/app0110R.cor
249
%%DATADIR%%/coin/Data/Sample/app0110R.stoch
250
%%DATADIR%%/coin/Data/Sample/app0110R.time
251
%%DATADIR%%/coin/Data/Sample/atm_5_10_1.block
252
%%DATADIR%%/coin/Data/Sample/atm_5_10_1.mps
253
%%DATADIR%%/coin/Data/Sample/block_milp.dec
254
%%DATADIR%%/coin/Data/Sample/block_milp.lp
255
%%DATADIR%%/coin/Data/Sample/brandy.mps
256
%%DATADIR%%/coin/Data/Sample/bug.cor
257
%%DATADIR%%/coin/Data/Sample/bug.stoch
258
%%DATADIR%%/coin/Data/Sample/bug.time
259
%%DATADIR%%/coin/Data/Sample/conic.mps
260
%%DATADIR%%/coin/Data/Sample/e226.mps
261
%%DATADIR%%/coin/Data/Sample/exmip1.5.mps
262
%%DATADIR%%/coin/Data/Sample/exmip1.lp
263
%%DATADIR%%/coin/Data/Sample/exmip1.mps
264
%%DATADIR%%/coin/Data/Sample/finnis.mps
265
%%DATADIR%%/coin/Data/Sample/galenet.mps
266
%%DATADIR%%/coin/Data/Sample/galenetbnds.mps
267
%%DATADIR%%/coin/Data/Sample/hello.mps
268
%%DATADIR%%/coin/Data/Sample/input.130
269
%%DATADIR%%/coin/Data/Sample/lseu.mps
270
%%DATADIR%%/coin/Data/Sample/nw460.mps
271
%%DATADIR%%/coin/Data/Sample/p0033.mps
272
%%DATADIR%%/coin/Data/Sample/p0201.mps
273
%%DATADIR%%/coin/Data/Sample/p0548.mps
274
%%DATADIR%%/coin/Data/Sample/pack1.mps
275
%%DATADIR%%/coin/Data/Sample/retail3.block
276
%%DATADIR%%/coin/Data/Sample/retail3.mps
277
%%DATADIR%%/coin/Data/Sample/scOneInt.mps
278
%%DATADIR%%/coin/Data/Sample/share2qp.mps
279
%%DATADIR%%/coin/Data/Sample/spec_sections.mps
280
%%DATADIR%%/coin/Data/Sample/tp3.mps
281
%%DATADIR%%/coin/Data/Sample/tp4.mps
282
%%DATADIR%%/coin/Data/Sample/tp5.mps
283
%%DATADIR%%/coin/Data/Sample/wedding_16.block
284
%%DATADIR%%/coin/Data/Sample/wedding_16.mps
285
%%DATADIR%%/coin/doc/Clp/AUTHORS
87
%%DATADIR%%/coin/doc/Clp/AUTHORS
286
%%DATADIR%%/coin/doc/Clp/LICENSE
88
%%DATADIR%%/coin/doc/Clp/LICENSE
287
%%DATADIR%%/coin/doc/Clp/README
89
%%DATADIR%%/coin/doc/Clp/README
288
%%DATADIR%%/coin/doc/Clp/clp_addlibs.txt
90
%%DATADIR%%/coin/doc/Clp/clp_addlibs.txt
289
%%DATADIR%%/coin/doc/CoinUtils/AUTHORS
290
%%DATADIR%%/coin/doc/CoinUtils/LICENSE
291
%%DATADIR%%/coin/doc/CoinUtils/README
292
%%DATADIR%%/coin/doc/CoinUtils/coinutils_addlibs.txt
293
%%DATADIR%%/coin/doc/Osi/AUTHORS
91
%%DATADIR%%/coin/doc/Osi/AUTHORS
294
%%DATADIR%%/coin/doc/Osi/LICENSE
92
%%DATADIR%%/coin/doc/Osi/LICENSE
295
%%DATADIR%%/coin/doc/Osi/README
93
%%DATADIR%%/coin/doc/Osi/README
(-)a/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp (-11 lines)
Removed Link Here
1
--- Clp/src/ClpPackedMatrix.cpp.orig	2019-12-29 17:14:00 UTC
2
+++ Clp/src/ClpPackedMatrix.cpp
3
@@ -6752,7 +6752,7 @@ ClpPackedMatrix3::ClpPackedMatrix3()
4
 #elif defined(__arm__)
5
 #include <arm_neon.h>
6
 #else
7
-#include <immintrin.h>
8
+//#include <immintrin.h>
9
 //#include <fmaintrin.h>
10
 #endif
11
 /* Constructor from copy. */
(-)a/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp (-11 lines)
Removed Link Here
1
--- Clp/src/ClpSimplexDual.cpp.orig	2019-12-29 17:45:58 UTC
2
+++ Clp/src/ClpSimplexDual.cpp
3
@@ -3559,7 +3559,7 @@ void moveAndZero(clpTempInfo *info, int type, void *ex
4
 #elif defined(__arm__)
5
 #include <arm_neon.h>
6
 #else
7
-#include <immintrin.h>
8
+//#include <immintrin.h>
9
 //#include <fmaintrin.h>
10
 #endif
11
 int ClpSimplexDual::dualColumn0(const CoinIndexedVector *rowArray,

Return to bug 255559