Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SHOT] v1.1 and build on experimental platforms #4024

Merged
merged 6 commits into from
Dec 6, 2021
Merged

[SHOT] v1.1 and build on experimental platforms #4024

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f047108
[SHOT] v1.1 and build on experimental platforms
odow Dec 5, 2021
bf90cb7
Update coin-or-common.jl
odow Dec 5, 2021
b710760
Update build_tarballs.jl
odow Dec 5, 2021
7e3b288
Update C/Coin-OR/SHOT/build_tarballs.jl
odow Dec 5, 2021
5b33889
Update build_tarballs.jl
odow Dec 5, 2021
abe559f
[SHOT] Fix compilation for `aarch64-apple-darwin`
giordano Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions C/Coin-OR/SHOT/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
include("../coin-or-common.jl")

name = "SHOT"
version = v"1.0.1"

# Not actually v1.0.1. This is the latest commit as of the 13-07-2021
# https://github.com/coin-or/SHOT/commit/edbff51d392d2f347331a28364cbffa89b44218f
sources = [
GitSource(
"https://github.com/coin-or/SHOT.git",
"edbff51d392d2f347331a28364cbffa89b44218f",
SHOT_gitsha,
),
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz",
"2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62"),
Expand All @@ -20,7 +15,7 @@ cd $WORKSPACE/srcdir/SHOT
git submodule update --init --recursive
# Disable run_source_test in CppAD
atomic_patch -p1 ../patches/CppAD.patch
if [[ "${target}" == *-darwin* ]]; then
if [[ "${target}" == *-x86_64-apple-darwin* ]]; then
odow marked this conversation as resolved.
Show resolved Hide resolved
# Work around the issue
# /workspace/srcdir/SHOT/src/Model/../Model/Simplifications.h:1370:26: error: 'value' is unavailable: introduced in macOS 10.14
# optional.value()->coefficient *= -1.0;
Expand Down Expand Up @@ -67,15 +62,15 @@ products = [

dependencies = [
Dependency("ASL_jll", ASL_version),
Dependency("Cbc_jll", Cbc_version),
Dependency("Ipopt_jll", Ipopt_version),
Dependency("Cbc_jll", compat="$(Cbc_version)"),
Dependency("Ipopt_jll", compat="$(Ipopt_version)"),
Dependency("CompilerSupportLibraries_jll"),
]

build_tarballs(
ARGS,
name,
version,
"SHOT",
SHOT_version,
sources,
script,
platforms,
Expand Down
3 changes: 3 additions & 0 deletions C/Coin-OR/coin-or-common.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ SYMPHONY_version =
MibS_version = v"1.1.3"
MibS_gitsha = "4b7ec93c4bd1d6a978deff9987cf1df74f6598d3"

SHOT_gitsha = "11fda1ecb84af9718f1e0c0ebf7ae5ae8c45041a"
SHOT_version = offset_version(v"1.1.0", v"0.0.0")

# Third-party packages needed by COIN-OR libraries.
ASL_version = v"0.1.3"
METIS_version = v"5.1.1"
Expand Down