Browse Source

Fixes to generator

pull/32/head
Fredrik Ekre 11 months ago
parent
commit
262ab2f0f9
No known key found for this signature in database
GPG Key ID: DE82E6D5E364C0A2
  1. 9
      gen/Makefile
  2. 3
      gen/generator.toml
  3. 9
      gen/prologue.jl
  4. 11
      lib/LibHYPRE.jl

9
gen/Makefile

@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
LIBHYPRE:=$(shell dirname $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))))/lib/LibHYPRE.jl
MAKEDIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
LIBHYPRE:=$(shell dirname $(MAKEDIR))/lib/LibHYPRE.jl
generate: $(LIBHYPRE) Project.toml Manifest.toml
generate: $(LIBHYPRE)
clean:
rm -f $(LIBHYPRE)
.PHONY: generate clean
$(LIBHYPRE):
$(LIBHYPRE): Project.toml Manifest.toml $(MAKEDIR)/generator.toml $(MAKEDIR)/generator.jl
julia --project generator.jl && \
sed -i -e 's/using HYPRE_jll/using HYPRE_jll: HYPRE_jll, libHYPRE/' -e 's/using CEnum/using CEnum: @cenum/' $(LIBHYPRE) && \
sed -i -e '1s/^/local libHYPRE # Silence of the Langs(erver)\n\n/' -e 's/using HYPRE_jll/using HYPRE_jll: HYPRE_jll, libHYPRE/' -e 's/using CEnum/using CEnum: @cenum/' $(LIBHYPRE) && \
julia-1.11 --project=@runic -e 'using Runic; exit(Runic.main(ARGS))' -- -i $(LIBHYPRE)

3
gen/generator.toml

@ -17,3 +17,6 @@ output_ignorelist = [ @@ -17,3 +17,6 @@ output_ignorelist = [
# Included in prologue.jl
"MPI_Comm",
]
[codegen]
use_ccall_macro = true

9
gen/prologue.jl

@ -1,4 +1,9 @@ @@ -1,4 +1,9 @@
###########################
## Start gen/prologue.jl ##
###########################
using MPI: MPI, MPI_Comm
if isdefined(MPI, :API)
# MPI >= 0.20.0
using MPI.API: MPI_INT, MPI_DOUBLE
@ -6,3 +11,7 @@ else @@ -6,3 +11,7 @@ else
# MPI < 0.20.0
using MPI: MPI_INT, MPI_DOUBLE
end
#########################
## End gen/prologue.jl ##
#########################

11
lib/LibHYPRE.jl

@ -1,9 +1,16 @@ @@ -1,9 +1,16 @@
local libHYPRE # Silence of the Langs(erver)
using HYPRE_jll: HYPRE_jll, libHYPRE
export HYPRE_jll
using CEnum: @cenum
###########################
## Start gen/prologue.jl ##
###########################
using MPI: MPI, MPI_Comm
if isdefined(MPI, :API)
# MPI >= 0.20.0
using MPI.API: MPI_INT, MPI_DOUBLE
@ -12,6 +19,10 @@ else @@ -12,6 +19,10 @@ else
using MPI: MPI_INT, MPI_DOUBLE
end
#########################
## End gen/prologue.jl ##
#########################
const HYPRE_BigInt = Cint

Loading…
Cancel
Save