From d4fd1d3edc5ac9109ca31923e69affb71a40cf87 Mon Sep 17 00:00:00 2001
From: Fredrik Ekre <ekrefredrik@gmail.com>
Date: Mon, 18 Jul 2022 17:54:25 +0200
Subject: [PATCH] Update Clang.jl generator.

---
 gen/Manifest.toml | 30 +++++++++++++++++++++++-------
 gen/generator.jl  |  1 -
 lib/LibHYPRE.jl   | 25 ++-----------------------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/gen/Manifest.toml b/gen/Manifest.toml
index 7d49bf0..779a79c 100644
--- a/gen/Manifest.toml
+++ b/gen/Manifest.toml
@@ -2,7 +2,7 @@
 
 julia_version = "1.7.2"
 manifest_format = "2.0"
-project_hash = "d8ce2a2484bedb9a6d42ae1bee9de87ea0617c47"
+project_hash = "cc39013dba1e9068883c1b156d3b25864ebc62f8"
 
 [[deps.ArgTools]]
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -43,10 +43,10 @@ deps = ["ArgTools", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
 [[deps.HYPRE_jll]]
-deps = ["Artifacts", "JLLWrappers", "LAPACK_jll", "Libdl", "MPICH_jll", "MicrosoftMPI_jll", "OpenBLAS_jll", "Pkg"]
-git-tree-sha1 = "41194ae5709514e0ac07a9c9637d7c53844085a5"
+deps = ["Artifacts", "JLLWrappers", "LAPACK_jll", "LazyArtifacts", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenBLAS_jll", "OpenMPI_jll", "Pkg", "TOML"]
+git-tree-sha1 = "ed07e4165a837e4606bc5dfbb6536ab0ec798ab8"
 uuid = "0a602bbd-b08b-5d75-8d32-0de6eef44785"
-version = "2.23.0+0"
+version = "2.23.0+1"
 
 [[deps.InteractiveUtils]]
 deps = ["Markdown"]
@@ -64,6 +64,10 @@ git-tree-sha1 = "b1cccaf9742bb82f2b3de81c510688e491d6e922"
 uuid = "51474c39-65e3-53ba-86ba-03b1b862ec14"
 version = "3.9.0+0"
 
+[[deps.LazyArtifacts]]
+deps = ["Artifacts", "Pkg"]
+uuid = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
+
 [[deps.LibCURL]]
 deps = ["LibCURL_jll", "MozillaCACerts_jll"]
 uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
@@ -87,10 +91,10 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
 [[deps.MPICH_jll]]
-deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "MPIPreferences", "Pkg"]
-git-tree-sha1 = "4d61a56bd6d57dd7f9920b882a210bb849cdf217"
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "Pkg", "TOML"]
+git-tree-sha1 = "089ec72dbf7d7a853626f438d140d0a642ddbda4"
 uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4"
-version = "4.0.2+2"
+version = "4.0.2+4"
 
 [[deps.MPIPreferences]]
 deps = ["Libdl", "Preferences"]
@@ -98,6 +102,12 @@ git-tree-sha1 = "49f10d34284610c125421c7a4e6f913e4bc00897"
 uuid = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"
 version = "0.1.3"
 
+[[deps.MPItrampoline_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "Pkg", "TOML"]
+git-tree-sha1 = "0c87d3420a787a2be96942d4d1298487271c51d0"
+uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748"
+version = "4.1.2+0"
+
 [[deps.Markdown]]
 deps = ["Base64"]
 uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
@@ -122,6 +132,12 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
 uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
 
+[[deps.OpenMPI_jll]]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "Pkg", "TOML"]
+git-tree-sha1 = "6198c6dc3b5c3dc01854879197a5f382a60f947d"
+uuid = "fe0851c0-eecd-5654-98d4-656369965a5c"
+version = "4.1.3+1"
+
 [[deps.Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
diff --git a/gen/generator.jl b/gen/generator.jl
index 37078df..d6880cb 100644
--- a/gen/generator.jl
+++ b/gen/generator.jl
@@ -23,7 +23,6 @@ push!(args, "-DHYPRE_ENABLE_CURAND=OFF")
 
 headers = joinpath.(hypre_include_dir, [
     "HYPRE.h",
-    "IJ_matrix.h",
     "HYPRE_IJ_mv.h",
     "HYPRE_parcsr_mv.h",
     "HYPRE_parcsr_ls.h",
diff --git a/lib/LibHYPRE.jl b/lib/LibHYPRE.jl
index 885d35f..522d5af 100644
--- a/lib/LibHYPRE.jl
+++ b/lib/LibHYPRE.jl
@@ -3,29 +3,6 @@ export HYPRE_jll
 
 using CEnum
 
-struct hypre_IJMatrix_struct
-    comm::Cint
-    row_partitioning::NTuple{2, Cint}
-    col_partitioning::NTuple{2, Cint}
-    object_type::Cint
-    object::Ptr{Cvoid}
-    translator::Ptr{Cvoid}
-    assumed_part::Ptr{Cvoid}
-    assemble_flag::Cint
-    global_first_row::Cint
-    global_first_col::Cint
-    global_num_rows::Cint
-    global_num_cols::Cint
-    omp_flag::Cint
-    print_level::Cint
-end
-
-const hypre_IJMatrix = hypre_IJMatrix_struct
-
-function hypre_IJMatrixMemoryLocation(matrix)
-    ccall((:hypre_IJMatrixMemoryLocation, libHYPRE), Cint, (Ptr{hypre_IJMatrix},), matrix)
-end
-
 const MPI_Comm = Cint
 
 const MPI_Op = Cint
@@ -9905,6 +9882,8 @@ function HYPRE_SetUseGpuRand(use_curand)
     ccall((:HYPRE_SetUseGpuRand, libHYPRE), HYPRE_Int, (HYPRE_Int,), use_curand)
 end
 
+mutable struct hypre_IJMatrix_struct end
+
 const HYPRE_IJMatrix = Ptr{hypre_IJMatrix_struct}
 
 function HYPRE_IJMatrixCreate(comm, ilower, iupper, jlower, jupper, matrix)