Skip to content

Commit

Permalink
Merge pull request #149 from kalmarek/scs-2.1.1
Browse files Browse the repository at this point in the history
Scs 2.1.1
  • Loading branch information
blegat committed Oct 13, 2019
2 parents d5c7892 + 68eb186 commit bd8ef05
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 67 deletions.
92 changes: 45 additions & 47 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,54 +12,53 @@ products = [
]

# Download binaries from hosted location
bin_prefix = "https://github.com/JuliaOpt/SCSBuilder/releases/download/v2.0.2-1"
bin_prefix = "https://github.com/JuliaOpt/SCSBuilder/releases/download/v2.1.1"

# Listing of files generated by BinaryBuilder:
download_info = Dict(
Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.aarch64-linux-gnu-gcc4.tar.gz", "ec6d05d3234233f6657430526ce3d9363247ef581b2e116edfc7601463412350"),
Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.aarch64-linux-gnu-gcc7.tar.gz", "e25291e8ab567e5ad2c6e10d9a6d98060a38b29fee949b30aa16cde94a3c15e9"),
Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.aarch64-linux-gnu-gcc8.tar.gz", "eb7a759514addc0df3a8273ee710ae4b6553fb56084b0ced0f6ca995a80bc1a0"),
Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.aarch64-linux-musl-gcc4.tar.gz", "04d19b162c0b75fad38055d08f39adee867fd0dce529ad9d54305ca721a72c15"),
Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.aarch64-linux-musl-gcc7.tar.gz", "588e0b68cc4bc758611b5f63f0db5d6f0c1ccd3c5655764fd5f4e4931c0657d1"),
Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.aarch64-linux-musl-gcc8.tar.gz", "662f0a2b06129a73e0649a88f55d1a600e47b8780371e2bffeb8bcb91c4d2284"),
Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.arm-linux-gnueabihf-gcc4.tar.gz", "3f786cd9f59fc14afc13fddadb59a8065e6e16a1bdc5b70f4a715eb81031ed94"),
Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.arm-linux-gnueabihf-gcc7.tar.gz", "0a32bf05d42eecbd8adb18907770f7b96f3766d612e84242de943b1ae315813e"),
Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.arm-linux-gnueabihf-gcc8.tar.gz", "14aa62ea6be9de8f51a3caf2aed67fe4246d8f62683266419e0df9c2f8e8123d"),
Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.arm-linux-musleabihf-gcc4.tar.gz", "ab95141b6be69bbafda0677b6a9b690e26764b027cc6120c88959d3ffeb2a750"),
Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.arm-linux-musleabihf-gcc7.tar.gz", "40da0e4cb5fa4091df80389016c657662070d8a259e2122b8d1d88d92bb52d43"),
Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.arm-linux-musleabihf-gcc8.tar.gz", "f641ad07a34d64b88afdbf8cf3eab4d3a89941b7f609982270370c85ce2c60da"),
Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.i686-linux-gnu-gcc4.tar.gz", "1a209b4af0b0d6d99756866218e76ffdc3ea8a4ab5fecface65cdfc1cdc7fbc6"),
Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.i686-linux-gnu-gcc7.tar.gz", "e4291e2e9357d16bd12af5db595c38e4e3948dda0d2b2483051872cbfbe521d7"),
Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.i686-linux-gnu-gcc8.tar.gz", "b4f5e02553d7f5c463f93394988886e5450bc250938b5e77c86cafc20f2d6eb0"),
Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.i686-linux-musl-gcc4.tar.gz", "257a8f52d1a1b783de4b4658c4f522f7251ffea5ea2ad0c63d48af1b140b4994"),
Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.i686-linux-musl-gcc7.tar.gz", "74e53ae86ffcaf010f368b4dc886def4de63bd6501fd4d387dc01cfe04715df5"),
Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.i686-linux-musl-gcc8.tar.gz", "e61959902ac0ec3c23f6152df6eefd3de338c13440605205cd3a5a414e490127"),
Windows(:i686, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.i686-w64-mingw32-gcc4.tar.gz", "557625016e349c622b6d5fa8c088140c8046b78fe255cfaae58dbc639959c3b9"),
Windows(:i686, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.i686-w64-mingw32-gcc7.tar.gz", "ae8481792619466fd1b788be0b9fcbfa2291417f9ac05c053cc589917e3f1d0b"),
Windows(:i686, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.i686-w64-mingw32-gcc8.tar.gz", "5cf67d8c2d9b4afc6d0f705efb51bde30aa85ed47570dd21a1ecae98c821df39"),
Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.powerpc64le-linux-gnu-gcc4.tar.gz", "7b0bcd7acbfc5787fb19a16fba0c7a46d95b6303b981dac92b0b97e869a55c57"),
Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.powerpc64le-linux-gnu-gcc7.tar.gz", "1c28819d1460d385a739d1fda73fbd3e8a588eeec0a2cba335603a5caff35490"),
Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.powerpc64le-linux-gnu-gcc8.tar.gz", "58e8074744bdde66c7f93586f9f0b9fa70c52886133377b00fe995b889d011e7"),
MacOS(:x86_64, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-apple-darwin14-gcc4.tar.gz", "6aa0a601cc0788182be6f276f08b900327be09445b8693a64251d24682d52682"),
MacOS(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-apple-darwin14-gcc7.tar.gz", "257f353a747419a8112863d9b4aaddb76d5ad22df8b763085a49c66e8ad17c37"),
MacOS(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-apple-darwin14-gcc8.tar.gz", "de7effdb148d59fdfc616e6bbe802863e74da6b752957c85703e13654f0c9efe"),
Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-linux-gnu-gcc4.tar.gz", "f845bd78dba7e79eac5df236848bd7fc26f6f52488887815616499812ba5f464"),
Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-linux-gnu-gcc7.tar.gz", "c7d053b129a9e2d05aec96918f6ad1b883c6532fb22b90257e360c51b60657fd"),
Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-linux-gnu-gcc8.tar.gz", "505e0e9a4ec170a9bab0f8643869e6bf13f9cfc3aabfc24200889ecd5d0d793c"),
Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-linux-musl-gcc4.tar.gz", "9ee509f9740f62c70e3649ba1551b75b3fb4ac1bb7f38202ade1cbc15da638b3"),
Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-linux-musl-gcc7.tar.gz", "784c63d5559b918eafbf2fa5cd6d6e2e0d00f478b84fd7c23845d336a8595d87"),
Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-linux-musl-gcc8.tar.gz", "5e0275a174ee271e1560f3fb5337ea3fe41bf67ea63f3e7d5378c446f9c1e566"),
FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-unknown-freebsd11.1-gcc4.tar.gz", "05aec099dfe94aeb2c7e34fcd561545e5db9124609337290a1014438d448d51f"),
FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-unknown-freebsd11.1-gcc7.tar.gz", "8161741b6acd17c973ce10c354dbe3c40d345db43701bf07f9b3948e8a20711a"),
FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-unknown-freebsd11.1-gcc8.tar.gz", "09832832008cd0b48f9dc38788747b2ebf48042c558a6856b718be44c35678ac"),
Windows(:x86_64, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-w64-mingw32-gcc4.tar.gz", "10f7c43ef4c0e4d5ddd7083c8f9e8bc4ca8165331b342b3da8557fd9acdb514e"),
Windows(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-w64-mingw32-gcc7.tar.gz", "1d84cbe7c21d13f377a9bf3ab99710a2593737a212793b4bec7956d55fdc4d98"),
Windows(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.0.2.x86_64-w64-mingw32-gcc8.tar.gz", "9556564f6cf613da50bd6812376e10f61202eb045dfe54ae1c91fda86060fa70"),
Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.aarch64-linux-gnu-gcc4.tar.gz", "efa3f206ceee91221e4e78f079b246a4bf04d3a3888c25f92212b0525dd30ba5"),
Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.aarch64-linux-gnu-gcc7.tar.gz", "644c6d05a7e9b42a3a4b7ee150b6e6ac39c6f606b2ea54d3c2e051d022411186"),
Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.aarch64-linux-gnu-gcc8.tar.gz", "807ef6d29d3bd1c4d2091b73c8a027d554962a645ecb8f459ff01900cf54867c"),
Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.aarch64-linux-musl-gcc4.tar.gz", "0f665094019547ec969b67b34d1117b832556412f6ff8f18e590418b9ce5d0a8"),
Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.aarch64-linux-musl-gcc7.tar.gz", "3828c39e13ba798a3adb9001ae0d6e3323bcc618eadb9010ee278dd3278cbb9e"),
Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.aarch64-linux-musl-gcc8.tar.gz", "bb3d0440c00b82866a3d5604bad05c817fa3af142640ccea33d5e2d0bf3d2519"),
Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.arm-linux-gnueabihf-gcc4.tar.gz", "62be85de04e317d35a4c6c1f840beb2a3b15f4b6edb0a39029b188cd9e260629"),
Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.arm-linux-gnueabihf-gcc7.tar.gz", "79d2dee9a96a5a5c951e872a446418a674b8b4e21591a703b49f9abb26fc406c"),
Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.arm-linux-gnueabihf-gcc8.tar.gz", "fb69a2ed44d6660fe63b69d0de7903def16d4722039ce8d824b09d6d8b85377e"),
Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.arm-linux-musleabihf-gcc4.tar.gz", "aac19b6bf3fa76ca45222c444c22a14d8490574e7799c2b7aa3ba2cf71f98fc1"),
Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.arm-linux-musleabihf-gcc7.tar.gz", "cb1c1d43a94ef64989ad1f1435f434e301fce34456460f15be9e12aebe3e3f77"),
Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.arm-linux-musleabihf-gcc8.tar.gz", "b9e1750ddee2c5656392cfbe6b404ddb59424cdd27465d900115d15a8e5d55d0"),
Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.i686-linux-gnu-gcc4.tar.gz", "b2037f11882d7f235db0f3bba6a389e9e3e5572d203fcf6d7ad66d60f56277fc"),
Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.i686-linux-gnu-gcc7.tar.gz", "35e62f74f7b18e1be049034652e7df9b45d90d37b359235d92272c7bee048765"),
Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.i686-linux-gnu-gcc8.tar.gz", "f90c507ff44a15e616e29e48f086490aaff760b7a51d4d561f911acbadb40b10"),
Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.i686-linux-musl-gcc4.tar.gz", "16fe6fa8e88e936e94192fb44087d1c343c647bf43fbd5f4251d3cb0259141e5"),
Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.i686-linux-musl-gcc7.tar.gz", "44450b4988fdb4f080f4a9b071d060baac52efc6baba866b2a761b5caecf2613"),
Linux(:i686, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.i686-linux-musl-gcc8.tar.gz", "1d5062082513cba12190b0effe2dc6a6fd30af6ada9d807a47c284ba7a7e405d"),
Windows(:i686, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.i686-w64-mingw32-gcc4.tar.gz", "0f95846227aa05bed9d9f26812acedb971e7218b039d7d582db89b460c0341c7"),
Windows(:i686, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.i686-w64-mingw32-gcc7.tar.gz", "c616da0cf404d380db9daf7ce121034356ff491450d828a0455b97a1c1547126"),
Windows(:i686, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.i686-w64-mingw32-gcc8.tar.gz", "d6ee325284380c649fba0542b4944e7740e13283534e81821389b2f11a611343"),
Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.powerpc64le-linux-gnu-gcc4.tar.gz", "9ee5271d0ba21d2a32ac4f9cafb18e99a9d4368ac2168aa46de6e8a4a84ab124"),
Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.powerpc64le-linux-gnu-gcc7.tar.gz", "c3a5ca3927e45b901a236fa85fe40698b7e48fcb6cd54f4f579cbe5dfa872e61"),
Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.powerpc64le-linux-gnu-gcc8.tar.gz", "3312be93587958a06627b666d54098b1cb0cff5ede5eaa5e58815119677f2d02"),
MacOS(:x86_64, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-apple-darwin14-gcc4.tar.gz", "4d93317beabcca07eda24b29c6eb35f0b2682b344b1b4bfc56bea47d9ee13fde"),
MacOS(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-apple-darwin14-gcc7.tar.gz", "3a32c772aa6949e17e86875ba954b35af36f279681225397d0f8f8730809f437"),
MacOS(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-apple-darwin14-gcc8.tar.gz", "71f8855929052bd43a1e9243cc952ed0cf599220397a66ca0cb06c5f4afa1b6d"),
Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-linux-gnu-gcc4.tar.gz", "a23ded4138c1076508e414ebd278907de4608899d65b40696662dccd3ae30055"),
Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-linux-gnu-gcc7.tar.gz", "7b9df657c8729e7bcc8dda8a3deb18c2ff949eae373e6096ebedc5ad788824c4"),
Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-linux-gnu-gcc8.tar.gz", "090a2ac4209353ebe3306e08252ec3e88154e16f57388c8d029aba13babdd95a"),
Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-linux-musl-gcc4.tar.gz", "8866e9c30cfdff73340f615c7069c63b66ae25a33395315e59d228d33bc241ca"),
Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-linux-musl-gcc7.tar.gz", "2657f43f8844f9696fec493e64b96768b3f7afa7cca6babf8c2a25a28d871ea4"),
Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-linux-musl-gcc8.tar.gz", "33658481f0b5fc260a38ddc847f046e5aa0f26824cc783bd7a9b81dbe8c779cd"),
FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-unknown-freebsd11.1-gcc4.tar.gz", "f96a3f7ed7d1dc39f47c30b8b7005796162ac78443b27c96c02b87158964d9a6"),
FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-unknown-freebsd11.1-gcc7.tar.gz", "3a7ccb36853ded8e4c90af7efc4aeae87d8e8f329b158f5a503699912e94be39"),
FreeBSD(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-unknown-freebsd11.1-gcc8.tar.gz", "5a58cca92e50498c576e4e3b2ff0c21f2e4d7bfc0b90050a9a4884db69eb9b00"),
Windows(:x86_64, compiler_abi=CompilerABI(:gcc4)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-w64-mingw32-gcc4.tar.gz", "4d2d9f6d6cedf2a7905cfd06aabf598270081380830f07b7cca466342b13990f"),
Windows(:x86_64, compiler_abi=CompilerABI(:gcc7)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-w64-mingw32-gcc7.tar.gz", "35873dd09ee83a114a945b7ccc07b91352c6984e8c6973573423d8483f5917e3"),
Windows(:x86_64, compiler_abi=CompilerABI(:gcc8)) => ("$bin_prefix/SCSBuilder.v2.1.1.x86_64-w64-mingw32-gcc8.tar.gz", "a169be57d28bc19752d2acbca7e624600820e4865f9035318de6c56d0c1783e8"),
)


this_platform = platform_key_abi()

custom_library = false
if haskey(ENV,"JULIA_SCS_LIBRARY_PATH")
custom_products = [LibraryProduct(ENV["JULIA_SCS_LIBRARY_PATH"],product.libnames,product.variable_name) for product in products]
Expand All @@ -69,8 +68,8 @@ if haskey(ENV,"JULIA_SCS_LIBRARY_PATH")
else
error("Could not install custom libraries from $(ENV["JULIA_SCS_LIBRARY_PATH"]).\nTo fall back to BinaryProvider call delete!(ENV,\"JULIA_SCS_LIBRARY_PATH\") and run build again.")
end
end
end

if !custom_library
# Install unsatisfied or updated dependencies:
unsatisfied = any(!satisfied(p; verbose=verbose) for p in products)
Expand All @@ -89,8 +88,7 @@ if !custom_library
# Download and install binaries
install(dl_info...; prefix=prefix, force=true, verbose=verbose)
end

end

end

# Write out a deps.jl file that will contain mappings for our products
write_deps_file(joinpath(@__DIR__, "deps.jl"), products, verbose=verbose)
6 changes: 3 additions & 3 deletions src/SCS.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ end

function __init__()
vnum = VersionNumber(SCS_version())
depsdir = realpath(joinpath(dirname(@__FILE__), "..", "deps"))
if vnum.major != 2 || vnum.minor != 0
error("Current SCS version installed is $(SCS_version()), but we require version 2.0.*.")
depsdir = realpath(joinpath(dirname(@__FILE__),"..","deps"))
if vnum.major == 1 || (vnum.major == 2 && vnum.minor != 1)
error("Current SCS version installed is $(SCS_version()), but we require version 2.1.*")
end
end

Expand Down
9 changes: 6 additions & 3 deletions src/types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ struct SCSSettings
verbose::Int # boolean, write out progress
warm_start::Int # boolean, warm start (put initial guess in Sol struct)
acceleration_lookback::Int # acceleration memory parameter
write_data_filename::Cstring

SCSSettings() = new()
SCSSettings(normalize, scale, rho_x, max_iters, eps, alpha, cg_rate, verbose, warm_start, acceleration_lookback) = new(normalize, scale, rho_x, max_iters, eps, alpha, cg_rate, verbose, warm_start, acceleration_lookback)
SCSSettings(normalize, scale, rho_x, max_iters, eps, alpha, cg_rate, verbose, warm_start, acceleration_lookback, write_data_filename) = new(normalize, scale, rho_x, max_iters, eps, alpha, cg_rate, verbose, warm_start, acceleration_lookback, write_data_filename)
end

struct Direct end
Expand All @@ -66,8 +67,10 @@ function _SCS_user_settings(default_settings::SCSSettings;
cg_rate=default_settings.cg_rate,
verbose=default_settings.verbose,
warm_start=default_settings.warm_start,
acceleration_lookback=default_settings.acceleration_lookback)
return SCSSettings(normalize, scale, rho_x, max_iters, eps, alpha, cg_rate, verbose,warm_start, acceleration_lookback)
acceleration_lookback=default_settings.acceleration_lookback,
write_data_filename=default_settings.write_data_filename
)
return SCSSettings(normalize, scale, rho_x, max_iters, eps, alpha, cg_rate, verbose,warm_start, acceleration_lookback, write_data_filename)
end

function SCSSettings(linear_solver::Union{Type{Direct}, Type{Indirect}}; options...)
Expand Down
2 changes: 1 addition & 1 deletion test/MOI_wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const CACHE = MOIU.UniversalFallback(MOIU.Model{Float64}())
import SCS

for T in [SCS.Direct, SCS.Indirect]
optimizer = SCS.Optimizer(linear_solver=T, eps=1e-8)
optimizer = SCS.Optimizer(linear_solver=T, eps=1e-6)
MOI.set(optimizer, MOI.Silent(), true)

@testset "SolverName" begin
Expand Down
Loading

0 comments on commit bd8ef05

Please sign in to comment.