zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to sagemath 5.10.

Browse source
This commit is contained in:
pcpa 2013-08-05 18:34:44 -03:00
parent 1d2f6c46fe
commit 4c97a63e19
36 changed files with 318 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

94
sagemath-cbc.patch
View file

@ -1,7 +1,7 @@
diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sage-5.9/module_list.py
--- sage-5.9/spkg/build/sage-5.9/module_list.py.orig 2013-05-06 14:18:02.386812933 -0300
+++ sage-5.9/spkg/build/sage-5.9/module_list.py 2013-05-06 14:18:07.352813123 -0300
@@ -2021,7 +2021,7 @@ if (os.path.isfile(SAGE_INC + "/cplex.h"
diff -up sage-5.10/spkg/build/sage-5.10/module_list.py.orig sage-5.10/spkg/build/sage-5.10/module_list.py
--- sage-5.10/spkg/build/sage-5.10/module_list.py.orig 2013-07-29 20:05:39.844079175 -0300
+++ sage-5.10/spkg/build/sage-5.10/module_list.py 2013-07-29 20:05:59.925079944 -0300
@@ -2007,7 +2007,7 @@ if (os.path.isfile(SAGE_INC + "/cplex.h"
libraries = ["csage", "stdc++", "cplex"])
)
@ -10,89 +10,3 @@ diff -up sage-5.9/spkg/build/sage-5.9/module_list.py.orig sage-5.9/spkg/build/sa
ext_modules.append(
Extension("sage.numerical.backends.coin_backend",
["sage/numerical/backends/coin_backend.pyx"],
diff -up sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd.orig sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd
--- sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd.orig 2013-05-06 14:18:23.609813746 -0300
+++ sage-5.9/spkg/build/sage-5.9/sage/numerical/backends/coin_backend.pxd 2013-05-06 14:19:37.702816583 -0300
@@ -22,23 +22,23 @@ from libcpp cimport bool
cdef extern from *:
ctypedef double* const_double_ptr "const double*"
-cdef extern from "../../local/include/coin/CbcStrategy.hpp":
+cdef extern from "coin/CbcStrategy.hpp":
cdef cppclass CbcStrategy:
pass
cdef cppclass CbcStrategyDefault(CbcStrategy):
CbcStrategyDefault()
-cdef extern from "../../local/include/coin/CoinPackedVectorBase.hpp":
+cdef extern from "coin/CoinPackedVectorBase.hpp":
cdef cppclass CoinPackedVectorBase:
pass
-cdef extern from "../../local/include/coin/CoinPackedVector.hpp":
+cdef extern from "coin/CoinPackedVector.hpp":
cdef cppclass CoinPackedVector(CoinPackedVectorBase):
void insert(float, float)
CoinPackedVector *new_CoinPackedVector "new CoinPackedVector" ()
void del_CoinPackedVector "delete" (CoinPackedVector *)
-cdef extern from "../../local/include/coin/CoinShallowPackedVector.hpp":
+cdef extern from "coin/CoinShallowPackedVector.hpp":
cdef cppclass CoinShallowPackedVector:
void insert(float, float)
int * getIndices ()
@@ -47,7 +47,7 @@ cdef extern from "../../local/include/co
CoinShallowPackedVector *new_CoinShallowPackedVector "new CoinShallowPackedVector" ()
void del_CoinShallowPackedVector "delete" (CoinShallowPackedVector *)
-cdef extern from "../../local/include/coin/CoinPackedMatrix.hpp":
+cdef extern from "coin/CoinPackedMatrix.hpp":
cdef cppclass CoinPackedMatrix:
void setDimensions(int, int)
void appendRow(CoinPackedVector)
@@ -55,7 +55,7 @@ cdef extern from "../../local/include/co
CoinPackedMatrix *new_CoinPackedMatrix "new CoinPackedMatrix" (bool, double, double)
void del_CoinPackedMatrix "delete" (CoinPackedMatrix *)
-cdef extern from "../../local/include/coin/CoinMessageHandler.hpp":
+cdef extern from "coin/CoinMessageHandler.hpp":
cdef cppclass CoinMessageHandler:
void setLogLevel (int)
int LogLevel ()
@@ -63,11 +63,11 @@ cdef extern from "../../local/include/co
void del_CoinMessageHandler "delete" (CoinMessageHandler *)
-cdef extern from "../../local/include/coin/OsiSolverParameters.hpp":
+cdef extern from "coin/OsiSolverParameters.hpp":
cdef enum OsiIntParam:
OsiMaxNumIteration = 0, OsiMaxNumIterationHotStart, OsiNameDiscipline, OsiLastIntParam
-cdef extern from "../../local/include/coin/OsiSolverInterface.hpp":
+cdef extern from "coin/OsiSolverInterface.hpp":
cdef cppclass OsiSolverInterface:
@@ -130,7 +130,7 @@ cdef extern from "../../local/include/co
# miscellaneous
double getInfinity()
-cdef extern from "../../local/include/coin/CbcModel.hpp":
+cdef extern from "coin/CbcModel.hpp":
cdef cppclass CbcModel:
# default constructor
CbcModel()
@@ -160,11 +160,11 @@ cdef extern from "../../local/include/co
CbcModel *new_CbcModel "new CbcModel" ()
void del_CbcModel "delete" (CbcModel *)
-cdef extern from "../../local/include/coin/ClpSimplex.hpp":
+cdef extern from "coin/ClpSimplex.hpp":
cdef cppclass ClpSimplex:
void setNumberThreads(int)
-cdef extern from "../../local/include/coin/OsiClpSolverInterface.hpp":
+cdef extern from "coin/OsiClpSolverInterface.hpp":
cdef cppclass OsiClpSolverInterface(OsiSolverInterface):