Update to HiGHS v1.2.1 (#92)

Author: odow

Project.toml

@@ -1,14 +1,14 @@
 name = "HiGHS"
 uuid = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
-version = "1.0.1"
+version = "1.1.0"
 
 [deps]
 HiGHS_jll = "8fd58aa0-07eb-5a78-9b36-339c94fd15ea"
 MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-HiGHS_jll = "=1.2.0"
+HiGHS_jll = "=1.2.0, =1.2.1"
 MathOptInterface = "1"
 julia = "1.6"
 

gen/Project.toml

@@ -4,3 +4,4 @@ HiGHS_jll = "8fd58aa0-07eb-5a78-9b36-339c94fd15ea"
 
 [compat]
 Clang = "0.14"
+HiGHS_jll = "1.2.1"

gen/gen.jl

@@ -2,13 +2,22 @@ using Clang.Generators
 import HiGHS_jll
 
 highs = joinpath(HiGHS_jll.artifact_dir, "include")
+c_api = joinpath(highs, "interfaces", "highs_c_api.h")
+
 build!(
     create_context(
-        [
-            joinpath(highs, "interfaces", "highs_c_api.h"),
-            joinpath(highs, "util", "HighsInt.h"),
-        ],
+        [c_api, joinpath(highs, "util", "HighsInt.h")],
         vcat(get_default_args(), "-I$highs"),
         load_options(joinpath(@__DIR__, "generate.toml")),
     ),
 )
+
+open(joinpath(@__DIR__, "..", "src", "gen", "libhighs.jl"), "a") do io
+    for line in readlines(c_api)
+        m = match(r"const HighsInt kHighs([a-zA-Z]+) = (-?[0-9]+);", line)
+        if m === nothing
+            continue
+        end
+        println(io, "const kHighs$(m[1]) = HighsInt($(m[2]))")
+    end
+end

gen/generate.toml

@@ -1,17 +1,5 @@
 [general]
 library_name = "libhighs"
 output_file_path = "src/gen/libhighs.jl"
-use_julia_native_enum_type = false
 print_using_CEnum = false
-use_deterministic_symbol = true
-is_local_header_only = true
-smart_de_anonymize = true
-printer_blacklist = []
 extract_c_comment_style = "doxygen"
-
-[codegen]
-use_julia_bool = true
-always_NUL_terminated_string = true
-is_function_strictly_typed = false
-opaque_func_arg_as_PtrCvoid = false
-opaque_as_mutable_struct = true

src/HiGHS.jl

@@ -1,6 +1,8 @@
 module HiGHS
 
 import HiGHS_jll
+import MathOptInterface
+import SparseArrays
 
 function __init__()
     global libhighs = HiGHS_jll.libhighs
@@ -14,7 +16,7 @@ include("MOI_wrapper.jl")
 # in your environment, then use `import HiGHS` instead of `using HiGHS`.
 
 for sym in names(@__MODULE__, all = true)
-    if startswith(string(sym), "Highs_")
+    if startswith("$sym", "Highs_") || startswith("$sym", "kHighs")
         @eval export $sym
     end
 end