Skip to content

Commit d19ced0

Browse files
odowsimeonschaub
authored andcommitted
[SHOT] update build (JuliaPackaging#3320)
* [SHOT] update build * Update CppAD.patch
1 parent aac379c commit d19ced0

File tree

2 files changed

+3
-74
lines changed

2 files changed

+3
-74
lines changed

C/Coin-OR/SHOT/build_tarballs.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ include("../coin-or-common.jl")
33
name = "SHOT"
44
version = v"1.0.1"
55

6-
# Not actually v1.0.1. This is the latest commit as of the 08-07-2021
7-
# https://github.com/coin-or/SHOT/commit/080c8c564c157c6a396452ae75238715c3897cb6
6+
# Not actually v1.0.1. This is the latest commit as of the 13-07-2021
7+
# https://github.com/coin-or/SHOT/commit/edbff51d392d2f347331a28364cbffa89b44218f
88
sources = [
99
GitSource(
1010
"https://github.com/coin-or/SHOT.git",
11-
"080c8c564c157c6a396452ae75238715c3897cb6",
11+
"edbff51d392d2f347331a28364cbffa89b44218f",
1212
),
1313
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz",
1414
"2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62"),

C/Coin-OR/SHOT/bundled/patches/CppAD.patch

-71
Original file line numberDiff line numberDiff line change
@@ -38,74 +38,3 @@ index 495ab659d..5b3fd0687 100644
3838
IF( NOT cppad_max_num_threads_is_integer_ge_4 )
3939
MESSAGE(FATAL_ERROR
4040
"cppad_max_num_threads is not an integer greater than or equal 4"
41-
diff --git a/src/ModelingSystem/ModelingSystemAMPL.cpp b/src/ModelingSystem/ModelingSystemAMPL.cpp
42-
index 6ee9b010..0d26cba2 100644
43-
--- a/src/ModelingSystem/ModelingSystemAMPL.cpp
44-
+++ b/src/ModelingSystem/ModelingSystemAMPL.cpp
45-
@@ -416,12 +416,12 @@ public:
46-
private:
47-
AMPLProblemHandler& amplph;
48-
49-
- // type of suffix that is handled, or IGNORE if unsupported suffix
50-
+ // type of suffix that is handled, or SUFFIX_IGNORE if unsupported suffix
51-
enum
52-
{
53-
- IGNORE,
54-
- VARSOSNO,
55-
- VARREF,
56-
+ SUFFIX_IGNORE,
57-
+ SUFFIX_VARSOSNO,
58-
+ SUFFIX_VARREF,
59-
} suffix;
60-
61-
public:
62-
@@ -430,7 +430,7 @@ public:
63-
fmtold::StringRef name, ///< name of suffix
64-
mp::suf::Kind kind ///< whether suffix applies to var, cons, etc
65-
)
66-
- : amplph(amplph_), suffix(IGNORE)
67-
+ : amplph(amplph_), suffix(SUFFIX_IGNORE)
68-
{
69-
switch(kind)
70-
{
71-
@@ -445,12 +445,12 @@ public:
72-
if(strncmp(name.data(), "sosno", name.size()) == 0)
73-
{
74-
// SOS membership
75-
- suffix = VARSOSNO;
76-
+ suffix = SUFFIX_VARSOSNO;
77-
}
78-
else if(strncmp(name.data(), "ref", name.size()) == 0)
79-
{
80-
// SOS weights
81-
- suffix = VARREF;
82-
+ suffix = SUFFIX_VARREF;
83-
amplph.sosweights.resize(amplph.destination->allVariables.size(), 0);
84-
}
85-
else
86-
@@ -481,15 +481,15 @@ public:
87-
assert(index >= 0);
88-
switch(suffix)
89-
{
90-
- case IGNORE:
91-
+ case SUFFIX_IGNORE:
92-
return;
93-
94-
- case VARSOSNO:
95-
+ case SUFFIX_VARSOSNO:
96-
// remember that variable index belongs to SOS identified by value
97-
amplph.sosvars[(int)value].push_back(index);
98-
break;
99-
100-
- case VARREF:
101-
+ case SUFFIX_VARREF:
102-
// remember that variable index has weight value
103-
amplph.sosweights[index] = (int)value;
104-
break;
105-
@@ -703,4 +703,4 @@ E_ProblemCreationStatus ModelingSystemAMPL::createProblem(ProblemPtr& problem, c
106-
107-
void ModelingSystemAMPL::finalizeSolution() { }
108-
109-
-} // Namespace SHOT
110-
\ No newline at end of file
111-
+} // Namespace SHOT

0 commit comments

Comments
 (0)