Don't directly include inner wrappers again .

Author: maleadt

res/wrap/wrap.jl

@@ -9,7 +9,7 @@ using Crayons
 
 using Clang
 
-function wrap(name, headers...; library="lib$name()", defines=[])
+function wrap(name, headers...; wrapped_headers=headers, library="lib$name()", defines=[])
     include_dirs = map(dir->joinpath(dir, "include"), find_toolkit())
     filter!(isdir, include_dirs)
 
@@ -26,13 +26,20 @@ function wrap(name, headers...; library="lib$name()", defines=[])
     output_file = "lib$(name).jl"
     common_file = "lib$(name)_common.jl"
 
+    # only wrap headers that are wanted, and make sure we only process each header once
+    included_from = Dict()
+    function wrap_header(root, current)
+        return any(header->endswith(current, header), wrapped_headers) &&
+               get!(included_from, current, root) == root
+    end
+
     context = init(;
                     headers = [headers...],
                     output_file = output_file,
                     common_file = common_file,
                     clang_includes = [include_dirs..., CLANG_INCLUDE],
                     clang_args = clang_args,
-                    header_wrapped = (root, current)->root == current,
+                    header_wrapped = wrap_header,
                     header_library = x->library,
                     clang_diagnostics = true,
                   )
@@ -503,7 +510,8 @@ function main()
         process(name, headers...; kwargs...)
     end
 
-    process_if_existing("cublas", "cublas_v2.h", "cublas_api.h", "cublasXt.h";
+    process_if_existing("cublas", "cublas_v2.h", "cublasXt.h";
+                        wrapped_headers=["cublas_v2.h", "cublas_api.h", "cublasXt.h"],
                         defines=["CUBLASAPI"=>""])
 
     process_if_existing("cufft", "cufft.h")
@@ -512,11 +520,13 @@ function main()
 
     process_if_existing("cusparse", "cusparse.h")
 
-    process_if_existing("cusolver", "cusolver_common.h", "cusolverDn.h", "cusolverSp.h")
+    process_if_existing("cusolver", "cusolverDn.h", "cusolverSp.h";
+                        wrapped_headers=["cusolver_common.h", "cusolverDn.h", "cusolverSp.h"])
 
     process_if_existing("cudnn", "cudnn.h")
 
-    process_if_existing("cutensor", "cutensor.h", "cutensor/types.h")
+    process_if_existing("cutensor", "cutensor.h";
+                        wrapped_headers=["cutensor.h", "cutensor/types.h"])
 end
 
 if abspath(PROGRAM_FILE) == @__FILE__

src/blas/libcublas.jl

@@ -1,9 +1,6 @@
 # Julia wrapper for header: cublas_v2.h
 # Automatically generated using Clang.jl
 
-# Julia wrapper for header: cublas_api.h
-# Automatically generated using Clang.jl
-
 
 @checked function cublasCreate_v2(handle)
     initialize_api()

src/dnn/libcudnn.jl

@@ -1183,7 +1183,7 @@ end
                    (cudnnHandle_t, cudnnBatchNormMode_t, Ptr{Cvoid}, Ptr{Cvoid},
                     cudnnTensorDescriptor_t, CuPtr{Cvoid}, cudnnTensorDescriptor_t,
                     CuPtr{Cvoid}, cudnnTensorDescriptor_t, CuPtr{Cvoid}, CuPtr{Cvoid},
-                    Ptr{Cvoid}, Ptr{Cvoid}, Cdouble),
+                    CuPtr{Cvoid}, CuPtr{Cvoid}, Cdouble),
                    handle, mode, alpha, beta, xDesc, x, yDesc, y, bnScaleBiasMeanVarDesc,
                    bnScale, bnBias, estimatedMean, estimatedVariance, epsilon)
 end

src/solver/libcusolver.jl

@@ -1,4 +1,4 @@
-# Julia wrapper for header: cusolver_common.h
+# Julia wrapper for header: cusolverDn.h
 # Automatically generated using Clang.jl
 
 
@@ -13,9 +13,6 @@ end
                    (Ptr{Cint},),
                    version)
 end
-# Julia wrapper for header: cusolverDn.h
-# Automatically generated using Clang.jl
-
 
 @checked function cusolverDnCreate(handle)
     initialize_api()

src/solver/libcusolver_common.jl

@@ -6,6 +6,16 @@ const CUSOLVER_VER_MINOR = 3
 const CUSOLVER_VER_PATCH = 0
 const CUSOLVER_VER_BUILD = 89
 const CUSOLVER_VERSION = CUSOLVER_VER_MAJOR * 1000 + CUSOLVER_VER_MINOR * 100 + CUSOLVER_VER_PATCH
+const cusolverDnContext = Cvoid
+const cusolverDnHandle_t = Ptr{cusolverDnContext}
+const syevjInfo = Cvoid
+const syevjInfo_t = Ptr{syevjInfo}
+const gesvdjInfo = Cvoid
+const gesvdjInfo_t = Ptr{gesvdjInfo}
+const cusolverDnIRSParams = Cvoid
+const cusolverDnIRSParams_t = Ptr{cusolverDnIRSParams}
+const cusolverDnIRSInfos = Cvoid
+const cusolverDnIRSInfos_t = Ptr{cusolverDnIRSInfos}
 const cusolver_int_t = Cint
 
 @cenum cusolverStatus_t::UInt32 begin
@@ -67,16 +77,6 @@ end
 end
 
 
-const cusolverDnContext = Cvoid
-const cusolverDnHandle_t = Ptr{cusolverDnContext}
-const syevjInfo = Cvoid
-const syevjInfo_t = Ptr{syevjInfo}
-const gesvdjInfo = Cvoid
-const gesvdjInfo_t = Ptr{gesvdjInfo}
-const cusolverDnIRSParams = Cvoid
-const cusolverDnIRSParams_t = Ptr{cusolverDnIRSParams}
-const cusolverDnIRSInfos = Cvoid
-const cusolverDnIRSInfos_t = Ptr{cusolverDnIRSInfos}
 const cusolverSpContext = Cvoid
 const cusolverSpHandle_t = Ptr{cusolverSpContext}
 const csrqrInfo = Cvoid

src/tensor/libcutensor.jl

@@ -165,6 +165,3 @@ end
 function cutensorGetCudartVersion()
     @runtime_ccall((:cutensorGetCudartVersion, libcutensor()), Csize_t, ())
 end
-# Julia wrapper for header: types.h
-# Automatically generated using Clang.jl
-

src/tensor/libcutensor_common.jl

@@ -82,21 +82,21 @@ end
 
 
 struct cutensorHandle_t
-    fields::NTuple{512, Cint}
+    fields::NTuple{512, Int64}
 end
 
 struct cutensorTensorDescriptor_t
-    fields::NTuple{64, Cint}
+    fields::NTuple{64, Int64}
 end
 
 struct cutensorContractionDescriptor_t
-    fields::NTuple{256, Cint}
+    fields::NTuple{256, Int64}
 end
 
 struct cutensorContractionPlan_t
-    fields::NTuple{640, Cint}
+    fields::NTuple{640, Int64}
 end
 
 struct cutensorContractionFind_t
-    fields::NTuple{64, Cint}
+    fields::NTuple{64, Int64}
 end