Deal with 32-bit SuiteSparse 7 (#372)

ViralBShah · web-flow · commit 994bca1f8ff7 · 2023-03-24T20:38:16.000-04:00
Accommodate 32-bit SuiteSparse
Regenerate wrappers
diff --git a/gen/generator.toml b/gen/generator.toml
@@ -8,6 +8,8 @@ auto_mutability = true
 
 output_ignorelist = [
     # Clang.jl cannot handle these macro correctly, skip for now.
+    "SuiteSparse_long",
+    "SuiteSparse_long_max",
     "SuiteSparse_long_id",
     "CHOLMOD_CUBLAS_HANDLE",
     "CHOLMOD_CUDASTREAM",
diff --git a/src/solvers/LibSuiteSparse.jl b/src/solvers/LibSuiteSparse.jl
@@ -8,12 +8,19 @@ const libspqr = :libspqr
 # Special treatment for Win64 since Clong is 32-bit on Win64
 # LONG_MAX is used everywhere, except on Win64
 # See discussion in https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/master/SuiteSparse_config/SuiteSparse_config.h
-if Sys.iswindows() && Sys.ARCH === :x86_64
-    const __int64 = Clonglong
-    const _I64_MAX = typemax(Clonglong)
+# if Sys.iswindows() && Sys.ARCH === :x86_64
+#     const __int64 = Clonglong
+#     const _I64_MAX = typemax(Clonglong)
+# else
+#     const LONG_MAX = typemax(Clong)
+# end
+
+if Sys.WORD_SIZE == 64
+    const SuiteSparse_long = Clonglong
 else
-    const LONG_MAX = typemax(Clong)
+    const SuiteSparse_long = Clong
 end
+const SuiteSparse_long_max = typemax(SuiteSparse_long)
 
 const TRUE  = Int32(1)
 const FALSE = Int32(0)
diff --git a/src/solvers/lib/aarch64-apple-darwin20.jl b/src/solvers/lib/aarch64-apple-darwin20.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/aarch64-linux-gnu.jl b/src/solvers/lib/aarch64-linux-gnu.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/aarch64-linux-musl.jl b/src/solvers/lib/aarch64-linux-musl.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/armv7l-linux-gnueabihf.jl b/src/solvers/lib/armv7l-linux-gnueabihf.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/armv7l-linux-musleabihf.jl b/src/solvers/lib/armv7l-linux-musleabihf.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/i686-linux-gnu.jl b/src/solvers/lib/i686-linux-gnu.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/i686-linux-musl.jl b/src/solvers/lib/i686-linux-musl.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/i686-w64-mingw32.jl b/src/solvers/lib/i686-w64-mingw32.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/powerpc64le-linux-gnu.jl b/src/solvers/lib/powerpc64le-linux-gnu.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/x86_64-apple-darwin14.jl b/src/solvers/lib/x86_64-apple-darwin14.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/x86_64-linux-gnu.jl b/src/solvers/lib/x86_64-linux-gnu.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/x86_64-linux-musl.jl b/src/solvers/lib/x86_64-linux-musl.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/x86_64-unknown-freebsd.jl b/src/solvers/lib/x86_64-unknown-freebsd.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
diff --git a/src/solvers/lib/x86_64-w64-mingw32.jl b/src/solvers/lib/x86_64-w64-mingw32.jl
@@ -2405,10 +2405,6 @@ const CHOLMOD_SUBSUB_VERSION = 3
 
 const _FILE_OFFSET_BITS = 64
 
-const SuiteSparse_long = int64_t
-
-const SuiteSparse_long_max = INT64_MAX
-
 const SUITESPARSE_OPENMP_MAX_THREADS = 1
 
 const SUITESPARSE_OPENMP_GET_NUM_THREADS = 1
